合并代码

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/MissionActivity.java

@@ -114,8 +114,6 @@ public class MissionActivity extends BaseActivity implements View.OnClickListene
         recycler.setAdapter(adapter);
         presenter = new MissionPresenter(this);
         presenter.start();
-
-
     }
 
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/net/ViewUtil.java

@@ -409,7 +409,7 @@ public class ViewUtil {
                 case Constants.SUCCESS_ERP:
                     String result = msg.getData().getString("result");
                     try {
-                        if (new JsonValidator().validate(result)&&result!=null) {
+                        if (new JsonValidator().validate(result) && result != null) {
                             boolean success = JSON.parseObject(result).getBoolean("success");
                             if (success) {
                                 Intent intent = new Intent("com.app.home.update");
@@ -774,7 +774,7 @@ public class ViewUtil {
                             handler.sendMessage(finalMessage);
                         }
                     } else {
-                        finalBundle.putString("result", "服务器异常！");
+                        finalBundle.putString("result", "网络不佳，请稍后重试！");
                         finalBundle.putInt("what", what);
                         finalBundle.putInt("code", 0);
                         finalMessage.setData(finalBundle);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/MissionPresenter.java

@@ -312,6 +312,7 @@ public class MissionPresenter implements IMissionPresenter, HttpHandler.OnResult
 
     @Override
     public void error(int what, int statuCode, String message, Bundle bundle) {
+        isSubmiting = false;
         if (what == LOAD_PLAN && !StringUtils.isEmpty(StringUtils.getChinese(message)) && StringUtils.getChinese(message).equals("程序错误")) {
             loadMissionByDB();
         } else {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/ViewUtil.java

@@ -166,7 +166,7 @@ public class ViewUtil {
                     } else {
                         Bundle bundle = new Bundle();
                         Message message = new Message();
-                        bundle.putString("result", "服务器异常！");
+                        bundle.putString("result", "网络不佳，请稍后重试！");
                         message.setData(bundle);
                         message.what = Constants.APP_SOCKETIMEOUTEXCEPTION;
                         handler.sendMessage(message);
@@ -195,7 +195,6 @@ public class ViewUtil {
         Log.i("result", "http 响应-----------------------------------------");
     }
 
-
     public static void ShowMessageFDialogAutoDismiss(Context ct, String msg, long time) {
         final MaterialDialog messageDialog = new MaterialDialog.Builder(ct).title("系統提示").content(msg)
                 .positiveText("关闭").autoDismiss(false)
@@ -212,6 +211,4 @@ public class ViewUtil {
             }
         }, time);
     }
-
-
 }