Merge branch 'master-new-炒锅' of http://10.2.1.24:10244/fyf/AndroidSmartClient into master-new-炒锅

# Conflicts:
#	app/src/main/res/layout/fragment_cloud_goods.xml
#	app/src/main/res/layout/fragment_home_foods.xml

.idea/deploymentTargetDropDown.xml

@@ -1,23 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="deploymentTargetDropDown">
-    <value>
-      <entry key="app">
-        <State>
-          <targetSelectedWithDropDown>
-            <Target>
-              <type value="QUICK_BOOT_TARGET" />
-              <deviceKey>
-                <Key>
-                  <type value="VIRTUAL_DEVICE_PATH" />
-                  <value value="C:\Users\admin\.android\avd\bpa_API_30.avd" />
-                </Key>
-              </deviceKey>
-            </Target>
-          </targetSelectedWithDropDown>
-          <timeTargetWasSelectedWithDropDown value="2024-07-22T08:13:30.759237600Z" />
-        </State>
-      </entry>
-    </value>
+    <runningDeviceTargetSelectedWithDropDown>
+      <Target>
+        <type value="RUNNING_DEVICE_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="SERIAL_NUMBER" />
+            <value value="127.0.0.1:7555" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </runningDeviceTargetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2024-08-05T02:04:42.367559500Z" />
   </component>
 </project>

app/src/main/java/com/bonait/bnframework/MainApplication.java

@@ -59,6 +59,7 @@ import java.util.Arrays;
 import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 
@@ -89,6 +90,12 @@ public class MainApplication extends Application {
         context = getApplicationContext();
         ConfigName.getInstance().dishesCon = this;
         ConfigName.getInstance().app = this;
+        ConfigName.getInstance().SilosDisplayMaterial= new ConcurrentHashMap<Integer,String >() {{
+            put(1, "111");
+            put(2, "222");
+            put(3, "333");
+            put(4, "444");
+        }};
         ThreadManager.get().inti();
     }
 }

app/src/main/java/com/bonait/bnframework/business/ConfigData.java

@@ -1205,7 +1205,14 @@ public class ConfigData {
                 processTS = ConfigName.getInstance().Process_大炒;
             } else if (ConfigName.getInstance().versionSelectionEnum.equals("大炒自动投料版本")) {
                 plcaddresses = ConfigName.getInstance().PlcAddress_大炒自动投料;
-                processTS = ConfigName.getInstance().Process_大炒自动投料;
+                switch (ConfigName.getInstance().app.getString(R.string.language)){
+                    case "en":
+                        processTS = ConfigName.getInstance().Process_大炒自动投料_en;
+                        break;
+                    case "zh":
+                        processTS = ConfigName.getInstance().Process_大炒自动投料;
+                        break;
+                }
             } else if (ConfigName.getInstance().versionSelectionEnum.equals("小炒版本")) {
                 plcaddresses = ConfigName.getInstance().PlcAddress_小炒;
                 processTS = ConfigName.getInstance().Process_小炒;
@@ -1251,7 +1258,15 @@ public class ConfigData {
                 processTS = ConfigName.getInstance().Process_大炒;
             } else if (ConfigName.getInstance().versionSelectionEnum.equals("大炒自动投料版本")) {
                 plcaddresses = ConfigName.getInstance().PlcAddress_大炒自动投料;
-                processTS = ConfigName.getInstance().Process_大炒自动投料;
+                switch (ConfigName.getInstance().app.getString(R.string.language)){
+                    case "en":
+                        processTS = ConfigName.getInstance().Process_大炒自动投料_en;
+                        break;
+                    case "zh":
+                        processTS = ConfigName.getInstance().Process_大炒自动投料;
+                        break;
+                }
+
             } else if (ConfigName.getInstance().versionSelectionEnum.equals("小炒版本")) {
                 plcaddresses = ConfigName.getInstance().PlcAddress_小炒;
                 processTS = ConfigName.getInstance().Process_小炒;

app/src/main/java/com/bonait/bnframework/common/constant/ConfigName.java

@@ -34,7 +34,7 @@ public class ConfigName {
     //region 单例模式
     private static ConfigName mInstance; //实例变量设置私有，防止直接通过类名访问
 
-    private ConfigName() { //默认构造函数私有，防止类外直接new创建对象
+    private ConfigName() {//默认构造函数私有，防止类外直接new创建对象
     }
 
     public static synchronized ConfigName getInstance() { //静态同步方法作为唯一的实例对象获取方式
@@ -745,6 +745,21 @@ public class ConfigName {
         add(new ProcessT("出菜", Arrays.asList("等待(秒)")));
         add(new ProcessT("清洗", Arrays.asList("清洗方式","抽水量","等待(秒)")));
 
+    }};
+    /**
+     * 大炒自动投料工序模型
+     */
+    public List<ProcessT> Process_大炒自动投料_en = new ArrayList<ProcessT>() {{
+        add(new ProcessT("Stir", Arrays.asList("Stirring Rate", "Delay(s)")));
+        add(new ProcessT("Possition", Arrays.asList("Turn Rate", "Move", "Delay(s)")));
+        add(new ProcessT("Heat", Arrays.asList("Heat Power", "Delay(s)")));
+        add(new ProcessT("Material", Arrays.asList("Name", "Main Possition", "Weight", "Input Move","Fry Bit","Cook(s)")));
+        add(new ProcessT("Liquor", new ArrayList<>()));
+        add(new ProcessT("Parallel Pour", Arrays.asList("Gram Weight","Delay(s)")));
+        add(new ProcessT("Delay", Arrays.asList("Delay(s)")));
+        add(new ProcessT("Serve Dishes", Arrays.asList("Delay(s)")));
+        add(new ProcessT("Clean", Arrays.asList("Way","Weight","Delay(s)")));
+
     }};
     /**
      * 小炒基础PLC模型
@@ -1347,24 +1362,49 @@ public class ConfigName {
      */
     public static String GetProcessTypeVal(String item) {
         String data = "";
-        if (item.equals("搅拌动作")) {
-            data = "正转反转、一直正转、一直反转";
-        } else if (item.equals("位置动作")) {
-            data = "原点位、出餐启动、倒菜位、抽料位、清洗位、炒菜位1、炒菜位2、炒菜位3";
-        } else if (item.equals("炒制位置")) {
-            data = "炒菜位1、炒菜位2、炒菜位3、原点位";
-        }else if (item.equals("投料动作")) {
-            //data = "投出抖动三次、投出等待三秒、直接投出、手动投料";
-            data = "投出等待三秒、直接投出、手动投料";
-        }else if (item.equals("清洗方式")) {
-            data = "一般清洗、深度清洗";
-        }
-        else if (item.equals("主料位置")) {
-            data = "1号位、2号位、3号位、4号位";
-        } else if (item.equals("正转速度") || item.equals("反转速度") || item.equals("转动速度") || item.equals("搅拌速度")) {
-            data = "停止、最低、低速、中速、高速、最高、极高";
-        } else if (item.equals("加热功率") || item.equals("热锅功率")) {
-            data = "停止、一档、二档、三档、四档、五档、六档、七档、八档";
+        switch (ConfigName.getInstance().app.getString(R.string.language)){
+            case "en":
+                if (item.equals("FryMove")) {
+                    data = "Positive&negative、Positive、negative";
+                } else if (item.equals("Move")) {
+                    data = "Origin、Maintain、Pour、Extract、Clean、Fry1、Fry2、Fry3";
+                } else if (item.equals("Fry Bit")) {
+                    data = "Fry1、Fry2、Fry3、Origin";
+                }else if (item.equals("Input Move")) {
+                    //data = "投出抖动三次、投出等待三秒、直接投出、手动投料";
+                    data = "Wait 3s、Direct Throw、Manual Throw";
+                }else if (item.equals("Way")) {
+                    data = "Normal、Depth";
+                }
+                else if (item.equals("Main Possition")) {
+                    data = "1Bit、2Bit、3Bit、4Bit";
+                } else if (item.equals("Positive") || item.equals("negative") || item.equals("Stirring Rate") || item.equals("Turn Rate")) {
+                    data = "Stop、Lowest、Low、Middle、High、Highest、Extreme";
+                } else if (item.equals("Heat Power") || item.equals("热锅功率")) {
+                    data = "Stop、1Gear、2Gear、3Gear、4Gear、5Gear、6Gear、7Gear、8Gear";
+                }
+                break;
+            case "zh":
+                if (item.equals("搅拌动作")) {
+                    data = "正转反转、一直正转、一直反转";
+                } else if (item.equals("位置动作")) {
+                    data = "原点位、出餐启动、倒菜位、抽料位、清洗位、炒菜位1、炒菜位2、炒菜位3";
+                } else if (item.equals("炒制位置")) {
+                    data = "炒菜位1、炒菜位2、炒菜位3、原点位";
+                }else if (item.equals("投料动作")) {
+                    //data = "投出抖动三次、投出等待三秒、直接投出、手动投料";
+                    data = "投出等待三秒、直接投出、手动投料";
+                }else if (item.equals("清洗方式")) {
+                    data = "一般清洗、深度清洗";
+                }
+                else if (item.equals("主料位置")) {
+                    data = "1号位、2号位、3号位、4号位";
+                } else if (item.equals("正转速度") || item.equals("反转速度") || item.equals("转动速度") || item.equals("搅拌速度")) {
+                    data = "停止、最低、低速、中速、高速、最高、极高";
+                } else if (item.equals("加热功率") || item.equals("热锅功率")) {
+                    data = "停止、一档、二档、三档、四档、五档、六档、七档、八档";
+                }
+                break;
         }
         return data;
     }
@@ -1569,12 +1609,7 @@ public class ConfigName {
     /**
      * 料仓显示物料
      */
-    public ConcurrentHashMap<Integer,String > SilosDisplayMaterial = new ConcurrentHashMap<Integer,String >() {{
-        put(1, "未设置");
-        put(2, "未设置");
-        put(3, "未设置");
-        put(4, "未设置");
-    }};
+    public ConcurrentHashMap<Integer,String > SilosDisplayMaterial;
 
 
     //endregion

app/src/main/java/com/bonait/bnframework/common/constant/DataBus.java

@@ -150,6 +150,7 @@ public class DataBus {
             lcModes=new ArrayList<>();
             //获取料仓数据
             ArrayList<BPA_SILOS> bpa_silos = QueryDB.GetSilosALL();
+            String name = ConfigName.getInstance().app.getString(R.string.text_waterset);
             //加载materials数据
             if (bpa_silos.size() > 0) {
                 for (BPA_SILOS silo : bpa_silos) {
@@ -157,7 +158,7 @@ public class DataBus {
                     if (m.size() > 0) {
                         lcModes.add(new lcMode(silo.id, silo.num, m.get(0).name, silo.silosmargin, silo.siloszl, m.get(0).id,m.get(0).type, silo.warningValue, silo.thrsoleValue));
                     } else {
-                        lcModes.add(new lcMode(silo.id, silo.num, "未设置", silo.silosmargin, silo.siloszl, "",0, silo.warningValue, silo.thrsoleValue));
+                        lcModes.add(new lcMode(silo.id, silo.num, name, silo.silosmargin, silo.siloszl, "",0, silo.warningValue, silo.thrsoleValue));
                     }
                 }
             }
@@ -183,6 +184,7 @@ public class DataBus {
     {
         ArrayList<lcMode> lc=new ArrayList<>();
         try {
+            String name = ConfigName.getInstance().app.getString(R.string.text_waterset);
             //获取料仓数据
             ArrayList<BPA_SILOS> bpa_silos = QueryDB.GetSilosALL();
             //加载materials数据
@@ -192,7 +194,7 @@ public class DataBus {
                     if (m.size() > 0) {
                         lc.add(new lcMode(silo.id, silo.num, m.get(0).name, silo.silosmargin, silo.siloszl, m.get(0).id,m.get(0).type, silo.warningValue, silo.thrsoleValue));
                     } else {
-                        lc.add(new lcMode(silo.id, silo.num, "未设置", silo.silosmargin, silo.siloszl, "",0, silo.warningValue, silo.thrsoleValue));
+                        lc.add(new lcMode(silo.id, silo.num, name, silo.silosmargin, silo.siloszl, "",0, silo.warningValue, silo.thrsoleValue));
                     }
                 }
             }

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

@@ -7,6 +7,7 @@ import android.widget.TextView;
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.bonait.bnframework.R;
+import com.bonait.bnframework.common.constant.ConfigName;
 import com.bonait.bnframework.ui.util.DisplayManager;
 import com.bonait.bnframework.ui.widget.XComDialog;
 import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
@@ -175,6 +176,52 @@ public class AlertDialogUtils {
         });
     }
 
+    public static void showTipDialog(AppCompatActivity activity,String title_zh,String content_zh,String title_en,String content_en,DialogClickListener listener){
+        showCancelAndConfirmDialog(activity,R.layout.dialog_with_cancel_confirm, new XComDialog.OnDialogListener(){
+            @Override
+            public void onDialogClick(View layoutView, XComDialog xCom) {
+                TextView tvTitle = layoutView.findViewById(R.id.tv_title);
+                TextView tvContent = layoutView.findViewById(R.id.tv_content);
+                TextView tvCancel = layoutView.findViewById(R.id.tv_cancel);
+                TextView tvConfirm = layoutView.findViewById(R.id.tv_confirm);
+                DisplayManager.scaleView(layoutView.findViewById(R.id.rl_btn));
+                DisplayManager.scaleView(tvTitle);
+                DisplayManager.scaleView(tvContent);
+                DisplayManager.scaleView(tvCancel);
+                DisplayManager.scaleView(tvConfirm);
+
+                switch (ConfigName.getInstance().app.getString(R.string.language)){
+                    case "en":
+                        tvTitle.setText( title_en+"");
+                        tvContent.setText(content_en+"");
+                        break;
+                    case "zh":
+                        tvTitle.setText( title_zh+"");
+                        tvContent.setText(content_zh+"");
+                        break;
+                }
+
+                tvCancel.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        xCom.dismissX();
+                        if(listener!=null){
+                            listener.onCancel();
+                        }
+                    }
+                });
+                tvConfirm.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        xCom.dismissX();
+                        if(listener!=null){
+                            listener.onConfirm();
+                        }
+                    }
+                });
+            }
+        });
+    }
     public interface DialogClickListener{
         void onConfirm();
         void onCancel();

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

@@ -12,6 +12,7 @@ import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
+import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
@@ -62,10 +63,10 @@ public class HomeFragmentSBKZ extends BaseFragment {
     ImageView plcstatus1;
 
     @BindView(R.id.zidongqingxi)
-    RelativeLayout zidongqingxi;
+    Button zidongqingxi;
 
     @BindView(R.id.chushihua)
-    RelativeLayout chushihua;
+    Button chushihua;
 
     @BindView(R.id.huoli)
     newhuoli_control huoli;
@@ -226,7 +227,7 @@ public class HomeFragmentSBKZ extends BaseFragment {
                         SetIDTouch(R.id.chushui, false);
                     }
                 } else {
-                    ToastUtils.warning("请先控制锅口朝向：抽料位");
+                    ToastUtils.warning(getString(R.string.text_potdirection_1));
                     SetIDTouch(R.id.chushui, false);
                 }
                 return false;
@@ -243,7 +244,7 @@ public class HomeFragmentSBKZ extends BaseFragment {
                         SetIDTouch(R.id.xiguoshui, false);
                     }
                 } else {
-                    ToastUtils.warning("请先控制锅口朝向：清洗位");
+                    ToastUtils.warning(getString(R.string.text_potdirection_2));
                     SetIDTouch(R.id.xiguoshui, false);
                 }
                 return false;
@@ -260,7 +261,7 @@ public class HomeFragmentSBKZ extends BaseFragment {
                         SetIDTouch(R.id.yeliao1, false);
                     }
                 } else {
-                    ToastUtils.warning(getString(R.string.text_potdirection));
+                    ToastUtils.warning(getString(R.string.text_potdirection_1));
                     SetIDTouch(R.id.yeliao1, false);
                 }
                 return false;
@@ -277,7 +278,7 @@ public class HomeFragmentSBKZ extends BaseFragment {
                         SetIDTouch(R.id.yeliao2, false);
                     }
                 } else {
-                    ToastUtils.warning(getString(R.string.text_potdirection));
+                    ToastUtils.warning(getString(R.string.text_potdirection_1));
                     SetIDTouch(R.id.yeliao2, false);
                 }
                 return false;
