|
@@ -26,6 +26,7 @@ import com.sunzee.base.BaseApplication;
|
|
|
import com.sunzee.model.Global;
|
|
|
import com.sunzee.model.Heartbeat;
|
|
|
import com.sunzee.model.HttpResult;
|
|
|
+import com.sunzee.model.HttpResult2;
|
|
|
import com.sunzee.model.domain.GeTuiBean;
|
|
|
import com.sunzee.model.domain.GetAdBean;
|
|
|
import com.sunzee.model.domain.Name;
|
|
@@ -42,7 +43,9 @@ import org.greenrobot.eventbus.EventBus;
|
|
|
import org.greenrobot.eventbus.Subscribe;
|
|
|
import org.greenrobot.eventbus.ThreadMode;
|
|
|
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
import java.util.ArrayList;
|
|
|
+import java.util.Calendar;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
@@ -120,7 +123,7 @@ public class MyIntentService extends GTIntentService {
|
|
|
break;
|
|
|
case "updateRule":
|
|
|
//更新定时清洗的任务
|
|
|
- LogUtil.d(TAG, "onReceiveMessageData: updateRule");
|
|
|
+ LogUtil.d(TAG, "onReceiveMessageData: updateRule"+geTuiBean.getKind_data());
|
|
|
updataCleanRule(gson, geTuiBean, kind);
|
|
|
break;
|
|
|
case "statusType":
|
|
@@ -139,7 +142,9 @@ public class MyIntentService extends GTIntentService {
|
|
|
break;
|
|
|
case "paySuccess":
|
|
|
// todo 客户支付成功了,我们需要获取它的日期事件
|
|
|
- Log.d(TAG, "onReceiveMessageData: " + gson + ":" + geTuiBean + ":" + kind);
|
|
|
+ Log.d(TAG, "getKind: " + geTuiBean.getKind() + ";getKind_data:" + geTuiBean.getKind_data() + ":" );
|
|
|
+ Log.d(TAG, "getKind: "+geTuiBean.getNetTime()+";getWebTime:"+geTuiBean.getWebTime());
|
|
|
+ requestCleanTimeAndRemaining();
|
|
|
break;
|
|
|
case "cleanPositionNum":
|
|
|
//局部清洗
|
|
@@ -149,9 +154,50 @@ public class MyIntentService extends GTIntentService {
|
|
|
|
|
|
}
|
|
|
|
|
|
+ public void requestCleanTimeAndRemaining() {
|
|
|
+ Map<String, String> params = new HashMap<>();
|
|
|
+ params.put("clientId", Heartbeat.deviceId);
|
|
|
+ addSubscription(apiStores.getCleanTimeAndRemaining(params), new ApiCallback<HttpResult2<String>>() {
|
|
|
+ @Override
|
|
|
+ public void onSuccess(HttpResult2<String> model) {
|
|
|
+ Log.d(TAG, "onSuccess11: " + model);
|
|
|
+ String overdueDate = model.getOverdueDate();
|
|
|
+ String remaining = model.getRemaining();
|
|
|
+ if (TextUtils.isEmpty(overdueDate)) {
|
|
|
+ //如果为空
|
|
|
+ Hawk.put(Name.OVERDUE_DATE, null);
|
|
|
+ } else {
|
|
|
+ try {
|
|
|
+ Calendar calendar = Calendar.getInstance();
|
|
|
+ calendar.setTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(overdueDate));
|
|
|
+ Hawk.put(Name.OVERDUE_DATE, calendar.getTimeInMillis());
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ Hawk.put(Name.OVERDUE_DATE, null);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (TextUtils.isEmpty(remaining)) {
|
|
|
+ Hawk.put(Name.REMAINING, null);
|
|
|
+ } else {
|
|
|
+ Hawk.put(Name.REMAINING, remaining);
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public void onFailure(String msg) {
|
|
|
+ Log.d(TAG, "onFailure: " + msg);
|
|
|
+ //失败了。
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public void onFinish() {
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+
|
|
|
private void cleanPositionNum(Gson gson, GeTuiBean geTuiBean, String kind) {
|
|
|
//todo
|
|
|
-
|
|
|
EventBus.getDefault().post(new ApiMessageEvent("cleanPositionNum",geTuiBean.getKind_data()));
|
|
|
}
|
|
|
|
|
@@ -262,7 +308,7 @@ public class MyIntentService extends GTIntentService {
|
|
|
Log.d(TAG, "onSuccess: ");
|
|
|
String data = rule.getData();
|
|
|
//广告数据
|
|
|
- ArrayList<GetAdBean> adBeans = Hawk.get("showAd", new ArrayList<GetAdBean>());
|
|
|
+ ArrayList<GetAdBean> adBeans = Hawk.get("showAd", new ArrayList<GetAdBean>()); //数据为空
|
|
|
Gson gson = new Gson();
|
|
|
Log.d(TAG, "onSuccess: 1" + adBeans);
|
|
|
List<TimeRuleBean> list = gson.fromJson(data, new TypeToken<List<TimeRuleBean>>() {
|
|
@@ -291,7 +337,6 @@ public class MyIntentService extends GTIntentService {
|
|
|
Log.d(TAG, "onSuccess: 3" + adRulesMap);
|
|
|
//保存对应的id对应的广告规则
|
|
|
Hawk.put("ad_rules_map", adRulesMap);
|
|
|
- EventBus.getDefault().post(new ApiMessageEvent("pushTimeRule", null));
|
|
|
//发送设备id
|
|
|
deviceIdPostApi();
|
|
|
}
|