国内支付修改名字

.idea/misc.xml

@@ -14,6 +14,9 @@
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/BaseLibrary/src/main/res/layout/dialog_normal.xml" value="0.24947916666666667" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/BaseLibrary/src/main/res/layout/item_user_home.xml" value="0.24947916666666667" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/BaseLibrary/src/main/res/layout/layout_empty_data.xml" value="0.24947916666666667" />
+        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/drawable/bg_switch_off.xml" value="0.102" />
+        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/drawable/bg_switch_on.xml" value="0.102" />
+        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/drawable/circular_white.xml" value="0.102" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/activity_authnumer.xml" value="0.1" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/activity_device_manager.xml" value="0.24947916666666667" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/activity_error.xml" value="0.176" />
@@ -52,9 +55,9 @@
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/fragment_technology_support.xml" value="0.176" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/fragment_warnings.xml" value="0.24947916666666667" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/item_alarm_clock.xml" value="0.2" />
-        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/item_price.xml" value="0.2" />
+        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/item_price.xml" value="0.264" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/item_shop_cart_dishes.xml" value="0.264" />
-        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/item_switch.xml" value="0.4" />
+        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/item_switch.xml" value="0.176" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/item_technology.xml" value="0.4" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/view_batching.xml" value="0.1" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/view_contact.xml" value="0.6" />

BaseLibrary/src/main/java/com/hboxs/base_library/constant/Global.java