@@ -294,7 +295,7 @@ public class HomeFragmentSBKZ extends BaseFragment {
                         SetIDTouch(R.id.yeliao3, false);
                     }
                 } else {
-                    ToastUtils.warning(getString(R.string.text_potdirection));
+                    ToastUtils.warning(getString(R.string.text_potdirection_1));
                     SetIDTouch(R.id.yeliao3, false);
                 }
                 return false;
@@ -362,8 +363,15 @@ public class HomeFragmentSBKZ extends BaseFragment {
                                     } else {
                                         chaoguo_wendu.setText("??°C");
                                     }
+                                    switch (getString(R.string.language)){
+                                        case "en":
+                                            plcstatus1.setImageResource(ConfigName.getInstance().PlcIsConnect ? R.mipmap.plc4 : R.mipmap.plc3);
+                                            plcstatus1.setScaleType(ImageView.ScaleType.FIT_CENTER);
+                                            break;
+                                        case "zh":
+                                            plcstatus1.setImageResource(ConfigName.getInstance().PlcIsConnect ? R.mipmap.plc1 : R.mipmap.plc2);
+                                    }
 
-                                    plcstatus1.setImageResource(ConfigName.getInstance().PlcIsConnect ? R.mipmap.plc1 : R.mipmap.plc2);
                                 }
                             });
                         }
@@ -719,13 +727,20 @@ public class HomeFragmentSBKZ extends BaseFragment {
 
                     BPA_GOODSRECIPE data = Get主料(num);
                     ExecuteTheRecipe.ExecuteOperationSteps(data.processname, data.processvalue);
-                    ToastUtils.warning("主料：" + num + "号仓投放");
+                    switch (getString(R.string.language)){
+                        case "en":
+                            ToastUtils.warning("Main Ingredient：" + num + "Stash Put Into");
+                            break;
+                        case "zh":
+                            ToastUtils.warning("主料：" + num + "号仓投入");
+                            break;
+                    }
                     isMake = false;
                 }
             }).start();
         }else
         {
-            ToastUtils.warning("请耐心等待上一次投料结束!!!");
+            ToastUtils.warning(getString(R.string.text_waitput));
         }
     }
 

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

@@ -396,7 +396,7 @@ public class SystemSeasoningsetFragment extends BaseFragment implements MyClickL
                     materials.add(item);
                 }
                 BPA_MATERIAL wsz = new BPA_MATERIAL();
