提交类型 修改需求

提交内容
1.添加消息模块数据库两个字段，将数据库版本提高到89
2.修改采购单详情界面内容，现还有回复接口需要调节一下
3.修改通用单据详情界面，避免一场出现
4.修改消息模块相关内容，针对审批知会消息进行第三层处理

冲突文件 版本文件、ViewUtil  取网络

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Fri Jan 19 17:14:25 CST 2018
-debugName=490
+#Sat Jan 20 14:12:48 CST 2018
+debugName=495
 versionName=625
-debugCode=490
+debugCode=495
 versionCode=164

app_modular/apputils/src/main/java/com/modular/apputils/activity/BaseNetActivity.java

@@ -124,8 +124,8 @@ public abstract class BaseNetActivity extends ActionBackActivity {
             httpClient.Api().send(httpBuilder.build(), new ResultSubscriber<>(new Result2Listener<Object>() {
                 @Override
                 public void onResponse(Object o) {
+                    LogUtil.i("onResponse oooo=" + o.toString());
                     if (onHttpListener != null) try {
-                        LogUtil.i("oooo=" + o.toString());
                         Tags tags = parameter.getTag();
                         int record = 0;
                         if (tags != null) {
@@ -147,6 +147,7 @@ public abstract class BaseNetActivity extends ActionBackActivity {
 
                 @Override
                 public void onFailure(Object t) {
+                    LogUtil.i("onFailure oooo=" + t.toString());
                     if (onHttpListener != null) try {
                         Tags tags = parameter.getTag();
                         int record = 0;
@@ -159,6 +160,7 @@ public abstract class BaseNetActivity extends ActionBackActivity {
                         }
                         onHttpListener.onFailure(record, message, tags);
                     } catch (Exception e) {
+                        LogUtil.i("oooo=" + e.getMessage());
                         e.printStackTrace();
                     }
                     dismissProgress();

app_modular/apputils/src/main/java/com/modular/apputils/utils/SwitchUtil.java

@@ -13,7 +13,7 @@ public class SwitchUtil {
     }
 
     public static boolean showShebeiguanli() {
-        return  BaseConfig.isDebug();
+        return false;
     }
 
     public static boolean newFeePlease() {

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/activity/PurchaseDetailsActivity.java

@@ -138,7 +138,7 @@ public class PurchaseDetailsActivity extends BaseNetActivity implements OnSmartH
         replyNumber = 0;
         List<Map<String, Object>> mapList = new ArrayList<>();
         for (int i = 1; i < purchases.size(); i++) {
-            Purchase purchase=purchases.get(i);
+            Purchase purchase = purchases.get(i);
             if (!TextUtils.isEmpty(purchase.getDate()) && purchase.isCanInput()) {
                 Map<String, Object> map = new HashMap<>();
                 map.put("qty", StringUtil.getFirstInt(purchase.getNumber(), 0));
@@ -198,6 +198,7 @@ public class PurchaseDetailsActivity extends BaseNetActivity implements OnSmartH
                 if (replyNumber == 0) {
                     Toast.makeText(MyApplication.getInstance(), "回复成功", Toast.LENGTH_SHORT).show();
                     if (this != null) {
+                        setResult(0x12);
                         this.finish();
                     }
                 }
@@ -208,6 +209,12 @@ public class PurchaseDetailsActivity extends BaseNetActivity implements OnSmartH
     @Override
     public void onFailure(int what, String message, Tags tag) throws Exception {
         ToastUtil.showToast(ct, message);
+        if (0x12 == what && StringUtil.isEmpty(message) && this != null) {
+            setResult(0x12);
+            this.finish();
+        }
+
+
     }