fyf
/
AndroidSmartClient
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 1 Wiki Activity
Browse Source

修改

调味吧台
liup 7 months ago
parent
e20ca95947
commit
00a95d7126
11 changed files with 75 additions and 48 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      app/src/main/java/com/bonait/bnframework/business/MainInit.java
  2. +3
    -2
      app/src/main/java/com/bonait/bnframework/modules/home/adapter/goodpf_apapter.java
  3. +5
    -1
      app/src/main/java/com/bonait/bnframework/modules/home/fragment/MakeGoodFragment.java
  4. +2
    -2
      app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/GoodInformation.java
  5. +1
    -1
      app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_pf_control.java
  6. +3
    -3
      app/src/main/res/layout/datatab/layout/wl_item.xml
  7. +5
    -4
      app/src/main/res/layout/fragment_make_good.xml
  8. +5
    -5
      app/src/main/res/layout/item/layout/dialog_add_silos_ck.xml
  9. +11
    -4
      app/src/main/res/layout/item/layout/loadinggood_item.xml
  10. +1
    -1
      app/src/main/res/layout/item/layout/newmakegood.xml
  11. +38
    -24
      app/src/main/res/layout/item/layout/silos_jiaoyan_item_edit.xml

+ 1
- 1
app/src/main/java/com/bonait/bnframework/business/MainInit.java View File

