|
@@ -103,7 +103,7 @@ import io.reactivex.observers.DisposableObserver;
|
|
|
import io.reactivex.schedulers.Schedulers;
|
|
|
|
|
|
@Route(path = "/module_app/mqservice")
|
|
|
-public class MQService extends Service implements SendCallback,Callback<Result> {
|
|
|
+public class MQService extends Service implements SendCallback, Callback<Result> {
|
|
|
|
|
|
private static final String TAG = "MQService";
|
|
|
ConnectionFactory factory;
|
|
@@ -150,7 +150,8 @@ public class MQService extends Service implements SendCallback,Callback<Result>
|
|
|
switch (kind) {
|
|
|
//显示花型
|
|
|
case "updateProductsShow":
|
|
|
- updateProductsShow(gson, baseBean, kind);
|
|
|
+// updateProductsShow(gson, baseBean, kind);
|
|
|
+ EventBus.getDefault().post(new ApiMessageEvent("updateDIYProductShow", baseBean.getKind_data()));
|
|
|
break;
|
|
|
case "products":
|
|
|
//保存价格到本地
|
|
@@ -370,7 +371,7 @@ public class MQService extends Service implements SendCallback,Callback<Result>
|
|
|
public void run() {
|
|
|
CommunicationHelper.getInstance().sendControl(IceCreamDeviceConstants.ORDER_THAW, MQService.this);
|
|
|
}
|
|
|
- },500);
|
|
|
+ }, 500);
|
|
|
}
|
|
|
break;
|
|
|
case "smokeJam":
|
|
@@ -378,17 +379,17 @@ public class MQService extends Service implements SendCallback,Callback<Result>
|
|
|
String name = smokeJam[0];
|
|
|
int param1 = Integer.parseInt(smokeJam[1]);
|
|
|
int id = 0;
|
|
|
- if (name.equals("J01")){
|
|
|
- id=IceCreamDeviceConstants.ORDER_SAUCE_1;
|
|
|
+ if (name.equals("J01")) {
|
|
|
+ id = IceCreamDeviceConstants.ORDER_SAUCE_1;
|
|
|
} else if (name.equals("J02")) {
|
|
|
- id=IceCreamDeviceConstants.ORDER_SAUCE_2;
|
|
|
+ id = IceCreamDeviceConstants.ORDER_SAUCE_2;
|
|
|
} else if (name.equals("J03")) {
|
|
|
- id=IceCreamDeviceConstants.ORDER_SAUCE_3;
|
|
|
+ id = IceCreamDeviceConstants.ORDER_SAUCE_3;
|
|
|
}
|
|
|
- if (param1==0){
|
|
|
- param1=3;
|
|
|
+ if (param1 == 0) {
|
|
|
+ param1 = 3;
|
|
|
}
|
|
|
- Log.d(TAG, "smokeJam: "+id+":"+param1);
|
|
|
+ Log.d(TAG, "smokeJam: " + id + ":" + param1);
|
|
|
CommunicationHelper.getInstance().sendControl(id, param1, 0, 0, this);
|
|
|
break;
|
|
|
default:
|
|
@@ -404,30 +405,47 @@ public class MQService extends Service implements SendCallback,Callback<Result>
|
|
|
ProductShowBean productShowBean = list.get(i);
|
|
|
Log.d(TAG, "updateProductsShow1: " + productShowBean.getNo());
|
|
|
Log.d(TAG, "updateProductsShow1: " + productShowBean.getShowType());
|
|
|
- String no=productShowBean.getNo();
|
|
|
- boolean b=true;
|
|
|
- if (productShowBean.getShowType().equals("0")){
|
|
|
- b=true;
|
|
|
- }else if (productShowBean.getShowType().equals("1")){
|
|
|
- b=false;
|
|
|
+ String no = productShowBean.getNo();
|
|
|
+ boolean b = true;
|
|
|
+ if (productShowBean.getShowType().equals("0")) {
|
|
|
+ b = true;
|
|
|
+ } else if (productShowBean.getShowType().equals("1")) {
|
|
|
+ b = false;
|
|
|
}
|
|
|
String s = getString(no);
|
|
|
- SPUtils.getInstance(App.app).putBoolean(s,b);
|
|
|
+ SPUtils.getInstance(App.app).putBoolean(s, b);
|
|
|
}
|
|
|
+ HashMap<String, String> params1 = new HashMap<>();
|
|
|
+ params1.put("clientId", Heartbeat.deviceId);
|
|
|
+ params1.put("DIYFlowerStatus", kind_data);
|
|
|
+ addSubscriptionNew(NoPayOrderStringApi.api.updateDIYFlowerShow(params1), String.class,
|
|
|
+ new HttpResultObserver<String>(view, getApplicationContext()) {
|
|
|
+ @Override
|
|
|
+ public void onNext(String result) {
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public void onError(Throwable t) {
|
|
|
+ super.onError(t);
|
|
|
+ Log.d(TAG, "getProductPrice onError: " + t.getMessage());
|
|
|
+ BaseException exception = ExceptionFactory.create(t);
|
|
|
+ }
|
|
|
+ });
|
|
|
}
|
|
|
|
|
|
private static String getString(String no) {
|
|
|
- String s="";
|
|
|
- if (no.equals("J01")){
|
|
|
- s=PriceFragment.SHARED_PREFERENCE_SWITCH_SAUCE_1;
|
|
|
+ String s = "";
|
|
|
+ if (no.equals("J01")) {
|
|
|
+ s = PriceFragment.SHARED_PREFERENCE_SWITCH_SAUCE_1;
|
|
|
} else if (no.equals("J02")) {
|
|
|
- s=PriceFragment.SHARED_PREFERENCE_SWITCH_SAUCE_2;
|
|
|
+ s = PriceFragment.SHARED_PREFERENCE_SWITCH_SAUCE_2;
|
|
|
} else if (no.equals("J03")) {
|
|
|
- s=PriceFragment.SHARED_PREFERENCE_SWITCH_SAUCE_2;
|
|
|
+ s = PriceFragment.SHARED_PREFERENCE_SWITCH_SAUCE_2;
|
|
|
} else if (no.equals("C01")) {
|
|
|
- s=PriceFragment.SHARED_PREFERENCE_SWITCH_KERNEL_1;
|
|
|
+ s = PriceFragment.SHARED_PREFERENCE_SWITCH_KERNEL_1;
|
|
|
} else if (no.equals("C02")) {
|
|
|
- s=PriceFragment.SHARED_PREFERENCE_SWITCH_KERNEL_2;
|
|
|
+ s = PriceFragment.SHARED_PREFERENCE_SWITCH_KERNEL_2;
|
|
|
}
|
|
|
return s;
|
|
|
}
|
|
@@ -953,15 +971,15 @@ public class MQService extends Service implements SendCallback,Callback<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);
|
|
|
+ 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 {
|
|
@@ -1320,15 +1338,15 @@ public class MQService extends Service implements SendCallback,Callback<Result>
|
|
|
// 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 ("1".equals(s) ||"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)
|
|
|
- ||"0000".equals(s)|| "7764".equals(s)|| "5784".equals(s)|| "7749".equals(s)|| "7756".equals(s)) {
|
|
|
+ || "7773".equals(s) || "7774".equals(s) || "7786".equals(s) || "7775".equals(s) || "7754".equals(s)
|
|
|
+ || "0000".equals(s) || "7764".equals(s) || "5784".equals(s) || "7749".equals(s) || "7756".equals(s)) {
|
|
|
Hawk.put("logo", s);
|
|
|
Hawk.get("logo", "7777");
|
|
|
}
|