@@ -33,7 +33,7 @@ public abstract class Global {
      * 1：
      * 2：国外线上
      */
-    public static final int isVersions = 2;
+    public static final int isVersions = 1;
 
     /**
      * 信用卡支付方式user

BaseLibrary/src/main/java/com/hboxs/base_library/util/DrawableSelectorUtils.java

@@ -339,6 +339,10 @@ public class DrawableSelectorUtils {
             logoF = R.drawable.logo_norl;
             width = R.dimen.dp_80;
             height = R.dimen.dp_40;
+        }else if ("7774".equals(logo)){
+            logoF = R.drawable.logo_laixue;
+            width = R.dimen.dp_65;
+            height = R.dimen.dp_30;
         }
         ViewGroup.LayoutParams layoutParams = view.getLayoutParams();
         layoutParams.width = UiUtil.getDimensionPixelRes(width);

app/src/main/java/com/bgy/autosale/payutil/MQService.java

@@ -1229,7 +1229,7 @@ public class MQService extends Service implements SendCallback {
                 || "2019".equals(s) || "7391".equals(s) || "0924".equals(s) || "9427".equals(s) || "0735".equals(s)
                 || "5769".equals(s) || "6894".equals(s) || "8123".equals(s) || "5217".equals(s) || "6431".equals(s)
                 || "7777".equals(s) || "8080".equals(s) || "6702".equals(s) || "7772".equals(s) || "7761".equals(s)
-                ||"7773".equals(s)) {
+                ||"7773".equals(s)||"7774".equals(s)) {
             Hawk.put("logo", s);
             Hawk.get("logo", "7777");
         }

app/src/main/java/com/bgy/autosale/ui/MainActivity.java

@@ -271,35 +271,35 @@ public class MainActivity extends BaseScanGunActivity {
 
         String path = CacheFileUtil.getInstance().getFilePath();
         PlcLog.getInstance().initLogFile(this, "", new File(path).getParent());
-        String sn = ReadCacheInfoUtils.getInstance().getSN();
-        if (sn == null || TextUtils.isEmpty(sn)) {
-            SnSettingActivity.startActivity(this, false);
-//            DeviceManagerActivity.startActivity(this, false);
-            return;
-        }
+//        String sn = ReadCacheInfoUtils.getInstance().getSN();
+//        if (sn == null || TextUtils.isEmpty(sn)) {
+//            SnSettingActivity.startActivity(this, false);
+////            DeviceManagerActivity.startActivity(this, false);
+//            return;
+//        }
 //        String sn="AB0001";
 
         final String secondarySN = "AB0001";
         final String secondarySN2 = "AB0002";
 
-        Constant.isSecondary = sn.startsWith(secondarySN) || sn.startsWith(secondarySN2);
-
-        TextView view = findViewById(R.id.test_mode);
-        if (sn.startsWith("CJX-")) {
-            view.setText("专属测试模式");
-            view.setVisibility(View.VISIBLE);
+//        Constant.isSecondary = sn.startsWith(secondarySN) || sn.startsWith(secondarySN2);
+//        TextView view = findViewById(R.id.test_mode);
+//        if (sn.startsWith("CJX-")) {
+//            view.setText("专属测试模式");
+//            view.setVisibility(View.VISIBLE);
+//        }
+//        view.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                String t = view.getText().toString();
+//                t = t + "\n忽略机台异常";
+//                view.setText(t);
+//                CommunicationHelper.getInstance().changeTestMode();
+//            }
+//        });
+        if (Heartbeat.deviceId!=null && Heartbeat.deviceId.length() > 6){
+            snView.setText("SN：" + Heartbeat.deviceId.substring(Heartbeat.deviceId.length()-6));
         }
-        view.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                String t = view.getText().toString();
-                t = t + "\n忽略机台异常";
-                view.setText(t);
-                CommunicationHelper.getInstance().changeTestMode();
-            }
-        });
-
-        snView.setText("SN：" + sn);
         initComplete();
     }
 
@@ -365,7 +365,7 @@ public class MainActivity extends BaseScanGunActivity {
         UISoundHelper.getInstance();
         findViewById(R.id.main_fragment).setVisibility(View.VISIBLE);
         if (!SPUtils.getInstance(App.app).getBoolean(Constant.LOCK_IN_ERROR, false)) {
-//            App.app.initDeviceStateListener();//是否开机
+            App.app.initDeviceStateListener();//是否开机
         }
 
         if (initView != null) {
@@ -384,7 +384,6 @@ public class MainActivity extends BaseScanGunActivity {
             PlcLog.getInstance().e_s(TAG, e);
         }
         initContactView();
-        //TODO CHECK
         CleanScheduleHelper.getInstance().initCleanScheduleParams();
     }
 

app/src/main/java/com/bgy/autosale/ui/consumer/IceCreamFragment.java

@@ -561,7 +561,7 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
 //            }
             if (!CommunicationHelper.getInstance().canGenerateOrder()) {
                 ToastUtil.getInstance().showText(CommunicationHelper.getInstance().getWhyCanOrderText());
-//                return;//是否开机
+                return;//是否开机
             }
             addShopCart();
 
@@ -1929,8 +1929,8 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
         String getOneTaste = "";
         for (String part : parts) {
             Log.d(TAG, "onClick0: " + part);
-            String[] getFlavorCombinations = part.split(priceBeans.get(0).getChineseName());
-            Log.d(TAG, "getStr13: ");
+            String[] getFlavorCombinations = part.split(SPUtils.getInstance(App.app).getString(PriceFragment.ProductAbout.nameKey[0],""));
+            Log.d(TAG, "getStr13: "+SPUtils.getInstance(App.app).getString(PriceFragment.ProductAbout.nameKey[0],""));
             for (String getFlavorCombination : getFlavorCombinations) {
                 Log.d(TAG, "getStr:10 " + getFlavorCombination);
                 if (getFlavorCombinations.length == 1) {
@@ -1956,8 +1956,10 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
             } else {
                 if (getOneTaste.equals("")) {
                     str = SPUtils.getInstance(App.app).getString(PriceFragment.ProductAbout.nameKey[0], getString(PriceFragment.ProductAbout.defaultName[0]));
+                    Log.d(TAG, "getStr: 16"+str);
                 } else {
                     str = SPUtils.getInstance(App.app).getString(PriceFragment.ProductAbout.nameKey[0], getString(PriceFragment.ProductAbout.defaultName[0])) + "-" + getOneTaste;
+                    Log.d(TAG, "getStr: 17"+str);
                 }
             }
         }

app/src/main/java/com/bgy/autosale/ui/operator/fragments/PriceFragment.java

@@ -123,8 +123,8 @@ public class PriceFragment extends BaseFragment implements View.OnClickListener
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-//        if (Global.isVersions == 1) {
-        if (Global.isGetProductName == 0&&Global.isVersions==1) {
+        if (Global.isVersions == 1) {
+//        if (Global.isGetProductName == 0 && Global.isVersions == 1) {
             getproducts();
         }
         btnConfirmName = view.findViewById(R.id.btn_confirm_name);
@@ -346,7 +346,7 @@ public class PriceFragment extends BaseFragment implements View.OnClickListener
 
     private int currentPosition = -1;
     String oldProductName;
-    List<String> oldProductNames = new ArrayList<>(5);
+    List<String> oldProductNames;
 
 
     class PriceAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> implements View.OnClickListener {
@@ -360,7 +360,7 @@ public class PriceFragment extends BaseFragment implements View.OnClickListener
         PriceAdapter(ArrayList<PriceBean> list, Context context) {
             this.inflater = LayoutInflater.from(context);
             this.list = list;
-
+            oldProductNames = new ArrayList<>();
             for (int i = 0; i < list.size(); i++) {
                 Log.d(TAG, "PriceAdapter2: " + SPUtils.getInstance(App.app).getString(list.get(i).getNameKey(), getString(ProductAbout.defaultName[i])));
                 Log.d(TAG, "PriceAdapter4: " + SPUtils.getInstance(App.app).getString(list.get(i).getPriceKey(), ProductAbout.priceDefault[i]));
@@ -368,9 +368,11 @@ public class PriceFragment extends BaseFragment implements View.OnClickListener
 //                oldProductNames.add(oldProductName);
                 if (Global.isGetProductName == 0) {
                     oldProductName = SPUtils.getInstance(App.app).getString(UiUtil.getStringRes(list.get(i).getTitle()), ProductAbout.chineseName[i]);
-                    oldProductNames.add(oldProductName);
+                    Global.isGetProductName = 1;
+                } else {
+                    oldProductName = SPUtils.getInstance(App.app).getString(PriceFragment.ProductAbout.nameKey[i], ProductAbout.chineseName[i]);
                 }
-
+                oldProductNames.add(oldProductName);
             }
             Log.d(TAG, "PriceAdapter刚开始: " + oldProductNames);
 //            nameListener = (v, hasFocus) -> {

app/src/main/java/com/bgy/autosale/ui/operator/fragments/SwitchFragment.java

@@ -441,7 +441,7 @@ public class SwitchFragment extends BaseFragment implements RadioGroup.OnChecked
         if (id == R.id.btn_changlogoupdate) {
             String s = etChanglog.getText().toString();
             if ("7772".equals(s)||"7770".equals(s)||"7777".equals(s)||"7761".equals(s)
-                    ||"7773".equals(s)) {
+                    ||"7773".equals(s)||"7774".equals(s)) {
                 Hawk.put("logo", s);
                 Hawk.get("logo", "7777");
                 ToastUtil.showToast(UiUtil.getStringRes(R.string.xgwc));

config.gradle

@@ -5,7 +5,7 @@ ext {
             "minSdkVersion"                : 19,
             "targetSdkVersion"             : 28,
             "versionCode"                  : 110,
-            "versionName"                  : "1.0.29",
+            "versionName"                  : "1.0.31",
 
             "androidSupport"               : "28.0.0",
             "constraint-layout"            : "1.1.3",