@@ -82,7 +82,7 @@ public class MainInit {
MainNotification.initNotificationChannel(app); MainNotification.initNotificationChannel(app);


// 内存泄漏检测 // 内存泄漏检测
initLeakCanary(true,app);
initLeakCanary(BuildConfig.DEBUG,app);


// Log日志打印框架 // Log日志打印框架
initLogCat(); initLogCat();


+ 3
- 2
app/src/main/java/com/bonait/bnframework/modules/home/adapter/goodpf_apapter.java View File

@@ -7,6 +7,7 @@ import android.view.ViewGroup;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.Button; import android.widget.Button;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;


import androidx.annotation.NonNull; import androidx.annotation.NonNull;
@@ -43,8 +44,8 @@ public class goodpf_apapter extends ArrayAdapter<BPA_GOODSRECIPENAME> {
View view = LayoutInflater.from(getContext()).inflate(resource1, parent, false); View view = LayoutInflater.from(getContext()).inflate(resource1, parent, false);
//分别获取 image view 和 textview 的实例 //分别获取 image view 和 textview 的实例
TextView name = view.findViewById(R.id.name); TextView name = view.findViewById(R.id.name);
ImageView button = view.findViewById(R.id.button_item);
ImageView button_update = view.findViewById(R.id.button_update);
RelativeLayout button = view.findViewById(R.id.button_item);
RelativeLayout button_update = view.findViewById(R.id.button_update);


// 设置要显示的图片和文字 // 设置要显示的图片和文字
name.setText(bpa_goodsrecipename.name); name.setText(bpa_goodsrecipename.name);


+ 5
- 1
app/src/main/java/com/bonait/bnframework/modules/home/fragment/MakeGoodFragment.java View File

@@ -666,7 +666,11 @@ public class MakeGoodFragment extends BaseFragment {
activity.runOnUiThread(new Runnable() { activity.runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
String msg = " |03cb1364-8b85-446a-b00b-d3657de1a19f| | ";
String msg = msg2;

if(ConfigName.TEST){
msg = " |03cb1364-8b85-446a-b00b-d3657de1a19f| | ";
}
if ((msg != null) && (((String) msg).length() > 2) && ((String) msg).contains("|")) { if ((msg != null) && (((String) msg).length() > 2) && ((String) msg).contains("|")) {
//拿到扫码数据 //拿到扫码数据
//例如 ORD001|P0003|A001,M002,T001|2 //例如 ORD001|P0003|A001,M002,T001|2


+ 2
- 2
app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/GoodInformation.java View File

@@ -469,7 +469,7 @@ public class GoodInformation extends LinearLayout implements MyClickListener {
{ {
BPA_GOODSRECIPENAME goodsrecipename = QueryDB.GetGoodsRecipeNameDesignId(ggids, Data.id); BPA_GOODSRECIPENAME goodsrecipename = QueryDB.GetGoodsRecipeNameDesignId(ggids, Data.id);
if (goodsrecipename != null) { if (goodsrecipename != null) {
ToastUtils.warning("已有改做法配方,不能在新增了!");
ToastUtils.warning("已有该做法配方,不能再新增了!");
return; return;
} }
} }
@@ -538,7 +538,7 @@ public class GoodInformation extends LinearLayout implements MyClickListener {
//判断配方是否有相同规格的了 //判断配方是否有相同规格的了
BPA_GOODSRECIPENAME goodsrecipename = QueryDB.GetGoodsRecipeNameDesignId(ggids, Data.id); BPA_GOODSRECIPENAME goodsrecipename = QueryDB.GetGoodsRecipeNameDesignId(ggids, Data.id);
if (goodsrecipename != null) { if (goodsrecipename != null) {
ToastUtils.warning("已有改做法配方,不能在新增了!");
ToastUtils.warning("已有该做法配方,不能再新增了!");
return; return;
} }
//新增配方名称 //新增配方名称


+ 1
- 1
app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_pf_control.java View File

@@ -446,7 +446,7 @@ public class add_pf_control extends LinearLayout implements MyClickListener {
{ {
BPA_GOODSRECIPENAME goodsrecipename = QueryDB.GetGoodsRecipeNameDesignId(ggids,Good.id); BPA_GOODSRECIPENAME goodsrecipename = QueryDB.GetGoodsRecipeNameDesignId(ggids,Good.id);
if (goodsrecipename != null) { if (goodsrecipename != null) {
ToastUtils.warning("已有改做法配方,不能在新增了!");
ToastUtils.warning("已有该做法配方,不能再新增了!");
return isSuceess; return isSuceess;
} }
} }


+ 3
- 3
app/src/main/res/layout/datatab/layout/wl_item.xml View File

@@ -57,25 +57,25 @@
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/border"> android:background="@drawable/border">
<RelativeLayout <RelativeLayout
android:id="@+id/button_update"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"> android:layout_weight="1">


<ImageView <ImageView
android:id="@+id/button_update"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:src="@mipmap/new_update" /> android:src="@mipmap/new_update" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/button_item"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="30dp"
android:layout_height="50dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/border"> android:background="@drawable/border">
<ImageView <ImageView
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:id="@+id/button_item"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@mipmap/new_delete"/> android:src="@mipmap/new_delete"/>


+ 5
- 4
app/src/main/res/layout/fragment_make_good.xml View File

@@ -18,7 +18,7 @@
android:layout_weight="1" android:layout_weight="1"
android:orientation="horizontal"> android:orientation="horizontal">
<LinearLayout <LinearLayout
android:layout_width="100dp"
android:layout_width="90dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginBottom="35dp" android:layout_marginBottom="35dp"
android:background="@color/white" android:background="@color/white"
@@ -66,14 +66,14 @@
android:id="@+id/rv_right" android:id="@+id/rv_right"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginRight="360dp"
android:layout_marginRight="250dp"
android:orientation="vertical" android:orientation="vertical"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />


<LinearLayout <LinearLayout
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginRight="@dimen/dp_10" android:layout_marginRight="@dimen/dp_10"
android:layout_width="350dp"
android:layout_width="250dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<ImageView <ImageView
@@ -85,7 +85,7 @@
<RelativeLayout <RelativeLayout
android:id="@+id/loadgoodliebiao" android:id="@+id/loadgoodliebiao"
android:layout_marginTop="@dimen/dp_10" android:layout_marginTop="@dimen/dp_10"
android:layout_width="350dp"
android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<ScrollView <ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -165,6 +165,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="5dp" android:layout_margin="5dp"
android:text="称(单击清零):" android:text="称(单击清零):"
android:paddingTop="15dp"
android:textSize="@dimen/TitleSize" /> android:textSize="@dimen/TitleSize" />


<TextView <TextView


+ 5
- 5
app/src/main/res/layout/item/layout/dialog_add_silos_ck.xml View File

@@ -11,7 +11,7 @@
<RelativeLayout <RelativeLayout
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:layout_margin="20dp" android:layout_margin="20dp"
android:layout_width="400dp"
android:layout_width="500dp"
android:layout_height="400dp" android:layout_height="400dp"
android:background="@drawable/common_bg_with_radius_and_border"> android:background="@drawable/common_bg_with_radius_and_border">


@@ -138,8 +138,8 @@
android:orientation="vertical"> android:orientation="vertical">
<Button <Button
android:id="@+id/control_switch_shoudong" android:id="@+id/control_switch_shoudong"
android:layout_width="80dp"
android:layout_height="50dp"
android:layout_width="120dp"
android:layout_height="70dp"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:background="@drawable/silosbuttonbj" android:background="@drawable/silosbuttonbj"
android:text="出料" android:text="出料"
@@ -149,8 +149,8 @@
<Button <Button
android:layout_marginTop="@dimen/dp_10" android:layout_marginTop="@dimen/dp_10"
android:id="@+id/control_huishou" android:id="@+id/control_huishou"
android:layout_width="80dp"
android:layout_height="50dp"
android:layout_width="120dp"
android:layout_height="70dp"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:background="@drawable/silosbuttonbj" android:background="@drawable/silosbuttonbj"
android:text="回收" android:text="回收"


+ 11
- 4
app/src/main/res/layout/item/layout/loadinggood_item.xml View File

@@ -36,11 +36,12 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:textSize="16sp"
android:text="01"></TextView> android:text="01"></TextView>
</RelativeLayout> </RelativeLayout>


<RelativeLayout <RelativeLayout
android:layout_marginRight="60dp"
android:layout_marginRight="100dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<LinearLayout <LinearLayout
@@ -54,6 +55,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="金牡丹菠萝奶茶茶饮" android:text="金牡丹菠萝奶茶茶饮"
android:textAlignment="center" android:textAlignment="center"
android:textSize="16sp"
/> />


<TextView <TextView
@@ -61,6 +63,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="中杯/去冰/无糖" android:text="中杯/去冰/无糖"
android:textSize="16sp"
android:textAlignment="center" /> android:textAlignment="center" />
<TextView <TextView
android:visibility="gone" android:visibility="gone"
@@ -73,7 +76,9 @@
</LinearLayout> </LinearLayout>


<RelativeLayout <RelativeLayout
android:layout_width="match_parent"
android:layout_width="100dp"
android:gravity="right"
android:layout_alignParentRight="true"
android:layout_height="match_parent"> android:layout_height="match_parent">
<TextView <TextView
android:id="@+id/loading_status" android:id="@+id/loading_status"
@@ -81,20 +86,22 @@
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
android:gravity="center" android:gravity="center"
android:layout_width="100dp" android:layout_width="100dp"
android:textSize="16sp"
android:layout_height="50dp" android:layout_height="50dp"
android:text="制作中"></TextView> android:text="制作中"></TextView>
<Button <Button
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:id="@+id/quxiaozhizuo" android:id="@+id/quxiaozhizuo"
android:layout_width="100dp" android:layout_width="100dp"
android:layout_height="50dp"
android:layout_height="40dp"
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
android:layout_marginBottom="5dp" android:layout_marginBottom="5dp"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:background="@drawable/bg_btn_login_selected" android:background="@drawable/bg_btn_login_selected"
android:text="取消" android:text="取消"
android:textSize="16sp"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="14sp"/>
/>
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"


+ 1
- 1
app/src/main/res/layout/item/layout/newmakegood.xml View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="220dp"
android:layout_width="205dp"
android:layout_height="180dp"> android:layout_height="180dp">






+ 38
- 24
app/src/main/res/layout/item/layout/silos_jiaoyan_item_edit.xml View File

@@ -26,6 +26,20 @@
android:text="通道校准" android:text="通道校准"
android:textSize="20dp" android:textSize="20dp"
android:textStyle="bold" /> android:textStyle="bold" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="60dp"
android:text="当前重量："
android:textSize="20sp"/>

<TextView
android:id="@+id/current_weight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="实际出料重量："
android:textSize="20sp"/>
</LinearLayout> </LinearLayout>


<Button <Button
@@ -45,7 +59,7 @@
android:id="@+id/title_bc" android:id="@+id/title_bc"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="30dp"
android:layout_marginLeft="20dp"
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
android:text="11 豆瓣酱" android:text="11 豆瓣酱"
android:textAlignment="center" android:textAlignment="center"
@@ -107,7 +121,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="最小出料时间：" android:text="最小出料时间："
android:textSize="25sp"/>
android:textSize="20sp"/>


<EditText <EditText
android:id="@+id/min_time" android:id="@+id/min_time"
@@ -121,20 +135,20 @@
android:maxLines="1" android:maxLines="1"
android:padding="3dp" android:padding="3dp"
android:text="2" android:text="2"
android:textSize="25dp"/>
android:textSize="20sp"/>


</LinearLayout> </LinearLayout>


<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:layout_marginTop="20dp"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="最小出料重量：" android:text="最小出料重量："
android:textSize="25sp"/>
android:textSize="20sp"/>


<EditText <EditText
android:id="@+id/min_weight" android:id="@+id/min_weight"
@@ -148,19 +162,19 @@
android:maxLines="1" android:maxLines="1"
android:padding="3dp" android:padding="3dp"
android:text="2" android:text="2"
android:textSize="25dp"/>
android:textSize="20sp"/>


</LinearLayout> </LinearLayout>


<Button <Button
android:id="@+id/btn_min_standard" android:id="@+id/btn_min_standard"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_marginTop="30dp"
android:layout_marginTop="20dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/bg_btn_login_selected" android:background="@drawable/bg_btn_login_selected"
android:text="最小校准" android:text="最小校准"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="25sp"/>
android:textSize="20sp"/>
</LinearLayout> </LinearLayout>


<LinearLayout <LinearLayout
@@ -179,7 +193,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="最大出料时间：" android:text="最大出料时间："
android:textSize="25sp"/>
android:textSize="20sp"/>


<EditText <EditText
android:id="@+id/max_time" android:id="@+id/max_time"
@@ -193,20 +207,20 @@
android:maxLines="1" android:maxLines="1"
android:padding="3dp" android:padding="3dp"
android:text="2" android:text="2"
android:textSize="25dp"/>
android:textSize="20sp"/>


</LinearLayout> </LinearLayout>


<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:layout_marginTop="20dp"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="最大出料重量：" android:text="最大出料重量："
android:textSize="25sp"/>
android:textSize="20sp"/>


<EditText <EditText
android:id="@+id/max_weight" android:id="@+id/max_weight"
@@ -220,19 +234,19 @@
android:maxLines="1" android:maxLines="1"
android:padding="3dp" android:padding="3dp"
android:text="2" android:text="2"
android:textSize="25dp"/>
android:textSize="20sp"/>


</LinearLayout> </LinearLayout>


<Button <Button
android:layout_marginTop="30dp"
android:layout_marginTop="20dp"
android:id="@+id/btn_max_standard" android:id="@+id/btn_max_standard"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/bg_btn_login_selected" android:background="@drawable/bg_btn_login_selected"
android:text="最大校准" android:text="最大校准"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="25sp" />
android:textSize="20sp" />


</LinearLayout> </LinearLayout>


@@ -245,14 +259,14 @@
android:background="@color/gray"/> android:background="@color/gray"/>


<Button <Button
android:layout_marginTop="30dp"
android:layout_marginTop="20dp"
android:id="@+id/btn_save" android:id="@+id/btn_save"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/bg_btn_login_selected" android:background="@drawable/bg_btn_login_selected"
android:text="保存参数" android:text="保存参数"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="25sp" />
android:textSize="20sp" />


<View <View
android:layout_width="650dp" android:layout_width="650dp"
@@ -263,7 +277,7 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="30dp"
android:layout_marginTop="20dp"
android:orientation="horizontal"> android:orientation="horizontal">


<LinearLayout <LinearLayout
@@ -274,7 +288,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="模拟出料重量：" android:text="模拟出料重量："
android:textSize="25sp"/>
android:textSize="20sp"/>


<EditText <EditText
android:id="@+id/sim_discharge_weight" android:id="@+id/sim_discharge_weight"
@@ -288,7 +302,7 @@
android:maxLines="1" android:maxLines="1"
android:padding="3dp" android:padding="3dp"
android:text="2" android:text="2"
android:textSize="25dp"/>
android:textSize="20sp"/>


</LinearLayout> </LinearLayout>


@@ -300,14 +314,14 @@
android:background="@drawable/bg_btn_login_selected" android:background="@drawable/bg_btn_login_selected"
android:text="模拟出料" android:text="模拟出料"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="25sp" />
android:textSize="20sp" />


</LinearLayout> </LinearLayout>


<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="30dp"
android:layout_marginTop="20dp"
android:orientation="horizontal"> android:orientation="horizontal">


<LinearLayout <LinearLayout
@@ -318,14 +332,14 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="实际出料重量：" android:text="实际出料重量："
android:textSize="25sp"/>
android:textSize="20sp"/>


<TextView <TextView
android:id="@+id/tv_discharge_result" android:id="@+id/tv_discharge_result"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="" android:text=""
android:textSize="25sp"/>
android:textSize="20sp"/>


</LinearLayout> </LinearLayout>




Write Preview
Loading…
Cancel
Save