-                wsz.name = "未设置";
+                wsz.name = getString(R.string.text_waterset);
                 wsz.id = "";
                 materials.add(wsz);
                 for (BPA_MATERIAL item : materials) {

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

@@ -86,7 +86,7 @@ public class QDListSectionAdapter extends QMUIDefaultStickySectionAdapter {
         boolean isCloud=((SectionItem)section.getItemAt(itemIndex)).getIsCloud();//是否云端商品
         if(isCloud)
         {
-            Sc_text.setText("下载");
+            Sc_text.setText(ConfigName.getInstance().app.getString(R.string.btn_download));
             delete_text.setVisibility(View.GONE);
             sc_image.setVisibility(View.GONE);
             if(((SectionItem)section.getItemAt(itemIndex)).getIsdownload())
@@ -95,7 +95,7 @@ public class QDListSectionAdapter extends QMUIDefaultStickySectionAdapter {
             }
         }else
         {
-            Sc_text.setText("上传");
+            Sc_text.setText(ConfigName.getInstance().app.getString(R.string.btn_update));
             delete_text.setVisibility(View.VISIBLE);
             sc_image.setVisibility(View.VISIBLE);
             Sc_text.setVisibility(View.VISIBLE);

app/src/main/java/com/bonait/bnframework/ui/activity/DiyProcessActivity.java

@@ -590,12 +590,20 @@ public class DiyProcessActivity extends BaseActivity {
                 public void onDialogClick(View layoutView, XComDialog xCom) {
                     DialogWithCancelConfirmBinding binding = DialogWithCancelConfirmBinding.bind(layoutView);
                     DisplayManager.scaleView(binding.getRoot());
-
-
-                    binding.tvTitle.setText("保存并返回");
-                    binding.tvContent.setText("即将退出页面,是否保存工序？");
-                    binding.tvCancel.setText("不保存");
-                    binding.tvConfirm.setText("保存");
+                    switch (getString(R.string.language)){
+                        case "en":
+                            binding.tvTitle.setText("Save&Return");
+                            binding.tvContent.setText("About to exit the page, whether to save the process？");
+                            binding.tvCancel.setText("Don't save");
+                            binding.tvConfirm.setText("Save");
+                            break;
+                        case "zh":
+                            binding.tvTitle.setText("保存并返回");
+                            binding.tvContent.setText("即将退出页面,是否保存工序？");
+                            binding.tvCancel.setText("不保存");
+                            binding.tvConfirm.setText("保存");
+                            break;
+                    }
                     binding.tvCancel.setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View view) {

app/src/main/java/com/bonait/bnframework/ui/activity/EditClassifyActivity.java

@@ -97,7 +97,7 @@ public class EditClassifyActivity extends BaseActivity {
         attributeList.clear();
         subattributeList.clear();
         classifyList.clear();
-        classifyList.put("未选择","");
+        classifyList.put(getString(R.string.text_noselect),"");
         for(BPA_GOODS_CLASSIFY goodsClassify:GoodsClassifyDBUtil.getAll()){
             classifyList.put(goodsClassify.name,goodsClassify.id);
         }
@@ -143,7 +143,7 @@ public class EditClassifyActivity extends BaseActivity {
             @Override
             public void clickListenerNew(View v, int k, Object data) {
                 if(ConfigName.getInstance().isFastClick()){
-                    NewToastUtil.getInstance().showToast("重复点击！");
+                    NewToastUtil.getInstance().showToast("重复点击！","Repeat click!");
                     return;
                 }
                 attributePosition = k;
@@ -163,26 +163,26 @@ public class EditClassifyActivity extends BaseActivity {
             @Override
             public void clickName(View v,int position,BPA_SUBATTRIBUTE data) {
                 if(ConfigName.getInstance().isFastClick()){
-                    NewToastUtil.getInstance().showToast("重复点击！");
+                    NewToastUtil.getInstance().showToast("重复点击！","Repeat click!");
                     return;
                 }
                 //修改子属性
                 AlertDialogUtils.showCancelAndConfirmDialog(EditClassifyActivity.this, R.layout.dialog_add_classify, (layoutView, xCom) -> {
                     DialogAddClassifyBinding binding = DialogAddClassifyBinding.bind(layoutView);
                     DisplayManager.scaleViewGroup(binding.getRoot());
-                    binding.title.setText("修改子属性名称");
-                    binding.edit.setHint("请输入子属性名称");
+                    binding.title.setText(getString(R.string.top_revisechildattribute));
+                    binding.edit.setHint(getString(R.string.info_revisechildattribute));
                     binding.edit.setText(data.name);
                     binding.submit.setOnClickListener(view1 -> {
                         if(ConfigName.getInstance().isFastClick()){
-                            NewToastUtil.getInstance().showToast("点击过快！");
+                            NewToastUtil.getInstance().showToast("点击过快！","Click too fast!");
                             return;
                         }
                         String input = String.valueOf(binding.edit.getText());
                         if(!input.isEmpty()){
                             for(BPA_SUBATTRIBUTE bean:subattributeList){
                                 if(bean.name.equals(input)){
-                                    NewToastUtil.getInstance().showToast("已有该子属性，请换一个名称！");
+                                    NewToastUtil.getInstance().showToast("已有该子属性，请换一个名称！","This subattribute already exists, please change its name!");
                                     return;
                                 }
                             }
@@ -201,13 +201,13 @@ public class EditClassifyActivity extends BaseActivity {
                                     }
                                 }
                             }
-                            NewToastUtil.getInstance().showToast("修改成功");
+                            NewToastUtil.getInstance().showToast("修改成功","Revise Success!");
                             subattributeAdapter.notifyDataSetChanged();
                             if(position-1>=0 && !subattributeList.isEmpty()){
                                 viewBinding.listSubattribute.smoothScrollToPosition(position-1);
                             }
                         }else {
-                            NewToastUtil.getInstance().showToast("名称不能为空！");
+                            NewToastUtil.getInstance().showToast("名称不能为空！","The name cannot be empty!");
                         }
                     });
                 });
@@ -296,18 +296,18 @@ public class EditClassifyActivity extends BaseActivity {
         AlertDialogUtils.showCancelAndConfirmDialog(this, R.layout.dialog_add_classify, (layoutView, xCom) -> {
             DialogAddClassifyBinding binding = DialogAddClassifyBinding.bind(layoutView);
             DisplayManager.scaleViewGroup(binding.getRoot());
-            binding.title.setText("新增分类名称");
-            binding.edit.setHint("请输入分类名称");
+            binding.title.setText(getString(R.string.top_addclass));
+            binding.edit.setHint(getString(R.string.info_addclass));
             binding.submit.setOnClickListener(view1 -> {
                 if(ConfigName.getInstance().isFastClick()){
-                    NewToastUtil.getInstance().showToast("点击过快！");
+                    NewToastUtil.getInstance().showToast("点击过快！","Click too fast");
                     return;
                 }
                 String input = String.valueOf(binding.edit.getText());
                 if(!input.isEmpty()){
                     for (Map.Entry<String, String> entry : classifyList.entrySet()) {
                         if(entry.getKey().equals(input)){
-                            NewToastUtil.getInstance().showToast("已有该分类，请换一个名称！");
+                            NewToastUtil.getInstance().showToast("已有该分类，请换一个名称！","This class already exists, please change its name!");
                             return;
                         }
                     }
@@ -321,14 +321,14 @@ public class EditClassifyActivity extends BaseActivity {
                         spinnerAdapter.notifyDataSetChanged();
 
                         selectClassify(classifyList.size()-1);//更新数据
-                        NewToastUtil.getInstance().showToast("添加["+input+"]分类成功！");
+                        NewToastUtil.getInstance().showToast("添加["+input+"]分类成功！","Add ["+input+"] Success！");
                         RecordManager.getInstance().addLogRecord("角色操作日志", "添加["+input+"]分类成功！");
                     }else {
-                        NewToastUtil.getInstance().showToast("添加["+input+"]分类失败！");
+                        NewToastUtil.getInstance().showToast("添加["+input+"]分类失败！","Add ["+input+"] Fail！");
                     }
                     xCom.dismissX();
                 }else {
-                    NewToastUtil.getInstance().showToast("名称不能为空！");
+                    NewToastUtil.getInstance().showToast("名称不能为空！","The name cannot be empty!");
                 }
             });
         });
@@ -346,18 +346,18 @@ public class EditClassifyActivity extends BaseActivity {
             DisplayManager.scaleViewGroup(binding.getRoot());
             String classifyId = classifyList.get(viewBinding.spinnerClassify.getSelectedItem().toString());
             String classifyName = viewBinding.spinnerClassify.getSelectedItem().toString();
-            binding.title.setText("修改分类名称");
+            binding.title.setText(getString(R.string.top_reviseclass));
             binding.edit.setText(classifyName);
             binding.submit.setOnClickListener(view1 -> {
                 if(ConfigName.getInstance().isFastClick()){
-                    NewToastUtil.getInstance().showToast("点击过快！");
+                    NewToastUtil.getInstance().showToast("点击过快！","Click too fast");
                     return;
                 }
                 String input = String.valueOf(binding.edit.getText());
                 if(!input.isEmpty()){
                     for (Map.Entry<String, String> entry : classifyList.entrySet()) {
                         if(entry.getKey().equals(input)){
-                            NewToastUtil.getInstance().showToast("已有该分类，请换一个名称！");
+                            NewToastUtil.getInstance().showToast("已有该分类，请换一个名称！","This class already exists, please change its name!");
                             return;
                         }
                     }
@@ -373,10 +373,10 @@ public class EditClassifyActivity extends BaseActivity {
                     spinnerAdapter.notifyDataSetChanged();
                     selectClassify(classifyList.size()-1);//更新数据
                     RecordManager.getInstance().addLogRecord("角色操作日志", "修改["+input+"]分类成功！");
-                    NewToastUtil.getInstance().showToast("修改["+input+"]分类成功！");
+                    NewToastUtil.getInstance().showToast("修改["+input+"]分类成功！","Revise ["+input+"] Success！");
                     xCom.dismissX();
                 }else {
-                    NewToastUtil.getInstance().showToast("名称不能为空！");
+                    NewToastUtil.getInstance().showToast("名称不能为空！","The name cannot be empty!");
                 }
             });
         });
@@ -392,14 +392,22 @@ public class EditClassifyActivity extends BaseActivity {
                 String classifyId = classifyList.get(viewBinding.spinnerClassify.getSelectedItem().toString());
                 String classifyName = viewBinding.spinnerClassify.getSelectedItem().toString();
                 DisplayManager.scaleViewGroup(binding.getRoot());
-                binding.title.setText("删除分类名称");
-                binding.edit.setText("是否删除["+classifyName+"]分类下所有商品及属性？");
+                binding.title.setText(getString(R.string.top_deleteclass));
+                switch (getString(R.string.language)){
+                    case "en":
+                        binding.edit.setText("Delete all products&attributes of ["+classifyName+"] ？");
+                        break;
+                    case "zh":
+                        binding.edit.setText("是否删除["+classifyName+"]分类下所有商品及属性？");
+                        break;
+                }
+
                 binding.cancel.setOnClickListener(view1 ->{
                     xCom.dismissX();
                 });
                 binding.submit.setOnClickListener(view1 -> {
                     if(ConfigName.getInstance().isFastClick()){
-                        NewToastUtil.getInstance().showToast("点击过快！");
+                        NewToastUtil.getInstance().showToast("点击过快！","Click too fast");
                         return;
                     }
                     if(GoodsClassifyDBUtil.deleteById(classifyId)){
@@ -414,11 +422,11 @@ public class EditClassifyActivity extends BaseActivity {
                         classifyNameList.addAll(classifyList.keySet());
                         spinnerAdapter.notifyDataSetChanged();
                         selectClassify(classifyPosition-1);//更新数据
-                        NewToastUtil.getInstance().showToast("删除["+classifyName+"]分类成功！");
+                        NewToastUtil.getInstance().showToast("删除["+classifyName+"]分类成功！","Delete ["+classifyName+"] Success！");
                         RecordManager.getInstance().addLogRecord("角色操作日志", "删除["+classifyName+"]分类成功！");
                         xCom.dismissX();
                     }else {
-                        NewToastUtil.getInstance().showToast("删除["+classifyName+"]分类失败！");
+                        NewToastUtil.getInstance().showToast("删除["+classifyName+"]分类失败！","Delete ["+classifyName+"] Fail！");
                     }
                 });
             });
@@ -431,7 +439,7 @@ public class EditClassifyActivity extends BaseActivity {
      */
     private void addAttribute(){
         if(attributeList.size()>=6){
-            NewToastUtil.getInstance().showToast("属性已达到上限");
+            NewToastUtil.getInstance().showToast("属性已达到上限","The property has reached its upper limit!");
             return;
         }
         if(classifyPosition==0){
@@ -439,7 +447,7 @@ public class EditClassifyActivity extends BaseActivity {
         }
         String classifyId = classifyList.get(viewBinding.spinnerClassify.getSelectedItem().toString());
         if(GoodsDBUtil.getClassifyId(classifyId)!=null){
-            AlertDialogUtils.showTipDialog(this, "注意", "添加属性将会影响当前分类下所有菜品，请确保该分类下没有商品再操作",
+            AlertDialogUtils.showTipDialog(this, "注意", "添加属性将会影响当前分类下所有菜品，请确保该分类下没有商品再操作","Look!","Adding attributes will affect all dishes in the current category. Please ensure that there are no products in this category!",
                     new AlertDialogUtils.DialogClickListener() {
                         @Override
                         public void onConfirm() {
@@ -454,18 +462,18 @@ public class EditClassifyActivity extends BaseActivity {
         AlertDialogUtils.showCancelAndConfirmDialog(this, R.layout.dialog_add_classify, (layoutView, xCom) -> {
             DialogAddClassifyBinding binding = DialogAddClassifyBinding.bind(layoutView);
             DisplayManager.scaleViewGroup(binding.getRoot());
-            binding.title.setText("新增属性名称");
-            binding.edit.setHint("请输入属性名称");
+            binding.title.setText(getString(R.string.top_addattribute));
+            binding.edit.setHint(getString(R.string.info_addattribute));
             binding.submit.setOnClickListener(view1 -> {
                 if(ConfigName.getInstance().isFastClick()){
-                    NewToastUtil.getInstance().showToast("点击过快！");
+                    NewToastUtil.getInstance().showToast("点击过快！","Click too fast");
                     return;
                 }
                 String input = String.valueOf(binding.edit.getText());
                 if(!input.isEmpty()){
                     for(BPA_ATTRIBUTE bean:attributeList){
                         if(bean.name.equals(input)){
-                            NewToastUtil.getInstance().showToast("已有该属性，请换一个名称！");
+                            NewToastUtil.getInstance().showToast("已有该属性，请换一个名称！","This attribute already exists, please change its name!");
                             return;
                         }
                     }
@@ -483,7 +491,7 @@ public class EditClassifyActivity extends BaseActivity {
                     subattributeAdapter.notifyDataSetChanged();
                     RecordManager.getInstance().addLogRecord("角色操作日志", "新增["+input+"]属性成功！");
                 }else {
-                    NewToastUtil.getInstance().showToast("名称不能为空！");
+                    NewToastUtil.getInstance().showToast("名称不能为空！","The name cannot be empty!");
                 }
             });
         });
@@ -498,7 +506,7 @@ public class EditClassifyActivity extends BaseActivity {
         }
         String classifyId1 = classifyList.get(viewBinding.spinnerClassify.getSelectedItem().toString());
         if(GoodsDBUtil.getClassifyId(classifyId1)!=null){
-            AlertDialogUtils.showTipDialog(this, "警告", "删除属性将会影响当前分类下所有菜品，请确保该分类下没有商品再操作",
+            AlertDialogUtils.showTipDialog(this, "警告", "删除属性将会影响当前分类下所有菜品，请确保该分类下没有商品再操作","Warning","Deleting the attributes will affect all dishes in the current category. Please ensure that no products are operated in this category!",
                     new AlertDialogUtils.DialogClickListener() {
                         @Override
                         public void onConfirm() {
@@ -550,19 +558,19 @@ public class EditClassifyActivity extends BaseActivity {
             AlertDialogUtils.showCancelAndConfirmDialog(this, R.layout.dialog_add_classify, (layoutView, xCom) -> {
                 DialogAddClassifyBinding binding = DialogAddClassifyBinding.bind(layoutView);
                 DisplayManager.scaleViewGroup(binding.getRoot());
-                binding.title.setText("修改属性名称");
-                binding.edit.setHint("请输入属性名称");
+                binding.title.setText(getString(R.string.top_reviseattribute));
+                binding.edit.setHint(getString(R.string.info_addattribute));
                 binding.edit.setText(attributeList.get(attributePosition).name);
                 binding.submit.setOnClickListener(view1 -> {
                     if(ConfigName.getInstance().isFastClick()){
-                        NewToastUtil.getInstance().showToast("点击过快！");
+                        NewToastUtil.getInstance().showToast("点击过快！","Click too fast!");
                         return;
                     }
                     String input = String.valueOf(binding.edit.getText());
                     if(!input.isEmpty()){
                         for(BPA_ATTRIBUTE bean:attributeList){
                             if(bean.name.equals(input)){
-                                NewToastUtil.getInstance().showToast("已有该属性，请换一个名称！");
+                                NewToastUtil.getInstance().showToast("已有该属性，请换一个名称！","This attribute already exists, please change its name!");
                                 return;
                             }
                         }
@@ -573,7 +581,7 @@ public class EditClassifyActivity extends BaseActivity {
                         attributeAdapter.notifyDataSetChanged();
                         xCom.dismissX();
                     }else {
-                        NewToastUtil.getInstance().showToast("名称不能为空！");
+                        NewToastUtil.getInstance().showToast("名称不能为空！","The name cannot be empty!");
                     }
                 });
             });
@@ -588,17 +596,17 @@ public class EditClassifyActivity extends BaseActivity {
             return;
         }
         if(attributeList.size()<=0){
-            NewToastUtil.getInstance().showToast("请先添加属性");
+            NewToastUtil.getInstance().showToast("请先添加属性","Add attributes first");
             return;
         }
         AlertDialogUtils.showCancelAndConfirmDialog(this, R.layout.dialog_add_classify, (layoutView, xCom) -> {
             DialogAddClassifyBinding binding = DialogAddClassifyBinding.bind(layoutView);
             DisplayManager.scaleViewGroup(binding.getRoot());
-            binding.title.setText("新增子属性名称");
-            binding.edit.setHint("请输入子属性名称");
+            binding.title.setText(getString(R.string.top_addchildattribute));
+            binding.edit.setHint(getString(R.string.info_revisechildattribute));
             binding.submit.setOnClickListener(view1 -> {
                 if(ConfigName.getInstance().isFastClick()){
-                    NewToastUtil.getInstance().showToast("点击过快！");
+                    NewToastUtil.getInstance().showToast("点击过快！","Click too fast!");
                     return;
                 }
                 BPA_ATTRIBUTE attribute = attributeList.get(attributePosition);
@@ -606,7 +614,7 @@ public class EditClassifyActivity extends BaseActivity {
                 if(!input.isEmpty()){
                     for(BPA_SUBATTRIBUTE bean:subattributeList){
                         if(bean.name.equals(input)){
-                            NewToastUtil.getInstance().showToast("已有该子属性，请换一个名称！");
+                            NewToastUtil.getInstance().showToast("已有该子属性，请换一个名称！","This subattribute already exists, please change its name!");
                             return;
                         }
                     }
@@ -620,7 +628,7 @@ public class EditClassifyActivity extends BaseActivity {
                     viewBinding.listSubattribute.smoothScrollToPosition(subattributeList.size()-1);
                     RecordManager.getInstance().addLogRecord("角色操作日志", "新增["+subattribute.name+"]子属性成功！");
                 }else {
-                    NewToastUtil.getInstance().showToast("名称不能为空！");
+                    NewToastUtil.getInstance().showToast("名称不能为空！","The name cannot be empty!");
                 }
             });
         });
@@ -636,7 +644,7 @@ public class EditClassifyActivity extends BaseActivity {
         String classifyId = classifyList.get(viewBinding.spinnerClassify.getSelectedItem().toString());
         String goodName = SubAttributeGroupDBUtil.isIncludeByClassify(classifyId,bean.name);
         if(!goodName.isEmpty()){
-            NewToastUtil.getInstance().showToast("商品["+goodName+"]正在使用["+bean.name+"]属性，请先删除对应商品");
+            NewToastUtil.getInstance().showToast("商品["+goodName+"]正在使用["+bean.name+"]属性，请先删除对应商品","Product ["+goodName+"] using ["+bean.name+"] attrbute，Please delete the product first");
             return;
         }
         SubAttributeDBUtil.delete(bean);

app/src/main/java/com/bonait/bnframework/ui/activity/EditGoodsActivity.java

@@ -69,7 +69,7 @@ public class EditGoodsActivity  extends BaseActivity {
         params.bottomMargin = 0;
         viewBinding.frame.setLayoutParams(params);
         viewBinding.topbar.setBackgroundColor(ContextCompat.getColor(this, R.color.topbj1));
-        viewBinding.tabTitle.setText("菜品管理");
+        viewBinding.tabTitle.setText(getString(R.string.text_top_cpgl));
         viewBinding.back.setOnClickListener(v->{
 
             if(ConfigName.getInstance().isFastClick()){

app/src/main/java/com/bonait/bnframework/ui/adapter/goods/CloudGoodsAdapter.java

@@ -11,6 +11,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.apkfuns.logutils.LogUtils;
 import com.bonait.bnframework.R;
 
+import com.bonait.bnframework.common.constant.ConfigName;
 import com.bonait.bnframework.common.db.mode.BPA_GOODS;
 import com.bonait.bnframework.common.db.util.GoodsDBUtil;
 import com.bonait.bnframework.common.image.MyBitmapUtils;
@@ -39,7 +40,7 @@ public abstract class CloudGoodsAdapter extends BaseAdapter<BPA_GOODS,CloudGoods
     public void onBindViewHolder(@NonNull GoodsViewHolder holder, @SuppressLint("RecyclerView") int position) {
         try {
             LogUtils.d(" holder.binding.name.getTextSize()="+holder.binding.name.getTextSize());
-            if(holder.binding.name.getTextSize()>34||holder.binding.name.getTextSize()<30){
+            if(holder.binding.name.getTextSize()>32||holder.binding.name.getTextSize()<28){
                 DisplayManager.scaleViewGroup(holder.binding.getRoot());
             }
             holder.binding.add.setVisibility(View.GONE);
@@ -67,7 +68,7 @@ public abstract class CloudGoodsAdapter extends BaseAdapter<BPA_GOODS,CloudGoods
                 @Override
                 public void onClick(View view) {
                     if(downLoadGoods(view,position)){
-                        ToastUtils.info("下载成功");
+                        ToastUtils.info(ConfigName.getInstance().app.getString(R.string.text_downloadsuc));
                         holder.binding.downLoad.setVisibility(View.GONE);
                     }
                 }
@@ -78,7 +79,7 @@ public abstract class CloudGoodsAdapter extends BaseAdapter<BPA_GOODS,CloudGoods
                 @Override
                 public void onClick(View view) {
                     if (GoodsDBUtil.getByName(goods.name)==null) {
-                        ToastUtils.warning("请先下载该商品！");
+                        ToastUtils.warning(ConfigName.getInstance().app.getString(R.string.text_downloadinfo));
                     } else {
                         onItemClick(view,position);
                     }

app/src/main/java/com/bonait/bnframework/ui/adapter/goods/LocalGoodsAdapter.java

@@ -40,7 +40,7 @@ public abstract class LocalGoodsAdapter extends BaseAdapter<BPA_GOODS,LocalGoods
     @Override
     public void onBindViewHolder(@NonNull GoodsViewHolder holder, @SuppressLint("RecyclerView") int position) {
         try {
-            if(holder.binding.name.getTextSize()> 34 || holder.binding.name.getTextSize()< 30){
+            if(holder.binding.name.getTextSize()> 30 || holder.binding.name.getTextSize()< 28){
                 DisplayManager.scaleViewGroup(holder.binding.getRoot());
             }
             holder.binding.add.setVisibility(View.GONE);

app/src/main/java/com/bonait/bnframework/ui/dialog/AttributeSelectDialog.java

@@ -158,14 +158,14 @@ public class AttributeSelectDialog extends DialogFragment {
             public void onClick() {
                 String hasId = hasGroup();
                 if(hasId.isEmpty()){
-                    viewBinding.tvExist.setText("不存在分组");
+                    viewBinding.tvExist.setText(getString(R.string.text_haveprocess_2));
                     viewBinding.btnSubmit.setBackgroundResource(R.drawable.bg_round25_gray_btn);
                 }else {
                     if(groupId.equals(hasId)){
-                        viewBinding.tvExist.setText("正在编辑分组无法导入");
+                        viewBinding.tvExist.setText(getString(R.string.text_haveprocess_3));
                         viewBinding.btnSubmit.setBackgroundResource(R.drawable.bg_round25_gray_btn);
                     }else {
-                        viewBinding.tvExist.setText("存在分组");
+                        viewBinding.tvExist.setText(getString(R.string.text_haveprocess_1));
                         viewBinding.btnSubmit.setBackgroundResource(R.drawable.bg_round25_yellow_btn);
                     }
                 }
@@ -189,17 +189,17 @@ public class AttributeSelectDialog extends DialogFragment {
         viewBinding.btnSubmit.setOnClickListener(view -> {
             String hasId = hasGroup();
             if(hasId.isEmpty()){
-                NewToastUtil.getInstance().showToast("未找到选中分组，无法导入");
+                NewToastUtil.getInstance().showToast("未找到选中分组，无法导入","The selected process cannot be imported because it is not found");
                 return;
             }
 
             if(groupId.equals(hasId)){
-                NewToastUtil.getInstance().showToast("当前正在编辑此组合,无法导入");
+                NewToastUtil.getInstance().showToast("当前正在编辑此组合,无法导入","Currently editing process, unable to import");
                 return;
             }
             BPA_GOODS_SUBATTRIBUTE_GROUP group =  SubAttributeGroupDBUtil.getById(hasId);
             if(group == null){
-                NewToastUtil.getInstance().showToast("还未创建该组合,无法导入");
+                NewToastUtil.getInstance().showToast("还未创建该组合,无法导入","The process has not been created, unable to import");
                 return;
             }
 

app/src/main/java/com/bonait/bnframework/ui/dialog/EditGoodsDialog.java

@@ -199,7 +199,7 @@ public class EditGoodsDialog extends DialogFragment {
                 String name = viewBinding.layoutName.editName.getText().toString();
                 if(name.isEmpty()){
                     if(getContext()!=null){
-                        NewToastUtil.getInstance().showToast("名称不能为空");
+                        NewToastUtil.getInstance().showToast("名称不能为空","The name cannot be empty");
                     }
                     return;
                 }
@@ -218,7 +218,7 @@ public class EditGoodsDialog extends DialogFragment {
             case R.id.btn_next2:
                 if(!selectAttributeListAdapter.isAllSelected()){
                     if(getContext()!=null){
-                        NewToastUtil.getInstance().showToast("请选择每行对应的子属性");
+                        NewToastUtil.getInstance().showToast("请选择每行对应的子属性","Select the subattribute for each row!");
                     }
                     return;
                 }
@@ -228,32 +228,42 @@ public class EditGoodsDialog extends DialogFragment {
                     changePage(3);
                     return;
                 }
-                if(viewBinding.layoutAttribute.groupDesc.getText().toString().contains("不存在选中组合")){
-                    NewToastUtil.getInstance().showToast("不存在该组合");
+                if(viewBinding.layoutAttribute.groupDesc.getText().toString().contains(getString(R.string.text_haveattr))){
+                    NewToastUtil.getInstance().showToast(getString(R.string.text_haveattr));
                 }else {
                     if(subattributeGroup!=null){
                         if(!isEdit){
                             if(GoodsProcessDetailDBUtil.getByGroupId(subattributeGroup.id).isEmpty()){
-                                viewBinding.layoutAttribute.groupDesc.setText("存在选中组合\n(没有工序)");
-                                NewToastUtil.getInstance().showToast("该组合没有工序，请先编辑工序");
+                                viewBinding.layoutAttribute.groupDesc.setText(getString(R.string.text_haveattr_1));
+                                NewToastUtil.getInstance().showToast(getString(R.string.info_editprocess));
                                 return;
                             }
                         }
                         changePage(3);
                     }else {
-                        NewToastUtil.getInstance().showToast("数据为空");
+                        NewToastUtil.getInstance().showToast(getString(R.string.info_datanull));
                     }
                 }
                 break;
             case R.id.btn_to_cook:
                 if(subattributeGroup == null){
-                    NewToastUtil.getInstance().showToast("数据为空");
+                    NewToastUtil.getInstance().showToast(getString(R.string.info_datanull));
                 }else {
                     if(GoodsProcessDetailDBUtil.getByGroupId(subattributeGroup.id).isEmpty()){
-                        NewToastUtil.getInstance().showToast(isEdit?
-                                (subattributeGroup.name.isEmpty()?("当前配方没有工序，请先编辑工序"):
-                                        ("当前组合【"+subattributeGroup.name+"】没有工序，请先编辑工序"))
-                                :"当前组合没有工序，请前往菜品研发编辑工序");
+                        switch (getString(R.string.language)){
+                            case "en":
+                                NewToastUtil.getInstance().showToast(isEdit?
+                                        (subattributeGroup.name.isEmpty()?("The current recipe has no process, please edit the process first!"):
+                                                ("The current recipe【"+subattributeGroup.name+"】has no process，please edit the process first!"))
+                                        :"The current combination has no process, please go to the Menu Develop and editing process");
+                                break;
+                            case "zh":
+                                NewToastUtil.getInstance().showToast(isEdit?
+                                        (subattributeGroup.name.isEmpty()?("当前配方没有工序，请先编辑工序"):
+                                                ("当前组合【"+subattributeGroup.name+"】没有工序，请先编辑工序"))
+                                        :"当前组合没有工序，请前往菜品研发编辑工序");
+                                break;
+                        }
                         return;
                     }
                     jumpToCook();
@@ -389,8 +399,8 @@ public class EditGoodsDialog extends DialogFragment {
             SubAttributeGroupDBUtil.add(subattributeGroup);
             groupList.add(subattributeGroup.name);
             viewBinding.layoutAttribute.spinnerList.setSelection(groupList.size()-1);
-            NewToastUtil.getInstance().showToast("创建组合【"+subattributeGroup.name+"】成功");
-            viewBinding.layoutAttribute.groupDesc.setText("存在选中组合\n(没有工序)");
+            NewToastUtil.getInstance().showToast("创建组合【"+subattributeGroup.name+"】成功","Create recipe【\"+subattributeGroup.name+\"】Success!");
+            viewBinding.layoutAttribute.groupDesc.setText(getString(R.string.text_haveattr_1));
             RecordManager.getInstance().addLogRecord("角色操作日志", subattributeGroup.name+"-创建配方成功");
         }else {
             subattributeGroup.name = selectAttributeListAdapter.getSubAttributeNameList();//修改名称顺序
@@ -580,12 +590,12 @@ public class EditGoodsDialog extends DialogFragment {
             @Override
             public void onClick() {
                 if(!hasGroup().isEmpty()){
-                    viewBinding.layoutAttribute.groupDesc.setText("存在选中组合");
-                    viewBinding.layoutAttribute.btnNext2.setText("下一步");
+                    viewBinding.layoutAttribute.groupDesc.setText(getString(R.string.text_haveattr_2));
+                    viewBinding.layoutAttribute.btnNext2.setText(getString(R.string.btn_next));
                     if(GoodsProcessDetailDBUtil.getByGroupId(subattributeGroup.id).isEmpty()){
-                        viewBinding.layoutAttribute.groupDesc.setText("存在选中组合\n(没有工序)");
+                        viewBinding.layoutAttribute.groupDesc.setText(getString(R.string.text_haveattr_1));
                     }
-                    if(viewBinding.layoutAttribute.groupDesc.getText().toString().contains("没有工序")){
+                    if(viewBinding.layoutAttribute.groupDesc.getText().toString().contains("没有工序")||viewBinding.layoutAttribute.groupDesc.getText().toString().contains("No Process")){
                         if(!isEdit){
                             viewBinding.layoutAttribute.btnNext2.setBackgroundResource(R.drawable.bg_round25_gray_btn);
                         }
@@ -619,11 +629,11 @@ public class EditGoodsDialog extends DialogFragment {
                     viewBinding.layoutAttribute.spinnerList.setSelection(pos);
                 }else{
                     viewBinding.layoutAttribute.spinnerList.setSelection(0);
-                    viewBinding.layoutAttribute.groupDesc.setText("不存在选中组合");
+                    viewBinding.layoutAttribute.groupDesc.setText(getString(R.string.text_haveattr));
                     if(!isEdit){
                         viewBinding.layoutAttribute.btnNext2.setBackgroundResource(R.drawable.bg_round25_gray_btn);
                     }else {
-                        viewBinding.layoutAttribute.btnNext2.setText("去创建");
+                        viewBinding.layoutAttribute.btnNext2.setText(getString(R.string.btn_create));
                     }
                 }
             }
@@ -691,14 +701,14 @@ public class EditGoodsDialog extends DialogFragment {
                         updateAttributeData("");
                     }else {
                         updateAttributeData(viewBinding.layoutAttribute.spinnerList.getSelectedItem().toString());
-                        viewBinding.layoutAttribute.groupDesc.setText("存在选中组合");
+                        viewBinding.layoutAttribute.groupDesc.setText(getString(R.string.text_haveattr_2));
                         viewBinding.layoutAttribute.btnNext2.setBackgroundResource(R.drawable.bg_round25_yellow_btn);
                         viewBinding.layoutAttribute.groupDesc.postDelayed(new Runnable() {
                             @Override
                             public void run() {
                                 hasGroup();
                                 if(GoodsProcessDetailDBUtil.getByGroupId(subattributeGroup.id).isEmpty()){
-                                    viewBinding.layoutAttribute.groupDesc.setText("存在选中组合\n(没有工序)");
+                                    viewBinding.layoutAttribute.groupDesc.setText(getString(R.string.text_haveattr_1));
                                 }
                             }
                         },300);

app/src/main/java/com/bonait/bnframework/ui/fragment/HomeFoodsFragment.java

@@ -58,9 +58,9 @@ public class HomeFoodsFragment extends BaseFragment {
             switch (msg.what){
                 case 1:
                     if(ConfigName.getInstance().PlcIsConnect){
-                        viewBinding.tvConnect.setText("设备状态：已连接");
+                        viewBinding.tvConnect.setText(getString(R.string.text_deviceconnect));
                     }else {
-                        viewBinding.tvConnect.setText("设备状态：未连接");
+                        viewBinding.tvConnect.setText(getString(R.string.text_devicedisconnect));
                     }
                     if(hasMessages(1)){
                         removeMessages(1);

app/src/main/java/com/bonait/bnframework/ui/fragment/goods/LocalGoodsFragment.java

@@ -200,8 +200,16 @@ public class LocalGoodsFragment extends BaseFragment {
                     BPA_GOODS bean = mData.get(position);
                     DialogDeleteClassifyBinding binding = DialogDeleteClassifyBinding.bind(layoutView);
                     DisplayManager.scaleViewGroup(binding.getRoot());
-                    binding.title.setText("删除菜品");
-                    binding.edit.setText("是否删除["+bean.name+"]下所有组合配方？");
+                    binding.title.setText(getString(R.string.text_deleterecipe));
+                    switch (getString(R.string.text_deleterecipe)){
+                        case "en":
+                            binding.edit.setText("Delete ["+bean.name+"] all recipes？");
+                            break;
+                        case "zh":
+                            binding.edit.setText("是否删除["+bean.name+"]下所有组合配方？");
+                            break;
+                    }
+
                     binding.cancel.setOnClickListener(view1 ->{
                         xCom.dismissX();
                     });
@@ -213,13 +221,21 @@ public class LocalGoodsFragment extends BaseFragment {
                         GoodsProcessDetailDBUtil.deleteByGoodsId(bean.id);
                         SubAttributeGroupDBUtil.deleteByGoodsId(bean.id);
                         if(GoodsDBUtil.delete(bean)){
-                            NewToastUtil.getInstance().showToast("删除["+bean.name+"]成功！");
+                            switch (getString(R.string.text_deleterecipe)){
+                                case "en":
+                                    binding.edit.setText("Delete ["+bean.name+"] all recipes？");
+                                    break;
+                                case "zh":
+                                    binding.edit.setText("是否删除["+bean.name+"]下所有组合配方？");
+                                    break;
+                            }
+                            NewToastUtil.getInstance().showToast("删除["+bean.name+"]成功！","Delete ["+bean.name+"] Success！");
                             goodsList.remove(bean);
                             goodsAdapter.notifyDataSetChanged();
                             xCom.dismissX();
                             RecordManager.getInstance().addLogRecord("角色操作日志","删除["+bean.name+"]菜品成功！");
                         }else {
-                            NewToastUtil.getInstance().showToast("删除["+bean.name+"]失败！");
+                            NewToastUtil.getInstance().showToast("删除["+bean.name+"]失败！","Delete ["+bean.name+"] Fail！");
                         }
                     });
                 });

app/src/main/java/com/bonait/bnframework/ui/widget/NewToastUtil.java

@@ -15,6 +15,7 @@ import androidx.core.content.ContextCompat;
 
 import com.bonait.bnframework.MainApplication;
 import com.bonait.bnframework.R;
+import com.bonait.bnframework.common.constant.ConfigName;
 import com.bonait.bnframework.databinding.ViewLayoutToastBinding;
 import com.bonait.bnframework.ui.util.DimensUtil;
 import com.bonait.bnframework.ui.util.DisplayManager;
@@ -65,6 +66,34 @@ public class NewToastUtil {
         });
     }
 
+    public void showToast(String message_zh,String message_en){
+        handler.post(() -> {
+            if(toast != null){
+                toast.cancel();
+            }
+            toast = new Toast(MainApplication.getContext());
+            String content = "";
+            switch (ConfigName.getInstance().app.getString(R.string.language)){
+                case "en":
+                    content = message_en;
+                    break;
+                case "zh":
+                    content = message_zh;
+                    break;
+            }
+            if(content.length() > 50){
+                content = content.substring(0,50)+"...";
+            }
+            View layout = LayoutInflater.from(MainApplication.getContext()).inflate(R.layout.view_layout_toast,null);
+            ViewLayoutToastBinding binding = ViewLayoutToastBinding.bind(layout);
+            DisplayManager.scaleViewGroup(binding.getRoot());
+            binding.toastText.setText(content);
+            toast.setGravity(Gravity.BOTTOM,0, (int) (DisplayManager.getWidthScaleRate()* DimensUtil.getDimens(10)));
+            toast.setDuration(Toast.LENGTH_SHORT);
+            toast.setView(layout);
+            toast.show();
+        });
+    }
     public void showToastBottom(String message){
         handler.post(() -> {
             if(toast != null){

app/src/main/res/drawable/btn_homecsh.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="#D6CAA2"/>
+            <corners android:topLeftRadius="30dp" android:bottomLeftRadius="30dp"/>
+        </shape>
+    </item>
+    <item android:drawable="@mipmap/btn_csh" android:gravity="left|center" android:height="40dp" android:width="40dp" android:left="10dp"/>
+</layer-list>

app/src/main/res/drawable/btn_homeqx.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="#D6CAA2"/>
+            <corners android:topRightRadius="30dp" android:bottomRightRadius="30dp"/>
+        </shape>
+    </item>
+    <item android:drawable="@mipmap/btn_qx" android:gravity="right|center" android:height="40dp" android:width="40dp" android:right="12dp"/>
+</layer-list>

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

@@ -45,7 +45,7 @@
             android:layout_alignParentBottom="true"
             android:layout_centerHorizontal="true"
             android:background="@drawable/bg_round15_yellow_btn"
-            android:text="新增"
+            android:text="@string/btn_new"
             android:textColor="@color/white"
             android:gravity="center"
             android:textSize="@dimen/sp_32"
@@ -61,7 +61,7 @@
             android:layout_alignParentBottom="true"
             android:layout_centerHorizontal="true"
             android:background="@drawable/bg_round15_yellow_btn"
-            android:text="删除"
+            android:text="@string/btn_delete"
             android:textColor="@color/white"
             android:gravity="center"
             android:textSize="@dimen/sp_32"
@@ -77,7 +77,7 @@
             android:layout_alignParentBottom="true"
             android:layout_centerHorizontal="true"
             android:background="@drawable/bg_round15_yellow_btn"
-            android:text="修改"
+            android:text="@string/btn_revise"
             android:textColor="@color/white"
             android:gravity="center"
             android:textSize="@dimen/sp_32"
@@ -91,7 +91,7 @@
             android:id="@+id/title"
             android:layout_width="@dimen/dp_275"
             android:layout_height="@dimen/dp_70"
-            android:text="属性"
+            android:text="@string/text_attribute"
             android:gravity="center"
             app:layout_constraintTop_toBottomOf="@id/desc"
             app:layout_constraintLeft_toLeftOf="parent"
@@ -105,7 +105,7 @@
             android:id="@+id/title2"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_70"
-            android:text="子属性"
+            android:text="@string/text_childattribute"
             android:gravity="center"
             app:layout_constraintTop_toBottomOf="@id/desc"
             app:layout_constraintRight_toRightOf="parent"
@@ -137,7 +137,7 @@
                 android:layout_height="@dimen/dp_70"
                 android:layout_centerHorizontal="true"
                 android:background="@drawable/bg_round15_yellow_btn"
-                android:text="+添加属性"
+                android:text="@string/btn_addattribute"
                 android:textColor="@color/white"
                 android:gravity="center"
                 android:textSize="@dimen/sp_32"
@@ -151,7 +151,7 @@
                 android:layout_height="@dimen/dp_70"
                 android:layout_centerHorizontal="true"
                 android:background="@drawable/bg_round15_red_btn"
-                android:text="-删除属性"
+                android:text="@string/btn_deleteattribute"
                 android:textColor="@color/white"
                 android:gravity="center"
                 android:textSize="@dimen/sp_32"
@@ -165,7 +165,7 @@
                 android:layout_height="@dimen/dp_70"
                 android:layout_centerHorizontal="true"
                 android:background="@drawable/bg_round15_yellow_btn"
-                android:text="修改属性"
+                android:text="@string/btn_reviseattribute"
                 android:textColor="@color/white"
                 android:gravity="center"
                 android:textSize="@dimen/sp_32"
@@ -195,10 +195,10 @@
                 />
             <TextView
                 android:id="@+id/btn_add_subattribute"
-                android:layout_width="@dimen/dp_235"
+                android:layout_width="280dp"
                 android:layout_height="@dimen/dp_70"
                 android:background="@drawable/bg_round15_yellow_btn"
-                android:text="+添加子属性"
+                android:text="@string/btn_addchildattribute"
                 android:textColor="@color/white"
                 android:textSize="@dimen/sp_32"
                 android:gravity="center"
@@ -252,8 +252,8 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:textColor="@color/white"
-            android:textSize="@dimen/sp_32"
-            android:text=" 返 回"
+            android:textSize="30dp"
+            android:text="@string/btn_return"
             android:paddingRight="@dimen/dp_50"
             android:drawableLeft="@mipmap/fanhui"
             android:gravity="center"
@@ -263,7 +263,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:text="编辑分类"
+            android:text="@string/top_editclass"
             android:textColor="@color/white"
             android:textSize="36sp"
             android:layout_gravity="center"

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

@@ -35,7 +35,7 @@
             android:id="@+id/btn_copy_process"
             android:layout_width="@dimen/dp_150"
             style="@style/TextView_btn_normal"
-            android:text="导入工序"
+            android:text="@string/btn_tolead"
             android:paddingLeft="@dimen/dp_10"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toTopOf="@id/line1"
@@ -69,7 +69,7 @@
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toBottomOf="@id/line1"
             style="@style/TextView_normal_size"
-            android:text="步骤："
+            android:text="@string/text_step"
             android:layout_marginTop="@dimen/dp_10"
             android:textColor="#567722"
             android:layout_marginLeft="@dimen/dp_10"
@@ -77,12 +77,13 @@
         <TextView
             android:id="@+id/tv_2"
             android:layout_marginTop="@dimen/dp_10"
-            android:layout_width="@dimen/dp_160"
+            android:layout_width="wrap_content"
             android:layout_height="@dimen/dp_70"
             app:layout_constraintLeft_toRightOf="@id/line2"
             app:layout_constraintTop_toBottomOf="@id/line1"
             style="@style/TextView_normal_size"
-            android:text="烹饪工序："
+            android:text="@string/text_cookprocess"
+            android:textSize="25dp"
             android:textColor="#823E17"
             android:layout_marginLeft="@dimen/dp_20"
             />
@@ -104,26 +105,24 @@
             app:layoutManager="com.bonait.bnframework.ui.widget.SmoothLayoutManager"
              />
 
+
         <LinearLayout
             android:id="@+id/ll_1"
             android:layout_width="@dimen/dp_430"
             android:layout_height="@dimen/dp_70"
-            app:layout_constraintLeft_toRightOf="@id/line2"
-            app:layout_constraintTop_toBottomOf="@id/line1"
             android:layout_marginLeft="@dimen/dp_20"
-            android:layout_marginTop="@dimen/dp_10"
+            android:layout_marginTop="8dp"
             android:gravity="right"
-            >
+            app:layout_constraintLeft_toRightOf="@id/line2"
+            app:layout_constraintTop_toBottomOf="@id/line1">
 
             <Spinner
                 android:id="@+id/spinner_process"
                 style="@style/commonSpinnerStyle"
                 android:layout_width="@dimen/dp_200"
-                android:layout_height="@dimen/dp_70"
-                />
+                android:layout_height="@dimen/dp_70" />
         </LinearLayout>
 
-
         <ScrollView
             android:id="@+id/scrollView"
             android:layout_width="@dimen/dp_430"
@@ -146,13 +145,13 @@
         <!--模拟炒制-->
         <TextView
             android:id="@+id/btn_simulation"
-            android:layout_width="@dimen/dp_180"
+            android:layout_width="@dimen/dp_240"
             style="@style/TextView_btn_normal"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toLeftOf="@id/line2"
             android:layout_marginBottom="@dimen/dp_25"
-            android:text="模拟炒制"
+            android:text="@string/btn_cooksimulate"
             />
 
         <!--添加-->
@@ -160,7 +159,7 @@
             android:id="@+id/btn_add"
             android:layout_width="@dimen/dp_150"
             style="@style/TextView_btn_normal"
-            android:text="+添加"
+            android:text="@string/btn_add"
             app:layout_constraintLeft_toLeftOf="@id/line2"
             app:layout_constraintBottom_toBottomOf="parent"
             android:layout_marginBottom="@dimen/dp_120"
@@ -171,7 +170,7 @@
             android:id="@+id/btn_insert"
             android:layout_width="@dimen/dp_150"
             style="@style/TextView_btn_normal"
-            android:text="插入"
+            android:text="@string/btn_insert"
             app:layout_constraintLeft_toLeftOf="@id/line2"
             android:layout_marginLeft="@dimen/dp_270"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -203,7 +202,7 @@
                     android:id="@+id/btn_insert_up"
                     android:layout_width="@dimen/dp_170"
                     style="@style/TextView_btn_normal"
-                    android:text="向上插入"
+                    android:text="@string/btn_upinsert"
                     android:layout_marginBottom="@dimen/dp_10"
                     />
 
@@ -212,7 +211,7 @@
                     android:id="@+id/btn_insert_down"
                     android:layout_width="@dimen/dp_170"
                     style="@style/TextView_btn_normal"
-                    android:text="向下插入"
+                    android:text="@string/btn_Downinsert"
                     android:layout_marginBottom="@dimen/dp_10"
                     />
             </LinearLayout>
@@ -224,7 +223,7 @@
             android:layout_width="@dimen/dp_150"
             style="@style/TextView_btn_normal"
             android:background="@drawable/bg_round50_green_btn"
-            android:text="修改"
+            android:text="@string/btn_revise"
             app:layout_constraintLeft_toLeftOf="@id/line2"
             app:layout_constraintBottom_toBottomOf="parent"
             android:layout_marginBottom="@dimen/dp_25"
@@ -236,7 +235,7 @@
             android:layout_width="@dimen/dp_150"
             style="@style/TextView_btn_normal"
             android:background="@drawable/bg_round50_red_btn"
-            android:text="删除"
+            android:text="@string/btn_delete"
             app:layout_constraintLeft_toLeftOf="@id/line2"
             app:layout_constraintBottom_toBottomOf="parent"
             android:layout_marginBottom="@dimen/dp_25"
@@ -259,13 +258,13 @@
             android:gravity="center"
             android:paddingLeft="@dimen/dp_5"
             android:paddingRight="@dimen/dp_50"
-            android:text=" 保存并返回"
+            android:text="@string/text_savereturn"
             android:textColor="@color/white"
             android:textSize="@dimen/sp_32" />
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:text="编辑工序"
+            android:text="@string/btn_editprocess"
             android:textColor="@color/white"
             android:textSize="36sp"
             android:layout_gravity="center"

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

@@ -11,11 +11,11 @@
 
         <Button
             android:id="@+id/btn_fresh"
-            android:layout_width="@dimen/dp_150"
+            android:layout_width="@dimen/dp_250"
             android:layout_height="@dimen/dp_70"
             android:textSize="@dimen/sp_32"
             android:textColor="@color/white"
-            android:text="刷 新"
+            android:text="@string/btn_refresh"
             android:background="@drawable/bg_round15_yellow_btn"
             android:layout_alignParentEnd="true"
             android:layout_marginEnd="@dimen/dp_20"
@@ -28,7 +28,7 @@
             android:layout_height="@dimen/dp_70"
             android:textSize="@dimen/sp_32"
             android:textColor="@color/white"
-            android:text="下载所有商品"
+            android:text="@string/btn_downloadall"
             android:background="@drawable/bg_round15_yellow_btn"
             android:layout_marginEnd="@dimen/dp_20"
             android:layout_marginStart="@dimen/dp_20"

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

@@ -54,6 +54,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text="@string/text_StartCooking"
+                                android:textStyle="bold"
                                 android:textSize="30dp"
                                 android:layout_gravity="center"
                                 android:textColor="#7DA342"
@@ -77,6 +78,7 @@
                                 android:layout_height="wrap_content"
                                 android:text="@string/text_SDCZ"
                                 android:textSize="30dp"
+                                android:textStyle="bold"
                                 android:layout_gravity="center"
                                 android:textColor="#F37636"
                                 />
@@ -106,6 +108,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text="@string/text_home_SZ"
+                                android:textStyle="bold"
                                 android:textSize="30dp"
                                 android:layout_gravity="center"
                                 android:textColor="#1296DB"
@@ -129,6 +132,7 @@
                                 android:layout_height="wrap_content"
                                 android:text="@string/text_home_CPYF"
                                 android:textSize="30dp"
+                                android:textStyle="bold"
                                 android:layout_gravity="center"
                                 android:textColor="#586DEC"
                                 />
@@ -153,6 +157,7 @@
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
                 android:text="@string/title_home"
+                android:textStyle="bold"
                 android:textColor="@color/white"
                 android:textSize="80dp" />
         </RelativeLayout>
@@ -166,6 +171,7 @@
             android:layout_marginRight="0dp"
             android:layout_marginBottom="50dp"
             android:text="@string/btn_exit"
+            android:textStyle="bold"
             android:textSize="30dp"
             android:gravity="right|center"
             android:paddingRight="10dp"

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

@@ -13,8 +13,8 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:textColor="@color/white"
-            android:textSize="@dimen/sp_32"
-            android:text=" 返 回"
+            android:textSize="25dp"
+            android:text="@string/btn_return"
             android:paddingRight="@dimen/dp_50"
             android:drawableLeft="@mipmap/fanhui"
             android:gravity="center"
@@ -27,8 +27,9 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             tools:text="菜谱"
+            android:textStyle="bold"
             android:textColor="@color/white"
-            android:textSize="36sp"
+            android:textSize="30dp"
             android:layout_gravity="center"
             android:gravity="center"
             />
@@ -40,8 +41,7 @@
             android:text="设备状态:未连接"
             android:layout_gravity="end"
             android:textColor="@color/white"
-            android:visibility="gone"
-            android:textSize="@dimen/sp_28"
+            android:textSize="25dp"
             android:gravity="center"
             />
     </com.qmuiteam.qmui.widget.QMUITopBarLayout>
@@ -61,7 +61,7 @@
                 android:paddingLeft="@dimen/dp_10"
                 android:paddingRight="@dimen/dp_10"
                 android:layout_height="@dimen/dp_70"
-                android:text="本地菜谱"
+                android:text="@string/text_localrecipe"
                 android:gravity="center"
                 android:textColor="#BEAA6A"
                 android:textSize="@dimen/sp_36"
@@ -74,7 +74,7 @@
                 android:paddingRight="@dimen/dp_10"
                 android:layout_height="@dimen/dp_70"
                 android:layout_centerInParent="true"
-                android:text="云端菜谱"
+                android:text="@string/text_cloudrecipe"
                 android:textColor="#797373"
                 android:layout_marginLeft="@dimen/dp_10"
                 android:gravity="center"

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

@@ -33,7 +33,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerInParent="true"
-                        android:text="本地菜谱"
+                        android:text="@string/text_localrecipe"
                         android:textColor="#BEAA6A"
                         android:textSize="19dp"
                         android:textStyle="bold" />
@@ -49,7 +49,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerInParent="true"
-                        android:text="云端菜谱"
+                        android:text="@string/text_cloudrecipe"
                         android:textColor="#797373"
                         android:textSize="19dp"
                         android:textStyle="bold" />

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

@@ -16,11 +16,17 @@
             android:layout_marginTop="20dp"
             android:orientation="vertical">
 
-            <RelativeLayout
+            <Button
                 android:id="@+id/zidongqingxi"
                 android:layout_width="120dp"
                 android:layout_height="40dp"
-                android:background="@mipmap/yy_l1" />
+                android:background="@drawable/btn_homeqx"
+                android:text="@string/btn_rinse"
+                android:textColor="@color/white"
+                android:textStyle="bold"
+                android:textSize="20dp"
+                android:paddingLeft="10dp"
+                android:gravity="center|left"/>
         </LinearLayout>
 
         <LinearLayout
@@ -30,12 +36,19 @@
             android:layout_marginTop="20dp"
             android:orientation="vertical">
 
-            <RelativeLayout
+            <Button
                 android:id="@+id/chushihua"
                 android:layout_width="120dp"
                 android:layout_height="40dp"
                 android:layout_alignParentBottom="true"
-                android:background="@mipmap/yy_lv1" />
+                android:background="@drawable/btn_homecsh"
+                android:text="@string/btn_initialize"
+                android:gravity="center|right"
+                android:textSize="20dp"
+                android:paddingRight="10dp"
+                android:textColor="@color/white"
+                android:textStyle="bold"/>
+
         </LinearLayout>
 
         <LinearLayout
@@ -233,7 +246,7 @@
                             android:layout_height="120dp"
                             android:layout_alignParentRight="true"
                             android:contentDescription="true"
-                            android:tag="出餐-按钮"
+                            android:tag="@string/btn_pourmeal"
                             app:imagesrc_ks="@mipmap/sb1"
                             app:imagesrc_qt="@mipmap/sb2"
                             app:imagesrc_tz="@mipmap/sb3" />
@@ -300,7 +313,7 @@
                         android:layout_width="83dp"
                         android:layout_height="80dp"
                         android:contentDescription="true"
-                        android:tag="投料-按钮"
+                        android:tag="@string/btn_putmeal"
                         app:imagesrc_ks="@mipmap/sb1"
                         app:imagesrc_qt="@mipmap/sb2"
                         app:imagesrc_tz="@mipmap/sb3" />
@@ -310,7 +323,7 @@
                         android:layout_width="83dp"
                         android:layout_height="80dp"
                         android:contentDescription="true"
-                        android:tag="投料-按钮"
+                        android:tag="@string/btn_putmeal"
                         app:imagesrc_ks="@mipmap/sb1"
                         app:imagesrc_qt="@mipmap/sb2"
                         app:imagesrc_tz="@mipmap/sb3" />
@@ -320,7 +333,7 @@
                         android:layout_width="45dp"
                         android:layout_height="80dp"
                         android:contentDescription="true"
-                        android:tag="投料-按钮"
+                        android:tag="@string/btn_putmeal"
                         app:imagesrc_ks="@mipmap/sb1"
                         app:imagesrc_qt="@mipmap/sb2"
                         app:imagesrc_tz="@mipmap/sb3" />
@@ -330,7 +343,7 @@
                         android:layout_width="45dp"
                         android:layout_height="80dp"
                         android:contentDescription="true"
-                        android:tag="投料-按钮"
+                        android:tag="@string/btn_putmeal"
                         app:imagesrc_ks="@mipmap/sb1"
                         app:imagesrc_qt="@mipmap/sb2"
                         app:imagesrc_tz="@mipmap/sb3" />
@@ -503,7 +516,7 @@
         <!-- plc状态 -->
         <ImageView
             android:id="@+id/plcstatus1"
-            android:layout_width="100dp"
+            android:layout_width="140dp"
             android:layout_height="35dp"
             android:layout_alignParentRight="true"
             android:layout_marginTop="70dp"

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

@@ -20,8 +20,8 @@
             android:paddingBottom="@dimen/dp_25"
             android:layout_marginBottom="2dp"
             android:ellipsize="middle"
-            android:textSize="@dimen/sp_32"
-            android:text="添加分类"
+            android:textSize="25dp"
+            android:text="@string/btn_addclass"
             android:textColor="#823E17"
             android:gravity="center"
             android:background="#EFE9D2"/>
@@ -51,7 +51,7 @@
             android:layout_alignParentEnd="true"
             android:ellipsize="middle"
             android:textSize="@dimen/sp_32"
-            android:text="上传所有商品"
+            android:text="@string/btn_updateall"
             android:textColor="#823E17"
             android:gravity="center"
             android:layout_alignParentBottom="true"
@@ -72,7 +72,7 @@
             android:layout_alignParentEnd="true"
             android:ellipsize="middle"
             android:textSize="@dimen/sp_32"
-            android:text="删除所有商品"
+            android:text="@string/btn_deleteall"
             android:textColor="#823E17"
             android:gravity="center"
             android:layout_alignParentBottom="true"

app/src/main/res/layout/item/layout/dialog_add_classify.xml

@@ -46,7 +46,7 @@
             android:layout_height="@dimen/dp_80"
             android:textSize="@dimen/sp_32"
             android:textColor="@color/white"
-            android:text="确认"
+            android:text="@string/tip_save_confirm"
             android:background="@drawable/bg_round25_yellow_btn"
             android:layout_gravity="bottom"
             android:layout_marginBottom="@dimen/dp_20"

app/src/main/res/layout/item/layout/dialog_attribute_select.xml

@@ -23,7 +23,7 @@
             app:layout_constraintLeft_toLeftOf="parent"
             android:background="@drawable/bg_round25_top_yellow"
             style="@style/TextView_btn_dialog"
-            android:text="导入已有组合工序"
+            android:text="@string/top_importprocess"
             />
 
         <FrameLayout
@@ -53,7 +53,7 @@
             android:layout_marginBottom="@dimen/dp_20"
             android:layout_marginTop="@dimen/dp_30"
             style="@style/TextView_btn_dialog"
-            android:text="确定"
+            android:text="@string/tip_save_confirm"
             />
 
         <TextView
@@ -66,13 +66,13 @@
             android:layout_marginTop="@dimen/dp_30"
             android:layout_marginBottom="@dimen/dp_20"
             style="@style/TextView_btn_dialog"
-            android:text="取消"
+            android:text="@string/btn_cancel"
             />
 
         <TextView
             android:id="@+id/tv_exist"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/dp_80"
+            android:layout_width="300dp"
+            android:layout_height="wrap_content"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"

app/src/main/res/layout/item/layout/dialog_delete_classify.xml

@@ -31,7 +31,7 @@
             app:layout_constraintLeft_toRightOf="@id/title"
             app:layout_constraintTop_toTopOf="@id/title"
             android:textSize="@dimen/sp_36"
-            android:text="是否删除？"
+            android:text="@string/text_deleteinfo"
             android:gravity="center"
             android:paddingLeft="@dimen/dp_10"
             android:paddingRight="@dimen/dp_10"
@@ -45,7 +45,7 @@
             android:layout_height="@dimen/dp_80"
             android:textSize="@dimen/sp_32"
             android:textColor="@color/white"
-            android:text="取消"
+            android:text="@string/btn_cancel"
             android:background="@drawable/bg_round25_yellow_btn"
             android:layout_gravity="bottom"
             android:layout_marginBottom="@dimen/dp_20"
@@ -58,7 +58,7 @@
             android:layout_height="@dimen/dp_80"
             android:textSize="@dimen/sp_32"
             android:textColor="@color/white"
-            android:text="确认"
+            android:text="@string/tip_save_confirm"
             android:background="@drawable/bg_round25_yellow_btn"
             android:layout_gravity="bottom"
             android:layout_marginBottom="@dimen/dp_20"

app/src/main/res/layout/item/layout/dialog_with_cancel_confirm.xml

@@ -53,7 +53,7 @@
                     android:layout_height="100dp"
                     android:textSize="@dimen/sp_38"
                     android:textColor="@color/blue_primary"
-                    android:text="取消"
+                    android:text="@string/btn_cancel"
                     android:layout_alignParentLeft="true"
                     android:layout_marginLeft="@dimen/dp_50"
                     android:gravity="center"

app/src/main/res/layout/item/layout/good_show.xml

@@ -95,10 +95,10 @@
                                 android:layout_height="wrap_content"
                                 android:layout_alignParentRight="true"
                                 android:layout_alignParentBottom="true"
-                                android:text="上传"
+                                android:text="@string/btn_update"
                                 android:textAlignment="center"
                                 android:textColor="#BEAA6A"
-                                android:textSize="12dp" />
+                                android:textSize="10dp" />
                         </RelativeLayout>
                     </RelativeLayout>
 
@@ -126,10 +126,10 @@
                                 android:layout_height="wrap_content"
                                 android:layout_alignParentRight="true"
                                 android:layout_alignParentBottom="true"
-                                android:text="删除"
+                                android:text="@string/btn_delete"
                                 android:textAlignment="center"
                                 android:textColor="#BEAA6A"
-                                android:textSize="12dp" />
+                                android:textSize="10dp" />
                         </RelativeLayout>
                     </RelativeLayout>
                     <!--                <TextView-->

app/src/main/res/layout/item/layout/item_cloud_goods.xml

@@ -57,7 +57,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="下载"
+                android:text="@string/btn_download"
                 android:layout_toRightOf="@id/img3"
                 android:layout_centerVertical="true"
                 android:textColor="@color/black"

app/src/main/res/layout/item/layout/item_local_goods.xml

@@ -31,7 +31,7 @@
             tools:text="三月瓜"
             android:textAlignment="center"
             android:textColor="@color/black"
-            android:textSize="@dimen/sp_32"
+            android:textSize="30dp"
             android:textStyle="bold"
             android:ellipsize="middle"
             android:lines="1"
@@ -59,19 +59,19 @@
 
                 <ImageView
                     android:id="@+id/img1"
-                    android:layout_width="35dp"
-                    android:layout_height="35dp"
+                    android:layout_width="25dp"
+                    android:layout_height="25dp"
                     android:layout_centerVertical="true"
                     android:src="@mipmap/ysc" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="上传"
+                    android:text="@string/btn_update"
                     android:layout_toRightOf="@id/img1"
                     android:layout_centerVertical="true"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/sp_24" />
+                    android:textSize="16dp" />
             </RelativeLayout>
 
 
@@ -85,19 +85,19 @@
 
                 <ImageView
                     android:id="@+id/img2"
-                    android:layout_width="35dp"
-                    android:layout_height="35dp"
+                    android:layout_width="25dp"
+                    android:layout_height="25dp"
                     android:layout_centerVertical="true"
                     android:src="@mipmap/ysc1" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="删除"
+                    android:text="@string/btn_delete"
                     android:layout_toRightOf="@id/img2"
                     android:layout_centerVertical="true"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/sp_24" />
+                    android:textSize="16dp" />
             </RelativeLayout>
         </LinearLayout>
 

app/src/main/res/layout/item/layout/layout_add_goods_mainfood.xml

@@ -17,7 +17,7 @@
         android:paddingLeft="@dimen/dp_80"
         android:paddingRight="@dimen/dp_80"
         android:singleLine="true"
-        android:text="按编号填写主料名称"
+        android:text="@string/text_writeprocess"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -45,7 +45,7 @@
             android:layout_width="@dimen/dp_250"
             android:layout_height="match_parent"
             android:background="@drawable/input_bj"
-            android:hint="1号位"
+            android:hint="@string/text_bit_1"
             android:inputType="text"
             android:lines="1"
             android:padding="@dimen/dp_3"
@@ -69,7 +69,7 @@
             android:layout_width="@dimen/dp_250"
             android:layout_height="match_parent"
             android:background="@drawable/input_bj"
-            android:hint="2号位"
+            android:hint="@string/text_bit_2"
             android:inputType="text"
             android:lines="1"
             android:padding="@dimen/dp_3"
@@ -105,7 +105,7 @@
             android:layout_width="@dimen/dp_250"
             android:layout_height="match_parent"
             android:background="@drawable/input_bj"
-            android:hint="3号位"
+            android:hint="@string/text_bit_3"
             android:inputType="text"
             android:lines="1"
             android:padding="@dimen/dp_3"
@@ -129,7 +129,7 @@
             android:layout_width="@dimen/dp_250"
             android:layout_height="match_parent"
             android:background="@drawable/input_bj"
-            android:hint="4号位"
+            android:hint="@string/text_bit_4"
             android:inputType="text"
             android:lines="1"
             android:padding="@dimen/dp_3"
@@ -221,7 +221,7 @@
             android:textSize="@dimen/sp_48"
             android:textColor="@color/white"
             android:background="@drawable/bg_round25_yellow_btn"
-            android:text="去烹饪"
+            android:text="@string/btn_cooking"
             />
 
         <LinearLayout
@@ -239,9 +239,9 @@
                 android:layout_marginLeft="@dimen/dp_30"
                 android:background="@drawable/bg_round25_green_btn"
                 android:gravity="center"
-                android:text="编辑工序"
+                android:text="@string/btn_editprocess"
                 android:textColor="@color/white"
-                android:textSize="@dimen/sp_48" />
+                android:textSize="35dp" />
 
             <TextView
                 android:id="@+id/btn_delete"
@@ -250,10 +250,10 @@
                 android:layout_marginTop="@dimen/dp_10"
                 android:layout_marginLeft="@dimen/dp_30"
                 android:gravity="center"
-                android:textSize="@dimen/sp_48"
+                android:textSize="35dp"
                 android:textColor="@color/white"
                 android:background="@drawable/bg_round25_red_btn"
-                android:text="删除配方"
+                android:text="@string/btn_deleterecipe"
                 />
         </LinearLayout>
     </LinearLayout>

app/src/main/res/layout/item/layout/layout_add_goods_name.xml

@@ -25,7 +25,7 @@
         android:layout_marginLeft="@dimen/dp_50"
         app:layout_constraintTop_toBottomOf="@id/title2"
         android:layout_marginTop="@dimen/dp_20"
-        android:text="选择图片:"
+        android:text="@string/text_selectpic"
         style="@style/TextView_desc"
         />
 
@@ -50,7 +50,7 @@
         android:layout_marginLeft="@dimen/dp_50"
         app:layout_constraintTop_toBottomOf="@id/desc2"
         android:layout_marginTop="@dimen/dp_20"
-        android:text="菜品名称:"
+        android:text="@string/text_recipename"
         style="@style/TextView_desc"
         />
 
@@ -59,7 +59,7 @@
         android:layout_width="@dimen/dp_400"
         android:layout_height="@dimen/dp_90"
         android:background="@drawable/input_bj"
-        android:hint="请输入菜品名称"
+        android:hint="@string/text_inputrecipe"
         android:inputType="text"
         android:lines="1"
         android:padding="@dimen/dp_3"
@@ -82,7 +82,7 @@
         android:layout_marginLeft="@dimen/dp_480"
         android:layout_marginBottom="@dimen/dp_20"
         style="@style/TextView_btn_dialog"
-        android:text="确认"
+        android:text="@string/tip_save_confirm"
         />
 
     <TextView
@@ -94,7 +94,7 @@
         android:layout_marginLeft="@dimen/dp_20"
         android:layout_marginBottom="@dimen/dp_20"
         style="@style/TextView_btn_dialog"
-        android:text="上一步"
+        android:text="@string/text_prev"
         />
 
     <ImageView

app/src/main/res/layout/item/layout/layout_edit_goods_name.xml

@@ -12,9 +12,10 @@
         android:layout_height="@dimen/dp_80"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
+        android:textStyle="bold"
         android:background="@drawable/bg_round25_top_yellow"
         style="@style/TextView_btn_dialog"
-        android:text="编辑菜品"
+        android:text="@string/text_edit"
         />
 
     <TextView
@@ -25,7 +26,7 @@
         android:layout_marginLeft="@dimen/dp_50"
         app:layout_constraintTop_toBottomOf="@id/title1"
         android:layout_marginTop="@dimen/dp_20"
-        android:text="选择图片:"
+        android:text="@string/text_selectpic"
         style="@style/TextView_desc"
         />
 
@@ -50,7 +51,7 @@
         android:layout_marginLeft="@dimen/dp_50"
         app:layout_constraintTop_toBottomOf="@id/desc1"
         android:layout_marginTop="@dimen/dp_20"
-        android:text="菜品名称:"
+        android:text="@string/text_recipename"
         style="@style/TextView_desc"
         />
 
@@ -59,7 +60,7 @@
         android:layout_width="@dimen/dp_400"
         android:layout_height="@dimen/dp_90"
         android:background="@drawable/input_bj"
-        android:hint="请输入菜品名称"
+        android:hint="@string/text_inputrecipe"
         android:inputType="text"
         android:lines="1"
         android:padding="@dimen/dp_3"
@@ -82,7 +83,7 @@
         android:layout_marginLeft="@dimen/dp_480"
         android:layout_marginBottom="@dimen/dp_20"
         style="@style/TextView_btn_dialog"
-        android:text="下一步"
+        android:text="@string/btn_next"
         />
 
     <TextView
@@ -94,7 +95,7 @@
         android:layout_marginLeft="@dimen/dp_20"
         android:layout_marginBottom="@dimen/dp_20"
         style="@style/TextView_btn_dialog"
-        android:text="取消"
+        android:text="@string/btn_cancel"
         />
 
     <ImageView

app/src/main/res/layout/item/layout/layout_edit_goods_sub_attribute.xml

@@ -12,9 +12,10 @@
         android:layout_height="@dimen/dp_80"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
+        android:textStyle="bold"
         android:background="@drawable/bg_round25_top_yellow"
         style="@style/TextView_btn_dialog"
-        android:text="选择属性"
+        android:text="@string/text_selectab"
         />
 
     <TextView
@@ -25,7 +26,7 @@
         android:layout_marginLeft="@dimen/dp_20"
         app:layout_constraintTop_toTopOf="parent"
         android:layout_marginTop="@dimen/dp_100"
-        android:text="已有组合:"
+        android:text="@string/text_commodityab"
         style="@style/TextView_desc"
         />
 
@@ -62,7 +63,7 @@
 
     <TextView
         android:id="@+id/group_desc"
-        android:layout_width="wrap_content"
+        android:layout_width="300dp"
         android:textSize="@dimen/sp_32"
         android:layout_height="@dimen/dp_120"
         app:layout_constraintLeft_toLeftOf="parent"
@@ -70,7 +71,7 @@
         app:layout_constraintRight_toRightOf="parent"
         android:layout_marginTop="@dimen/dp_30"
         android:textColor="@color/blue"
-        tools:text="存在选中组合\n(没有工序)"
+        tools:text="@string/text_haveattr_1"
         android:gravity="center"
         />
 
@@ -85,7 +86,7 @@
         android:layout_marginTop="@dimen/dp_30"
         style="@style/TextView_btn_dialog"
         tools:background="@drawable/bg_round25_gray_btn"
-        android:text="下一步"
+        android:text="@string/btn_next"
         />
 
     <TextView
@@ -98,7 +99,7 @@
         android:layout_marginTop="@dimen/dp_30"
         android:layout_marginBottom="@dimen/dp_20"
         style="@style/TextView_btn_dialog"
-        android:text="上一步"
+        android:text="@string/text_prev"
         />
 
     <ImageView

app/src/main/res/layout/item/layout/spinner_text_item32.xml

@@ -8,7 +8,7 @@
     android:singleLine="true"
     android:textAlignment="inherit"
     android:gravity="center_vertical"
-    android:text="请选择"
+    android:text="@string/text_noselect"
     android:textSize="32sp"
     android:textColor="@color/black">
 </TextView>

app/src/main/res/layout/item/layout/view_process_value.xml

@@ -22,7 +22,7 @@
         android:layout_width="@dimen/dp_190"
         android:layout_height="@dimen/dp_70"
         tools:text="液体料液体料液体料"
-        android:textSize="@dimen/sp_28"
+        android:textSize="25dp"
         android:maxLines="1"
         android:maxLength="10"
         android:gravity="center_vertical"

app/src/main/res/values-en/strings.xml

@@ -76,6 +76,88 @@
     <string name="btn_clean">Clean-按钮</string>
     <string name="btn_watergun">Water Gun-按钮</string>
     <string name="btn_addwater">Add Water-按钮</string>
-    <string name="text_potdirection">Please control the pan direction:  Extraction Position</string>
-
+    <string name="text_potdirection_1">Please control the pan direction:  Extraction Position</string>
+    <string name="text_potdirection_2">Please control the pan direction:  Clean Position</string>
+    <string name="text_waterset">Null</string>
+    <string name="btn_pourmeal">Pour Out Meal-按钮</string>
+    <string name="btn_putmeal">Feed-按钮</string>
+    <string name="text_waitput">Please wait for the end of the last feeding!!!</string>
+    <string name="btn_initialize">Init</string>
+    <string name="btn_rinse">Rinse</string>
+    <string name="text_localrecipe">Local Recipe</string>
+    <string name="text_cloudrecipe">Cloud Recipe</string>
+    <string name="text_deviceconnect">Device connection: Connected</string>
+    <string name="text_devicedisconnect">Device connection: DisConnected</string>
+    <string name="btn_return">Return</string>
+    <string name="text_top_cpgl">Recipe Management</string>
+    <string name="btn_downloadall">Download All</string>
+    <string name="btn_refresh">Refresh</string>
+    <string name="btn_download">Download</string>
+    <string name="text_downloadsuc">Download Successful</string>
+    <string name="text_downloadinfo">Please download the product first！</string>
+    <string name="btn_update">Update</string>
+    <string name="btn_delete">Delete</string>
+    <string name="text_deleterecipe">Delete Recipe</string>
+    <string name="btn_deleteall">Delete All</string>
+    <string name="btn_updateall">Update All</string>
+    <string name="text_edit">Edit Recipe</string>
+    <string name="text_selectpic">Select Picture:</string>
+    <string name="text_recipename">Recipe Name:</string>
+    <string name="btn_cancel">Cancel</string>
+    <string name="btn_next">Next</string>
+    <string name="text_inputrecipe">Please enter the recipe name!</string>
+    <string name="text_selectab">Select Attribute</string>
+    <string name="text_commodityab">Commodity Attribute:</string>
+    <string name="text_defaultab">Default Attribute:</string>
+    <string name="text_prev">Prev</string>
+    <string name="btn_cooking">Cooking</string>
+    <string name="btn_editprocess">Edit Process</string>
+    <string name="btn_deleterecipe">Delete Recipe</string>
+    <string name="text_writeprocess">Fill in the main material name</string>
+    <string name="text_bit_1">1 Bit</string>
+    <string name="text_bit_2">2 Bit</string>
+    <string name="text_bit_3">3 Bit</string>
+    <string name="text_bit_4">4 Bit</string>
+    <string name="text_savereturn">Save&amp;return</string>
+    <string name="btn_tolead">To Lead</string>
+    <string name="text_step">Cook Step</string>
+    <string name="text_cookprocess">Cook Process</string>
+    <string name="btn_cooksimulate">Simulation Cook</string>
+    <string name="btn_add">+Add</string>
+    <string name="btn_insert">Insert</string>
+    <string name="btn_upinsert">UpInsert</string>
+    <string name="btn_Downinsert">DownInsert</string>
+    <string name="btn_revise">Revise</string>
+    <string name="btn_create">Create</string>
+    <string name="text_haveattr_1">There are selection attributes\n(No Process)</string>
+    <string name="text_haveattr_2">There are selection attributes</string>
+    <string name="text_haveattr">Null</string>
+    <string name="info_datanull">Data Null</string>
+    <string name="info_editprocess">This combination has no process, please edit the process first!</string>
+    <string name="info_selectprocess">Please select the subattribute for each row!</string>
+    <string name="btn_addclass">Add Class</string>
+    <string name="text_deleteinfo">Delete or Not？</string>
+    <string name="top_editclass">Edit Class</string>
+    <string name="text_noselect">Unselect</string>
+    <string name="text_attribute">Attribute</string>
+    <string name="text_childattribute">Subattribute</string>
+    <string name="btn_addattribute">+AddAttribute</string>
+    <string name="btn_deleteattribute">-DeleteAttribute</string>
+    <string name="btn_reviseattribute">ReviseAttribute</string>
+    <string name="btn_addchildattribute">+AddSubattribute</string>
+    <string name="top_addattribute">New Attribute Name</string>
+    <string name="info_addattribute">Please enter a attribute name</string>
+    <string name="top_revisechildattribute">Revise Subattribute Name</string>
+    <string name="info_revisechildattribute">Please enter a subattribute name</string>
+    <string name="top_addchildattribute">New Subattribute Name</string>
+    <string name="top_reviseattribute">Revise Attribute Name</string>
+    <string name="btn_new">New</string>
+    <string name="top_addclass">New Class Name</string>
+    <string name="info_addclass">Please enter a class name</string>
+    <string name="top_reviseclass">Revise Class Name</string>
+    <string name="top_deleteclass">Delete Class Name</string>
+    <string name="top_importprocess">To Lead Existing Process</string>
+    <string name="text_haveprocess_1">Existential process</string>
+    <string name="text_haveprocess_2">Non-existent process</string>
+    <string name="text_haveprocess_3">Unable to import while editing</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -76,5 +76,88 @@
     <string name="btn_clean">清洗位-按钮</string>
     <string name="btn_watergun">洗锅水枪-按钮</string>
     <string name="btn_addwater">锅内加水-按钮</string>
-    <string name="text_potdirection">请先控制锅口朝向：抽料位</string>
+    <string name="text_potdirection_1">请先控制锅口朝向：抽料位</string>
+    <string name="text_potdirection_2">请先控制锅口朝向：清洗位</string>
+    <string name="text_waterset">未设置</string>
+    <string name="btn_pourmeal">出  餐-按钮</string>
+    <string name="btn_putmeal">投料-按钮</string>
+    <string name="text_waitput">请耐心等待上一次投料结束!!!</string>
+    <string name="btn_initialize">初始化</string>
+    <string name="btn_rinse">清洗</string>
+    <string name="text_localrecipe">本地菜谱</string>
+    <string name="text_cloudrecipe">云端菜谱</string>
+    <string name="text_deviceconnect">设备状态：已连接</string>
+    <string name="text_devicedisconnect">设备状态：未连接</string>
+    <string name="btn_return">返 回</string>
+    <string name="text_top_cpgl">菜品管理</string>
+    <string name="btn_downloadall">下载所有商品</string>
+    <string name="btn_refresh">刷   新</string>
+    <string name="btn_download">下载</string>
+    <string name="text_downloadsuc">下载成功！</string>
+    <string name="text_downloadinfo">请先下载该商品</string>
+    <string name="btn_update">上传</string>
+    <string name="btn_delete">删除</string>
+    <string name="text_deleterecipe">删除菜品</string>
+    <string name="btn_deleteall">删除所有商品</string>
+    <string name="btn_updateall">上传所有商品</string>
+    <string name="text_edit">编辑菜品</string>
+    <string name="text_selectpic">选择图片:</string>
+    <string name="text_recipename">菜品名称:</string>
+    <string name="btn_cancel">取消</string>
+    <string name="btn_next">下一步</string>
+    <string name="text_inputrecipe">请输入菜品名称!</string>
+    <string name="text_selectab">选择属性</string>
+    <string name="text_commodityab">商品属性:</string>
+    <string name="text_defaultab">默认属性:</string>
+    <string name="text_prev">上一步</string>
+    <string name="btn_cooking">去烹饪</string>
+    <string name="btn_editprocess">编辑工序</string>
+    <string name="btn_deleterecipe">删除配方</string>
+    <string name="text_writeprocess">按编号填写主料名称</string>
+    <string name="text_bit_1">1号位</string>
+    <string name="text_bit_2">2号位</string>
+    <string name="text_bit_3">3号位</string>
+    <string name="text_bit_4">4号位</string>
+    <string name="text_savereturn">保存并返回</string>
+    <string name="btn_tolead">导入工序</string>
+    <string name="text_step">步骤</string>
+    <string name="text_cookprocess">烹饪工艺</string>
+    <string name="btn_cooksimulate">模拟炒制</string>
+    <string name="btn_add">+添加</string>
+    <string name="btn_insert">插入</string>
+    <string name="btn_upinsert">向上插入</string>
+    <string name="btn_Downinsert">向下插入</string>
+    <string name="btn_revise">修改</string>
+    <string name="btn_create">创建</string>
+    <string name="text_haveattr_1">存在选择组合\n(没有工序)</string>
+    <string name="text_haveattr_2">存在选择组合</string>
+    <string name="text_haveattr">不存在选中组合</string>
+    <string name="info_datanull">数据为空</string>
+    <string name="info_editprocess">该组合没有工序，请先编辑工序</string>
+    <string name="info_selectprocess">请选择每行对应的子属性！</string>
+    <string name="btn_addclass">添加分类</string>
+    <string name="text_deleteinfo">是否删除？</string>
+    <string name="top_editclass">编辑分类</string>
+    <string name="text_noselect">未选择</string>
+    <string name="text_attribute">属性</string>
+    <string name="text_childattribute">子属性</string>
+    <string name="btn_addattribute">+添加属性</string>
+    <string name="btn_deleteattribute">-删除属性</string>
+    <string name="btn_reviseattribute">修改属性</string>
+    <string name="btn_addchildattribute">+添加子属性</string>
+    <string name="top_addattribute">新增属性名称</string>
+    <string name="info_addattribute">请输入属性名称</string>
+    <string name="top_revisechildattribute">修改子属性名称</string>
+    <string name="info_revisechildattribute">请输入子属性名称</string>
+    <string name="top_addchildattribute">新增子属性名称</string>
+    <string name="top_reviseattribute">修改属性名称</string>
+    <string name="btn_new">新增</string>
+    <string name="top_addclass">新增分类名称</string>
+    <string name="info_addclass">请输入分类名称</string>
+    <string name="top_reviseclass">修改分类名称</string>
+    <string name="top_deleteclass">删除分类名称</string>
+    <string name="top_importprocess">导入已有工序组合</string>
+    <string name="text_haveprocess_1">存在分组</string>
+    <string name="text_haveprocess_2">不存在分组</string>
+    <string name="text_haveprocess_3">正在编辑无法导入</string>
 </resources>