去logo

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

@@ -220,9 +220,9 @@ public class DrawableSelectorUtils {
         int height = 0;
         String logo = Hawk.get("logo", "7777");
         if ("1".equals(logo) | "7770".equals(logo)) {
-//            logoF = R.drawable.logo_1;
-            width = R.dimen.dp_0;
-            height = R.dimen.dp_0;
+            logoF = R.drawable.logo_1;
+            width = R.dimen.dp_60;
+            height = R.dimen.dp_30;
         } else if ("2".equals(logo) | "8647".equals(logo)) {
             logoF = R.drawable.logo_2;
             width = R.dimen.dp_60;
@@ -355,6 +355,9 @@ public class DrawableSelectorUtils {
             logoF = R.drawable.logo_kiddie;//美国代理
             width = R.dimen.dp_80;
             height = R.dimen.dp_40;
+        } else if ("0000".equals(logo)) {//删除logo
+            width = R.dimen.dp_60;
+            height = R.dimen.dp_24;
         }
         ViewGroup.LayoutParams layoutParams = view.getLayoutParams();
         layoutParams.width = UiUtil.getDimensionPixelRes(width);
@@ -375,8 +378,8 @@ public class DrawableSelectorUtils {
         String logo = Hawk.get("logo", "7777");
         if ("1".equals(logo) | "SUNZ".equals(logo)) {
             logoF = R.drawable.logo_1;
-            width = R.dimen.dp_40;
-            height = R.dimen.dp_16;
+            width = R.dimen.dp_50;
+            height = R.dimen.dp_30;
         } else if ("2".equals(logo) | "8647".equals(logo)) {
             logoF = R.drawable.logo_2;
             width = R.dimen.dp_60;

app/src/main/java/com/bgy/autosale/helpers/CommunicationHelper.java

@@ -305,13 +305,18 @@ public class CommunicationHelper {
     private void startIceCreamOrder() {
         MakeIceCreamBean detail = iceCreamOrders == null || iceCreamOrders.isEmpty() ? null : iceCreamOrders.peek();
         if (detail != null) {
+            Log.d(TAG, "setDishStatusListener4: ");
+
             makingIceCream = detail;
             try {
+                Log.d(TAG, "setDishStatusListener5: ");
                 IceCreamAgreement.Order iceCream = new IceCreamAgreement.Order(detail,
                         detail.makeCodes[0],
                         detail.makeCodes[1],
                         detail.makeCodes[2]);
+                Log.d(TAG, "setDishStatusListener6: "+iceCream);
                 if (manualAction > 0) {
+                    Log.d(TAG, "setDishStatusListener7: ");
                     agreement.setMakeOrderByManual(iceCream);
                     sendControl(manualAction, detail.makeCodes[0], detail.makeCodes[1], detail.makeCodes[2], new SendCallback() {
                         @Override
@@ -319,16 +324,19 @@ public class CommunicationHelper {
                         }
                     });
                 } else {
+                    Log.d(TAG, "setDishStatusListener8: ");
                     agreement.setMakeOrderByManual(null);
                     agreement.sendOrder(iceCream);
                 }
                 log(App.app.getString(R.string.making_out_flavor) + " > " + iceCream);
             } catch (Exception e) {
+                Log.d(TAG, "setDishStatusListener9: "+e.getMessage());
                 e.printStackTrace();
                 PlcLog.getInstance().e_s(TAG, e);
                 refundOrder();
             }
         } else {
+            Log.d(TAG, "setDishStatusListener10: ");
             makingIceCream = null;
             iceCreamOrders = null;
         }
@@ -371,12 +379,16 @@ public class CommunicationHelper {
     public void setDishStatusListener(Callback<Result> orderStatusCallback, int manualAction) {
         this.orderStatusCallback = orderStatusCallback;
         this.manualAction = manualAction;
+        Log.d(TAG, "setDishStatusListener0: ");
         if (orderStatusCallback == null) {
+            Log.d(TAG, "setDishStatusListener1: ");
             if (manualAction == -1) {
                 refundOrder();
+                Log.d(TAG, "setDishStatusListener2: ");
             }
             return;
         }
+        Log.d(TAG, "setDishStatusListener3: ");
         startIceCreamOrder();
     }
 

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

@@ -31,8 +31,10 @@ import com.bgy.autosale.IceCreamDeviceConstants;
 import com.bgy.autosale.R;
 import com.bgy.autosale.RemoteSupportService;
 import com.bgy.autosale.entitys.MakeIceCreamBean;
+import com.bgy.autosale.entitys.Result;
 import com.bgy.autosale.helpers.CommunicationHelper;
 import com.bgy.autosale.interfaces.SendCallback;
+import com.bgy.autosale.interfaces.Callback;
 import com.bgy.autosale.ui.consumer.PaySuccessFragment;
 import com.bgy.autosale.ui.operator.LockActivity;
 import com.bgy.autosale.ui.MainActivity;
@@ -100,7 +102,7 @@ import io.reactivex.observers.DisposableObserver;
 import io.reactivex.schedulers.Schedulers;
 
 @Route(path = "/module_app/mqservice")
-public class MQService extends Service implements SendCallback {
+public class MQService extends Service implements SendCallback,Callback<Result> {
 
     private static final String TAG = "MQService";
     ConnectionFactory factory;
@@ -260,6 +262,8 @@ public class MQService extends Service implements SendCallback {
                 iceCreamOrders.add(detail);
                 Log.d(TAG, "getMessage: dosugar"+iceCreamOrders);
                 CommunicationHelper.getInstance().setMakingIceCreams(iceCreamOrders);
+                CommunicationHelper.getInstance().setDishStatusListener(this, isManualMake ? IceCreamDeviceConstants.ORDER_MAKE_ORDER : -1);
+
                 break;
             case "alarmClock":
                 //远程星期调节闹钟
@@ -902,6 +906,21 @@ public class MQService extends Service implements SendCallback {
 
     private int networkState = 100;
 
+    @Override
+    public void onResult(Result result) {
+        AndroidSchedulers.mainThread().scheduleDirect(new Runnable() {
+            @Override
+            public void run() {
+                Log.d(TAG, "AndroidSchedulers run1: "+result);
+                Log.d(TAG, "AndroidSchedulers run2: "+result.code);
+                Log.d(TAG, "AndroidSchedulers run3: "+result.message);
+                Log.d(TAG, "AndroidSchedulers run4: "+result.data);
+                switch (result.code) {
+                }
+            }
+    });
+}
+
     //接收网络状态改变的广播
     public class NetWorkBroadCastReciver extends BroadcastReceiver {
         @Override
@@ -1259,14 +1278,15 @@ public class MQService extends Service implements SendCallback {
 //        if ("1".equals(s) || "2".equals(s) || "3".equals(s) || "4".equals(s) ||
 //                "5".equals(s) || "6".equals(s) || "7".equals(s) || "8".equals(s)||
 //                "9".equals(s)|| "10".equals(s)|| "11".equals(s)|| "12".equals(s)|| "14".equals(s)) {
-        if ("SUNZ".equals(s) || "7770".equals(s) || "8647".equals(s) || "7264".equals(s) || "1932".equals(s) ||
+        if ("1".equals(s) ||"SUNZ".equals(s) || "7770".equals(s) || "8647".equals(s) || "7264".equals(s) || "1932".equals(s) ||
                 "2381".equals(s) || "0291".equals(s) || "1313".equals(s) || "3103".equals(s) ||
                 "4873".equals(s) || "5291".equals(s) || "9284".equals(s) || "2222".equals(s)
                 || "3212".equals(s) || "3535".equals(s) || "1921".equals(s) || "3624".equals(s)
                 || "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) || "7774".equals(s) || "7786".equals(s) || "7775".equals(s)|| "7754".equals(s)) {
+                || "7773".equals(s) || "7774".equals(s) || "7786".equals(s) || "7775".equals(s)|| "7754".equals(s)
+                ||"0000".equals(s)) {
             Hawk.put("logo", s);
             Hawk.get("logo", "7777");
         }

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

@@ -443,8 +443,9 @@ public class SwitchFragment extends BaseFragment implements RadioGroup.OnChecked
         int id = v.getId();
         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)||"7774".equals(s)||"7786".equals(s)||"7775".equals(s)||"7754".equals(s)) {
+            if ("1".equals(s) ||"7772".equals(s)||"7770".equals(s)||"7777".equals(s)||"7761".equals(s)
+                    ||"7773".equals(s)||"7774".equals(s)||"7786".equals(s)||"7775".equals(s)||"7754".equals(s)
+            ||"0000".equals(s)) {
                 Hawk.put("logo", s);
                 Hawk.get("logo", "7777");
                 ToastUtil.showToast(UiUtil.getStringRes(R.string.xgwc));

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

@@ -228,7 +228,8 @@
             android:text="@string/flavor_sauce"
             android:textColor="@android:color/white"
             android:textSize="@dimen/sp_14"
-            android:textStyle="bold" />
+            android:textStyle="bold"
+            android:hyphenationFrequency="none"/>
 
         <LinearLayout
             android:id="@+id/contain_1"

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

@@ -62,7 +62,7 @@
     <string name="flavor_original_hw">Glace originale</string>
     <string name="flavor_multi">Glace multi-saveurs</string>
     <string name="flavor_sauce">Choisis Le Coulis ou Nappage +</string>
-    <string name="flavor_kernel">+ Choisis Le Croquant</string>
+    <string name="flavor_kernel">+  Choisis \nLe Croquant</string>
     <string name="shop_cart_add">Ajouter au panier</string>
     <string name="make_now">Créer maintenant</string>
     <string name="shop_cart">Panier</string>

config.gradle

@@ -5,7 +5,7 @@ ext {
             "minSdkVersion"                : 21,
             "targetSdkVersion"             : 28,
             "versionCode"                  : 110,
-            "versionName"                  : "1.0.54",//版本号修改
+            "versionName"                  : "1.0.56.3",//版本号修改
 
             "androidSupport"               : "28.0.0",
             "constraint-layout"            : "1.1.3",