更新燃气炒锅

app/src/main/java/com/bonait/bnframework/common/utils/UpdateAppUtils.java

@@ -74,10 +74,10 @@ public class UpdateAppUtils {
     private static void doPost(final Context context) {
         VersionMode mode=new VersionMode();
         //大炒
-        mode.productCode="1679306986915368960";
-        mode.moduleCode="dcdjbbd";
-        mode.serverCode="1680766359592243200";
-        mode.branchCode="1679308856555737089";
+//        mode.productCode="1679306986915368960";
+//        mode.moduleCode="dcdjbbd";
+//        mode.serverCode="1680766359592243200";
+//        mode.branchCode="1679308856555737089";
 
         //小炒网络v版本
 //        mode.productCode="1679306986915368960";
@@ -86,10 +86,10 @@ public class UpdateAppUtils {
 //        mode.branchCode="1679307408505835521";
 
         //小炒单击
-//        mode.productCode="1679306986915368960";
-//        mode.moduleCode="xcdjbbd";
-//        mode.serverCode="1680766359592243200";
-//        mode.branchCode="1679308917918404609";
+        mode.productCode="1679306986915368960";
+        mode.moduleCode="xcdjbbd";
+        mode.serverCode="1680766359592243200";
+        mode.branchCode="1679308917918404609";
         String msg= new Json<VersionMode>().objectToJson(VersionMode.class, mode);
         String getNewVersionUrl =ConfigName.getInstance().UpdateVersion;
         MediaType JSON = MediaType.parse("application/json; charset=utf-8");

app/src/main/java/com/bonait/bnframework/modules/home/activity/BottomNavigationMainActivity.java

@@ -51,7 +51,7 @@ public class BottomNavigationMainActivity extends BaseActivity {
         ButterKnife.bind(this);
         mNavigateTabBar.onRestoreInstanceState(savedInstanceState);
         mNavigateTabBar.addTab(null, new MainNavigateTabBar.TabParam(R.mipmap.gongneng, R.mipmap.gongneng_selected, "功能"));
-        mNavigateTabBar.addTab(null, new MainNavigateTabBar.TabParam(R.mipmap.dingdan, R.mipmap.dingdan_selected, "订单"));
+        mNavigateTabBar.addTab(null, new MainNavigateTabBar.TabParam(R.mipmap.dingdan, R.mipmap.dingdan_selected, "成品"));
         mNavigateTabBar.addTab(null, new MainNavigateTabBar.TabParam(R.mipmap.dingdan, R.mipmap.dingdan_selected, "手动控制"));
         mNavigateTabBar.addTab(null, new MainNavigateTabBar.TabParam(0, 0, ""));
         mNavigateTabBar.addTab(null, new MainNavigateTabBar.TabParam(R.mipmap.dingdan, R.mipmap.dingdan_selected, "IO监控"));
@@ -168,7 +168,7 @@ public class BottomNavigationMainActivity extends BaseActivity {
                 case "功能":
                     _postion = 0;
                     break;
-                case "订单":
+                case "成品":
                     _postion = 1;
                     break;
                 case "手动控制":

app/src/main/java/com/bonait/bnframework/modules/home/adapter/sp_adapter.java

@@ -64,7 +64,7 @@ public class sp_adapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
                     @Override
                     public void onClick(View view) {
                         //按钮点击
-                        String title = "选择菜品操作提示！";
+                        String title = "选择配方操作提示！";
                         String message = "请问客官确定要选择["+goods.get(position).name+"],开始制作吗?";
                         AlertDialogUtils.showDialog(context, title, message, new QMUIDialogAction.ActionListener() {
                             @Override

app/src/main/java/com/bonait/bnframework/modules/home/fragment/MakeGoodFragment.java

@@ -435,17 +435,15 @@ public class MakeGoodFragment extends BaseFragment {
                 SetVisibility(0);
                 break;
             case R.id.startbutton:
-
                 if (ExecuteTheRecipe.IsStart.getValue()) {
                     //强制结束
                     AlertDialogUtils.showDialog("强制停止会提前结束任务，请问是否停止？",AlertDialogButton.OKCancel,(s)->{
                         if(s) ExecuteTheRecipe.SetForcedEnd(); //强制结束
                     });
-
                 } else {
                     //开始制作
                     if (!IsMake(true))  return;
-                    AlertDialogUtils.showDialog(context, "提示", "是否开始制作商品？", (s)->{
+                    AlertDialogUtils.showDialog(context, "提示", "是否开始任务？", (s)->{
                         if(s){
                             ExecuteTheRecipe.showlog("开始任务");
                             ExecuteTheRecipe.StopForcedEnd();
@@ -453,9 +451,7 @@ public class MakeGoodFragment extends BaseFragment {
                         }
                     });
                 }
-
                 break;
-
             case R.id.button_出料:
                 if (!ExecuteTheRecipe.getDeviceData.SystemStartStopStatusNotify.getValue()) {
                     AlertDialogUtils.showDialog(context, "提示", "系统未启动，请启动后重试！");

app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/CpActivity.java

@@ -208,11 +208,11 @@ public class CpActivity extends BaseActivity {
         ArrayList<BPA_GOODS> good = QueryDB.GetGoodsALL();
         List<String> Bendi_id = new ArrayList<>();
 
-        SectionHeader header_bdcp = new SectionHeader("本地菜谱", "", "");
+        SectionHeader header_bdcp = new SectionHeader("本地配方", "", "");
         ArrayList<SectionItem> contents_bdcp = new ArrayList<>();
 
-        SectionHeader header_sccp = new SectionHeader("收藏菜谱", "", "");
-        ArrayList<SectionItem> contents_sccp = new ArrayList<>();
+//        SectionHeader header_sccp = new SectionHeader("收藏配方", "", "");
+//        ArrayList<SectionItem> contents_sccp = new ArrayList<>();
 
 
         for (BPA_GOODS item : good) {
@@ -220,18 +220,18 @@ public class CpActivity extends BaseActivity {
                 item.url = "未知";
             }
             contents_bdcp.add(new SectionItem(item.name, String.valueOf(item.maketime), item.id, item.url, item.issc == 1, false, true));
-            if (item.issc == 1) {
-                contents_sccp.add(new SectionItem(item.name, String.valueOf(item.maketime), item.id, item.url, item.issc == 1, false, true));
-            }
-            Bendi_id.add(item.id);
+//            if (item.issc == 1) {
+//                contents_sccp.add(new SectionItem(item.name, String.valueOf(item.maketime), item.id, item.url, item.issc == 1, false, true));
+//            }
+//            Bendi_id.add(item.id);
         }
         list.add(new QMUISection<>(header_bdcp, contents_bdcp, false));
-        list.add(new QMUISection<>(header_sccp, contents_sccp, true));
+//        list.add(new QMUISection<>(header_sccp, contents_sccp, true));
         return list;
     }
 
     private void initTopBar() {
-        mTopBar.setTitle("菜谱管理");
+        mTopBar.setTitle("配方管理");
         /**
          * 返回按钮
          */
@@ -244,7 +244,7 @@ public class CpActivity extends BaseActivity {
         /**
          * 新建商品
          */
-        mTopBar.addRightTextButton("新建商品", R.id.topbar).setOnClickListener(new View.OnClickListener() {
+        mTopBar.addRightTextButton("新建配方", R.id.topbar).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 skipToActivity(DiyActivity.class);

app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/CpxzActivity.java

@@ -41,7 +41,7 @@ public class CpxzActivity extends BaseActivity {
     }
 
     private void initTopBar() {
-        mTopBar.setTitle("菜谱列表");
+        mTopBar.setTitle("配方列表");
         mTopBar.addLeftImageButton(R.mipmap.fanhui, R.id.topbar).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {

app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/DiyActivity.java

@@ -440,17 +440,17 @@ public class DiyActivity extends BaseActivity {
 
 
                 if (name.isEmpty()) {
-                    ToastUtils.info("菜谱名称不能为空!");
+                    ToastUtils.info("配方名称不能为空!");
                     return;
                 } else {
                     boolean isSucess = QueryDB.GetGoodsIs(name);
                     if (isSucess) {
-                        ToastUtils.info("菜谱名称已存在!");
+                        ToastUtils.info("配方名称已存在!");
                         return;
                     }
                     //按钮点击
-                    String title = "生成菜谱操作提示！";
-                    String message = "请问客官确定要生成[" + name + "]菜谱吗?";
+                    String title = "生成配方操作提示！";
+                    String message = "请问客官确定要生成[" + name + "]配方吗?";
                     AlertDialogUtils.showDialog(view.getContext(), title, message, new QMUIDialogAction.ActionListener() {
                         @Override
                         public void onClick(QMUIDialog dialog, int index) {
@@ -465,7 +465,7 @@ public class DiyActivity extends BaseActivity {
                             good.status = 1;
                             good.sort = goods.size() + 1;
                             good.maketime = sc;
-                            good.issc = check.isChecked() ? 1 : 0;
+                            good.issc = 0;//check.isChecked() ? 1 : 0;
                             good.url = imageUrl;
                             QueryDB.AddGoods(good);
                             for (int k = 0; k < bpa_goodsrecipes.size(); k++) {
@@ -474,7 +474,7 @@ public class DiyActivity extends BaseActivity {
                                 item.sort = k + 1;
                                 QueryDB.AddGoodsSrecipe(item);
                             }
-                            ToastUtils.info("菜谱生成成功!");
+                            ToastUtils.info("配方生成成功!");
                             MessageManager.getInstance().sendMessage(MessageName.ScGood, "Good");
                             dialog.dismiss();
                         }

app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/DiyUpdateActivity.java

@@ -66,8 +66,8 @@ public class DiyUpdateActivity extends BaseActivity {
     ImageView cpfm;//菜谱封面
     @BindView(R.id.zzsc)
     EditText zzsc;//制作时长
-    @BindView(R.id.check)
-    CheckBox check;//默认收藏
+//    @BindView(R.id.check)
+//    CheckBox check;//默认收藏
 //    @BindView(R.id.Banner_Main)
 //    Banner Banner_Main;//轮播图
     //用于存放获取的图片
@@ -277,7 +277,7 @@ public class DiyUpdateActivity extends BaseActivity {
                         bpa_goodsrecipes.add(item);
                     }
                     edittext.setText(good.name);
-                    check.setChecked(good.issc==1);
+                    //check.setChecked(good.issc==1);
                     zzsc.setText(good.maketime+"");
                     gxbz_adapter.notifyDataSetChanged();//刷新商品配方
                     new MyBitmapUtils().disPlay(cpfm,good.url);
@@ -396,7 +396,7 @@ public class DiyUpdateActivity extends BaseActivity {
         }
     }
     private void initTopBar() {
-        mTopBar.setTitle("菜谱信息修改");
+        mTopBar.setTitle("配方信息修改");
         mTopBar.addLeftImageButton(R.mipmap.fanhui,R.id.topbar).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -521,19 +521,19 @@ public class DiyUpdateActivity extends BaseActivity {
                 String name1=edittext.getText().toString();
                 if(name1.isEmpty())
                 {
-                    ToastUtils.info("菜谱名称不能为空!");
+                    ToastUtils.info("配方名称不能为空!");
                     return;
                 }else
                 {
                     boolean isSucess= QueryDB.GetGoodsIs(name1);
                     if(isSucess)
                     {
-                        ToastUtils.info("菜谱名称已存在!");
+                        ToastUtils.info("配方名称已存在!");
                         return;
                     }
                     //按钮点击
-                    String title = "生成菜谱操作提示！";
-                    String message = "请问客官确定要生成["+name1+"]菜谱吗?";
+                    String title = "生成配方操作提示！";
+                    String message = "请问客官确定要生成["+name1+"]配方吗?";
                     AlertDialogUtils.showDialog(view.getContext(), title, message, new QMUIDialogAction.ActionListener() {
                         @Override
                         public void onClick(QMUIDialog dialog, int index) {
@@ -549,7 +549,7 @@ public class DiyUpdateActivity extends BaseActivity {
                             good1.status=1;
                             good1.sort=goods.size()+1;
                             good1.maketime=sc;
-                            good1.issc=check.isChecked()?1:0;
+                            good1.issc=0;//check.isChecked()?1:0;
                             good1.url=good.url;
                             QueryDB.AddGoods(good1);
                             for (int k=0;k<bpa_goodsrecipes.size();k++)
@@ -560,7 +560,7 @@ public class DiyUpdateActivity extends BaseActivity {
                                 item.sort=k+1;
                                 QueryDB.AddGoodsSrecipe(item);
                             }
-                            ToastUtils.info("菜谱复刻成功!");
+                            ToastUtils.info("配方复刻成功!");
                             dialog.dismiss();
                             MessageManager.getInstance().sendMessage(MessageName.ScGood,"Good");
                             finish();
@@ -573,19 +573,19 @@ public class DiyUpdateActivity extends BaseActivity {
                 String name=edittext.getText().toString();
                 if(name.isEmpty())
                 {
-                    ToastUtils.info("菜谱名称不能为空!");
+                    ToastUtils.info("配方名称不能为空!");
                     return;
                 }else
                 {
                     boolean isSucess= QueryDB.GetGoodsIs(name,good.id);
                     if(isSucess)
                     {
-                        ToastUtils.info("菜谱名称已存在!");
+                        ToastUtils.info("配方名称已存在!");
                         return;
                     }
                     //按钮点击
-                    String title = "保存菜谱操作提示！";
-                    String message = "请问客官确定要保存["+name+"]菜谱吗?";
+                    String title = "保存配方操作提示！";
+                    String message = "请问客官确定要保存["+name+"]配方吗?";
                     AlertDialogUtils.showDialog(view.getContext(), title, message, new QMUIDialogAction.ActionListener() {
                         @Override
                         public void onClick(QMUIDialog dialog, int index) {
@@ -595,7 +595,7 @@ public class DiyUpdateActivity extends BaseActivity {
                                 sc=Integer.parseInt(zzsc.getText().toString());
                             }
                             good.maketime=sc;
-                            good.issc=check.isChecked()?1:0;
+                            good.issc=0;//check.isChecked()?1:0;
                             good.name=name;
                             QueryDB.UpdateGoods(good);
                             ArrayList<BPA_GOODSRECIPE> pe=QueryDB.GetGoodsSrecipeID(good.id);
@@ -610,7 +610,7 @@ public class DiyUpdateActivity extends BaseActivity {
                                 item.sort=k+1;
                                 QueryDB.AddGoodsSrecipe(item);
                             }
-                            ToastUtils.info("菜谱修改成功!");
+                            ToastUtils.info("配方修改成功!");
                             dialog.dismiss();
                             MessageManager.getInstance().sendMessage(MessageName.ScGood,"Good");
                             finish();

app/src/main/res/layout/activity_diy_update.xml

@@ -24,13 +24,15 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
                 <LinearLayout
-                    android:layout_marginTop="@dimen/dp_10"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/dp_10">
+
                     <LinearLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:orientation="vertical">
+
                         <RelativeLayout
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -46,27 +48,33 @@
                                 android:layout_marginBottom="3dp"
                                 android:src="@mipmap/loading3" />
                         </RelativeLayout>
+
                         <TextView
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:textAlignment="center"
-                            android:text="菜谱封面"/>
+                            android:text="配方封面"
+                            android:textSize="@dimen/textSize"
+                            android:textAlignment="center" />
                     </LinearLayout>
 
                     <LinearLayout
-                        android:layout_marginLeft="@dimen/dp_40"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
+                        android:layout_marginLeft="@dimen/dp_40"
                         android:orientation="vertical">
+
                         <LinearLayout
-                            android:layout_marginTop="@dimen/dp_10"
-                            android:layout_marginBottom="12dp"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/dp_10"
+                            android:layout_marginBottom="12dp">
+
                             <com.qmuiteam.qmui.widget.textview.QMUILinkTextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="菜谱名称："/>
+                                tools:ignore="TouchTargetSizeCheck"
+                                android:textSize="@dimen/textSize"
+                                android:text="配方名称：" />
                             <!--账号输入框-->
                             <EditText
                                 android:id="@+id/edittext"
@@ -74,24 +82,30 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginLeft="5dp"
                                 android:background="@drawable/input_bj"
-                                android:hint="请输入菜谱名称"
+                                tools:ignore="TouchTargetSizeCheck"
+                                android:hint="请输入配方名称"
                                 android:inputType="text"
                                 android:maxLines="1"
                                 android:padding="3dp"
-                                android:textSize="12dp" />
+                                android:textSize="@dimen/textSize" />
                         </LinearLayout>
+
                         <LinearLayout
-                            android:layout_marginBottom="12dp"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
+                            android:layout_height="wrap_content"
+                            android:layout_marginBottom="12dp">
+
                             <com.qmuiteam.qmui.widget.textview.QMUILinkTextView
                                 android:layout_width="wrap_content"
+                                tools:ignore="TouchTargetSizeCheck"
                                 android:layout_height="wrap_content"
-                                android:text="制作时长："/>
+                                android:textSize="@dimen/textSize"
+                                android:text="制作时长：" />
+
                             <!--账号输入框-->
                             <EditText
                                 android:id="@+id/zzsc"
-                                android:layout_width="match_parent"
+                                android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginLeft="5dp"
                                 android:background="@drawable/input_bj"
@@ -99,32 +113,47 @@
                                 android:inputType="number"
                                 android:maxLines="1"
                                 android:padding="3dp"
-                                android:textSize="12dp"
-                                android:text="0"/>
-                        </LinearLayout>
+                                tools:ignore="TouchTargetSizeCheck"
+                                android:text="0"
+                                android:textSize="@dimen/textSize" />
 
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
-                            <CheckBox
-                                android:layout_marginLeft="70dp"
-                                android:id="@+id/check"
-                                android:layout_width="wrap_content"
+                            <com.qmuiteam.qmui.widget.textview.QMUILinkTextView
+                                android:layout_width="50dp"
+                                tools:ignore="TouchTargetSizeCheck"
                                 android:layout_height="wrap_content"
-                                android:buttonTint="@color/radiusImageView_selected_mask_color"
-                                android:text="默认收藏"/>
+                                android:layout_marginLeft="5dp"
+                                android:textSize="@dimen/textSize"
+                                android:text="秒" />
+
                         </LinearLayout>
+
+                        <!--                        <LinearLayout-->
+                        <!--                            android:layout_width="match_parent"-->
+                        <!--                            android:layout_height="wrap_content">-->
+
+                        <!--                            <CheckBox-->
+                        <!--                                android:id="@+id/check"-->
+                        <!--                                android:layout_width="wrap_content"-->
+                        <!--                                android:layout_height="wrap_content"-->
+                        <!--                                android:layout_marginLeft="70dp"-->
+                        <!--                                tools:ignore="TouchTargetSizeCheck"-->
+                        <!--                                android:buttonTint="@color/radiusImageView_selected_mask_color"-->
+                        <!--                                android:text="默认收藏" />-->
+                        <!--                        </LinearLayout>-->
                     </LinearLayout>
                 </LinearLayout>
                 <!--边框分割细线-->
                 <LinearLayout
-                    android:layout_alignParentBottom="true"
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
+                    android:layout_alignParentBottom="true"
                     android:layout_marginBottom="@dimen/dp_10"
                     android:background="@color/color3" />
-                <LinearLayout android:layout_width="match_parent"
+
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="400dp">
+
                     <RelativeLayout
                         android:layout_width="0dp"
                         android:layout_weight="1"
@@ -134,55 +163,62 @@
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
                             android:orientation="vertical">
+
                             <LinearLayout
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:orientation="horizontal">
+
                                 <com.qmuiteam.qmui.widget.textview.QMUILinkTextView
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:text="步骤："/>
+                                    tools:ignore="TouchTargetSizeCheck"
+                                    android:textSize="@dimen/textSize"
+                                    android:text="步骤：" />
+
                                 <Button
                                     android:id="@+id/shangyi"
-                                    android:layout_width="50dp"
-                                    android:layout_height="26dp"
+                                    android:layout_width="80dp"
+                                    android:layout_height="40dp"
                                     android:background="@drawable/button"
                                     android:text="上移"
+                                    tools:ignore="TouchTargetSizeCheck"
                                     android:textColor="@color/black"
-                                    android:textSize="14dp"/>
+                                    android:textSize="@dimen/textSize" />
+
                                 <Button
                                     android:id="@+id/xiayi"
+                                    android:layout_width="80dp"
+                                    android:layout_height="40dp"
                                     android:layout_marginLeft="@dimen/dp_10"
-                                    android:layout_width="50dp"
-                                    android:layout_height="26dp"
                                     android:background="@drawable/button"
                                     android:text="下移"
+                                    tools:ignore="TouchTargetSizeCheck"
                                     android:textColor="@color/black"
-                                    android:textSize="14dp"/>
+                                    android:textSize="@dimen/textSize" />
                             </LinearLayout>
+
                             <ListView
                                 android:id="@+id/datatab_gxbz"
                                 android:layout_width="match_parent"
                                 android:layout_height="match_parent"
-                                android:divider="#00000000"
                                 android:layout_marginTop="10dp"
                                 android:layout_marginBottom="@dimen/dp_40"
+                                android:divider="#00000000"
                                 android:dividerHeight="3dp" />
                         </LinearLayout>
-
-
                     </RelativeLayout>
 
                     <RelativeLayout
-                        android:layout_marginLeft="@dimen/dp_10"
                         android:layout_width="0dp"
                         android:layout_weight="1"
-                        android:layout_height="wrap_content">
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/dp_10">
                         <!--边框分割细线-->
                         <RelativeLayout
-                            android:layout_alignParentLeft="true"
                             android:layout_width="@dimen/dp_10"
-                            android:layout_height="match_parent">
+                            android:layout_height="match_parent"
+                            android:layout_alignParentLeft="true">
 
                             <LinearLayout
                                 android:layout_width="1dp"
@@ -194,75 +230,84 @@
                         </RelativeLayout>
 
                         <LinearLayout
-                            android:layout_marginLeft="@dimen/dp_10"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
+                            android:layout_marginLeft="@dimen/dp_10"
                             android:orientation="vertical">
 
                             <LinearLayout
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:orientation="horizontal">
+
                                 <TextView
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:text="烹饪工序："/>
+                                    android:textSize="@dimen/textSize"
+                                    android:text="配方工序：" />
+
                                 <Spinner
                                     android:id="@+id/hrgx"
                                     style="@style/commonSpinnerStyle"
                                     android:layout_width="match_parent"
-                                    android:layout_height="24dp"
-                                    android:layout_centerVertical="true"
-                                    />
+                                    tools:ignore="TouchTargetSizeCheck"
+                                    android:layout_height="match_parent"
+                                    android:layout_centerVertical="true" />
                             </LinearLayout>
 
                             <ScrollView
                                 android:layout_width="match_parent"
-                                android:layout_marginBottom="40dp"
+                                android:layout_height="match_parent"
                                 android:layout_marginTop="20dp"
-                                android:layout_height="match_parent">
+                                android:layout_marginBottom="40dp">
+
                                 <LinearLayout
                                     android:id="@+id/gxchid"
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
-                                    android:orientation="vertical">
-                                </LinearLayout>
+                                    android:orientation="vertical"></LinearLayout>
                             </ScrollView>
 
                         </LinearLayout>
 
                         <LinearLayout
-                            android:layout_marginTop="@dimen/dp_10"
-                            android:layout_marginLeft="@dimen/dp_10"
-                            android:layout_alignParentBottom="true"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentBottom="true"
+                            android:layout_marginLeft="@dimen/dp_10"
+                            android:layout_marginTop="@dimen/dp_10">
+
                             <Button
                                 android:id="@+id/add_hrgx"
-                                android:layout_width="50dp"
-                                android:layout_height="26dp"
+                                android:layout_width="100dp"
+                                android:layout_height="40dp"
                                 android:background="@drawable/button1"
                                 android:text="添加"
+                                tools:ignore="TouchTargetSizeCheck"
                                 android:textColor="@color/black"
-                                android:textSize="14dp"/>
+                                android:textSize="@dimen/textSize" />
+
                             <Button
                                 android:id="@+id/update_gx"
+                                android:layout_width="100dp"
+                                android:layout_height="40dp"
                                 android:layout_marginLeft="@dimen/dp_10"
-                                android:layout_width="50dp"
-                                android:layout_height="26dp"
                                 android:background="@drawable/button"
+                                tools:ignore="TouchTargetSizeCheck"
                                 android:text="修改"
                                 android:textColor="@color/black"
-                                android:textSize="14dp"/>
+                                android:textSize="@dimen/textSize" />
+
                             <Button
                                 android:id="@+id/delete_gx"
+                                android:layout_width="100dp"
+                                android:layout_height="40dp"
                                 android:layout_marginLeft="@dimen/dp_10"
-                                android:layout_width="50dp"
-                                android:layout_height="26dp"
                                 android:background="@drawable/button"
+                                tools:ignore="TouchTargetSizeCheck"
                                 android:text="删除"
                                 android:textColor="@color/black"
-                                android:textSize="14dp"/>
+                                android:textSize="@dimen/textSize" />
                         </LinearLayout>
                     </RelativeLayout>
 
@@ -274,24 +319,26 @@
                     android:layout_marginBottom="30dp">
                     <LinearLayout
                         android:layout_centerHorizontal="true"
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="horizontal">
                         <Button
                             android:id="@+id/shengchengcaipu"
-                            android:layout_width="160dp"
+                            android:layout_width="0dp"
+                            android:layout_weight="1"
                             android:layout_height="45dp"
                             android:background="@drawable/bg_btn_login_selected"
-                            android:text="修改菜谱"
+                            android:text="修改配方"
                             android:textColor="@color/white"
                             android:textSize="18sp"/>
                         <Button
                             android:layout_marginLeft="@dimen/dp_40"
                             android:id="@+id/shengchengnewcaipu"
-                            android:layout_width="160dp"
+                            android:layout_width="0dp"
+                            android:layout_weight="1"
                             android:layout_height="45dp"
                             android:background="@drawable/bg_btn_login_selected"
-                            android:text="生成新菜谱"
+                            android:text="生成新配方"
                             android:textColor="@color/white"
                             android:textSize="18sp"/>
                     </LinearLayout>

app/src/main/res/layout/fragment_ding_dan.xml

@@ -172,7 +172,7 @@
                                     android:layout_alignParentLeft="true"
                                     android:layout_marginLeft="20dp"
                                     android:textSize="@dimen/textSize"
-                                    android:text="商品名称"
+                                    android:text="配方名称"
                                     android:textAlignment="center"
                                     android:textStyle="bold"
                                     android:textColor="@color/white"/>

app/src/main/res/layout/fragment_gongneng.xml

@@ -133,7 +133,7 @@
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:fontFamily="sans-serif-condensed-medium"
-                                        android:text="商品管理"
+                                        android:text="配方管理"
                                         android:textColor="@color/white"
                                         android:textSize="26dp"
                                         android:focusable="false"/>

app/src/main/res/layout/fragment_hand_control.xml

@@ -273,15 +273,15 @@
                         android:valueTo="100"
                         app:enableDrawHalo="false"
                         app:thumbColor="@color/we_read_thumb_color"
-                        app:thumbRadius="11dp"
+                        app:thumbRadius="21dp"
                         app:thumbText="0"
                         app:thumbTextBold="true"
                         app:thumbTextColor="@color/we_read_theme_color"
-                        app:thumbTextSize="12sp"
+                        app:thumbTextSize="19sp"
                         app:thumbWithinTrackBounds="true"
                         app:trackColor="@color/pro1"
                         app:trackColorInactive="@color/pro2"
-                        app:trackHeight="15dp" />
+                        app:trackHeight="25dp" />
                 </LinearLayout>
 
                 <Button
@@ -333,15 +333,15 @@
                         android:valueTo="100"
                         app:enableDrawHalo="false"
                         app:thumbColor="@color/we_read_thumb_color"
-                        app:thumbRadius="11dp"
+                        app:thumbRadius="21dp"
                         app:thumbText="0"
                         app:thumbTextBold="true"
                         app:thumbTextColor="@color/we_read_theme_color"
-                        app:thumbTextSize="12sp"
+                        app:thumbTextSize="19sp"
                         app:thumbWithinTrackBounds="true"
                         app:trackColor="@color/pro1"
                         app:trackColorInactive="@color/pro2"
-                        app:trackHeight="15dp" />
+                        app:trackHeight="25dp" />
                 </LinearLayout>
 
                 <Button
@@ -393,15 +393,15 @@
                         android:valueTo="100"
                         app:enableDrawHalo="false"
                         app:thumbColor="@color/we_read_thumb_color"
-                        app:thumbRadius="11dp"
+                        app:thumbRadius="21dp"
                         app:thumbText="0"
                         app:thumbTextBold="true"
                         app:thumbTextColor="@color/we_read_theme_color"
-                        app:thumbTextSize="12sp"
+                        app:thumbTextSize="19sp"
                         app:thumbWithinTrackBounds="true"
                         app:trackColor="@color/pro1"
                         app:trackColorInactive="@color/pro2"
-                        app:trackHeight="15dp" />
+                        app:trackHeight="25dp" />
                 </LinearLayout>
 
                 <Button
@@ -453,15 +453,15 @@
                         android:valueTo="100"
                         app:enableDrawHalo="false"
                         app:thumbColor="@color/we_read_thumb_color"
-                        app:thumbRadius="11dp"
+                        app:thumbRadius="21dp"
                         app:thumbText="0"
                         app:thumbTextBold="true"
                         app:thumbTextColor="@color/we_read_theme_color"
-                        app:thumbTextSize="12sp"
+                        app:thumbTextSize="19sp"
                         app:thumbWithinTrackBounds="true"
                         app:trackColor="@color/pro1"
                         app:trackColorInactive="@color/pro2"
-                        app:trackHeight="15dp" />
+                        app:trackHeight="25dp" />
                 </LinearLayout>
 
                 <Button
@@ -639,7 +639,7 @@
             android:clickable="true"
             android:orientation="horizontal">
 
-            <!--重量设定-->
+            <!--称控制-->
             <RelativeLayout
                 android:layout_width="0dp"
                 android:layout_height="0dp"
@@ -648,6 +648,52 @@
                 android:layout_columnWeight="1"
                 android:layout_rowWeight="1">
 
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:layout_marginLeft="@dimen/dp_10"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="当前重量:"
+                        android:textSize="@dimen/textSize"/>
+
+                    <TextView
+                        android:id="@+id/PanWeight"
+                        android:layout_marginLeft="@dimen/dp_10"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="100kg"
+                        android:textColor="@color/app_color_blue"
+                        android:textSize="@dimen/textSize"/>
+
+
+                </LinearLayout>
+
+                <Button
+                    android:id="@+id/button_重量清零"
+                    android:layout_width="130dp"
+                    android:layout_height="40dp"
+                    android:layout_marginRight="80dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@drawable/bg_btn_false_color"
+                    android:text="重量清零"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/textSize" />
+            </RelativeLayout>
+
+            <!--重量设定-->
+            <RelativeLayout
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_row="1"
+                android:layout_column="0"
+                android:layout_columnWeight="1"
+                android:layout_rowWeight="1">
+
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_centerVertical="true"
@@ -707,52 +753,6 @@
 
             </RelativeLayout>
 
-            <!--称控制-->
-            <RelativeLayout
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_row="1"
-                android:layout_column="0"
-                android:layout_columnWeight="1"
-                android:layout_rowWeight="1">
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:layout_height="wrap_content">
-
-                    <TextView
-                        android:layout_marginLeft="@dimen/dp_10"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="当前重量:"
-                        android:textSize="@dimen/textSize"/>
-
-                    <TextView
-                        android:id="@+id/PanWeight"
-                        android:layout_marginLeft="@dimen/dp_10"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="100kg"
-                        android:textColor="@color/app_color_blue"
-                        android:textSize="@dimen/textSize"/>
-
-
-                </LinearLayout>
-
-                <Button
-                    android:id="@+id/button_重量清零"
-                    android:layout_width="130dp"
-                    android:layout_height="40dp"
-                    android:layout_marginRight="80dp"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-                    android:background="@drawable/bg_btn_false_color"
-                    android:text="重量清零"
-                    android:textColor="@color/white"
-                    android:textSize="@dimen/textSize" />
-            </RelativeLayout>
-
             <RelativeLayout
                 android:layout_width="0dp"
                 android:layout_height="0dp"
@@ -786,15 +786,15 @@
                         android:valueTo="100"
                         app:enableDrawHalo="false"
                         app:thumbColor="@color/we_read_thumb_color"
-                        app:thumbRadius="11dp"
+                        app:thumbRadius="21dp"
                         app:thumbText="0"
                         app:thumbTextBold="true"
                         app:thumbTextColor="@color/we_read_theme_color"
-                        app:thumbTextSize="12sp"
+                        app:thumbTextSize="19sp"
                         app:thumbWithinTrackBounds="true"
                         app:trackColor="@color/pro1"
                         app:trackColorInactive="@color/pro2"
-                        app:trackHeight="15dp" />
+                        app:trackHeight="25dp" />
                 </LinearLayout>
 
                 <Button