提交类型 需求修改

提交内容   修改通用表单处理

WeiChat/build.gradle

@@ -180,7 +180,7 @@ dependencies {
     compile project(':appbooking')
     compile project(':appmusic')
     compile project(':apputils')
-    compile project(':faceplatform-ui')
+//    compile project(':faceplatform-ui')
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
     compile 'com.android.support:support-v4:26.+'
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -43,7 +43,6 @@ import com.baidu.android.pushservice.PushConstants;
 import com.baidu.android.pushservice.PushManager;
 import com.baidu.autoupdatesdk.BDAutoUpdateSDK;
 import com.baidu.autoupdatesdk.UICheckUpdateCallback;
-import com.baidu.idl.face.platform.ui.config.FaceConfig;
 import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.ListUtils;
@@ -634,7 +633,7 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
         LogUtil.d("OnCreate end:" + DateFormatUtil.long2Str(DateFormatUtil.YMD_HMS));
 
         //初始化面部识别
-        FaceConfig.initFace(ct);
+//        FaceConfig.initFace(ct);
 
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java

@@ -19,8 +19,6 @@ import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 
-import com.baidu.idl.face.platform.ui.FaceVeriftyActivity;
-import com.common.config.BaseConfig;
 import com.common.data.DateFormatUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
@@ -112,11 +110,7 @@ public class MessageFragment extends SupportToolBarFragment implements IMessageV
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.quick_sign) {
-            if (BaseConfig.isDebug()){
-                startActivityForResult(new Intent(ct,FaceVeriftyActivity.class),0x223);
-            }else{
-                setSignViewData(false);
-            }
+            setSignViewData(false);
         }
         return super.onOptionsItemSelected(item);
     }
@@ -336,7 +330,8 @@ public class MessageFragment extends SupportToolBarFragment implements IMessageV
                 break;
 
             case R.id.itemSignImage:
-                startActivityForResult(new Intent(ct, FaceVeriftyActivity.class), 0x223);
+                sign(true);
+//                startActivityForResult(new Intent(ct, FaceVeriftyActivity.class), 0x223);
                 break;
         }
 

app_modular/appmessages/src/main/java/com/modular/appmessages/presenter/ApprovaPresenter.java

@@ -1557,11 +1557,11 @@ public class ApprovaPresenter implements OnHttpResultListener {
             formStore.putAll(formstore);
 
             for (List<Approval> details : detailList) {
-                Map<String, Object> param = putItem2Params(false, details);
+                Map<String, Object> param = putItem2Params(true, details);
                 if (param == null || param.isEmpty() || param.keySet().size() <= 1) {
-//                    iApproval.showToast("明细行邮必填字段未填写");
-//                    return false;
-                    continue;
+//                    iApproval.showToast("明细行有必填字段未填写");
+                    //将明细表必填项添加出来
+                    return false;
                 }
                 params.add(param);
             }