提交类型 添加需求

提交内容   审批界面对于@B已经以外数据的处理

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

@@ -44,7 +44,7 @@ import com.core.app.AppConstant;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.SupportToolBarActivity;
-import com.core.base.view.AndroidBug5497Workaround;
+import com.core.base.view.AndroidBug5497Workaround2;
 import com.core.broadcast.MsgBroadcast;
 import com.core.dao.DBManager;
 import com.core.model.EmployeesEntity;
@@ -138,7 +138,7 @@ public class ChatActivity extends SupportToolBarActivity
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.chat);
-        AndroidBug5497Workaround.assistActivity(this);
+        AndroidBug5497Workaround2.assistActivity(this);
         mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
         mLoginNickName = MyApplication.getInstance().mLoginUser.getNickName();
         if (savedInstanceState != null) {

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

@@ -34,7 +34,7 @@ import com.common.ui.CameraUtil;
 import com.core.app.AppConstant;
 import com.core.app.MyApplication;
 import com.core.base.SupportToolBarActivity;
-import com.core.base.view.AndroidBug5497Workaround;
+import com.core.base.view.AndroidBug5497Workaround2;
 import com.core.broadcast.MsgBroadcast;
 import com.core.model.Friend;
 import com.core.model.User;
@@ -120,7 +120,7 @@ public class MucChatActivity extends SupportToolBarActivity
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.chat);
-        AndroidBug5497Workaround.assistActivity(this);
+        AndroidBug5497Workaround2.assistActivity(this);
         Bundle bundle = null;
         if (savedInstanceState != null) {
             bundle = savedInstanceState;

WeiChat/version.properties

@@ -1,4 +1,4 @@
-#Tue Aug 14 10:27:12 CST 2018
+#Tue Aug 14 15:39:50 CST 2018
 debugName=573
 versionName=641
 debugCode=573

app_core/common/src/main/java/com/core/base/view/AndroidBug5497Workaround2.java

@@ -7,6 +7,9 @@ import android.view.View;
 import android.view.ViewTreeObserver;
 import android.widget.FrameLayout;
 
+/**
+ * 改良版的适配处理工具类，需要在setContentView后面，需要界面存在ListView等可滑动的控件
+ */
 public class AndroidBug5497Workaround2 {
    public static void assistActivity(Activity activity) {
    new AndroidBug5497Workaround2(activity);   

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

@@ -896,13 +896,13 @@ public class ApprovaPresenter implements OnHttpResultListener {
                 Approval enclosure = new Approval(Approval.ENCLOSURE);
                 String path = TextUtils.isEmpty(newValues) ? values : newValues;
                 enclosure.setIdKey(getImageUrl(path));
-                LogUtil.i("gong","path="+path+"||\ngetIdKey="+enclosure.getIdKey());
+                LogUtil.i("gong", "path=" + path + "||\ngetIdKey=" + enclosure.getIdKey());
                 String[] splits = path.split("\\.");
                 String suffix = "jpg";
                 if (splits != null && splits.length > 1) {
                     suffix = splits[splits.length - 1];
                 }
-                enclosure.setCaption(caption+"."+suffix);
+                enclosure.setCaption(caption + "." + suffix);
                 List<Approval> enclosureList = new ArrayList<>();
                 enclosureList.add(enclosure);
                 addEnclosure(enclosureList);
@@ -1288,7 +1288,7 @@ public class ApprovaPresenter implements OnHttpResultListener {
     }
 
     private void mergeNode(JSONArray array, List<Approval> approvals, boolean isLog) {
-        String myCode=CommonUtil.getEmcode();
+        String myCode = CommonUtil.getEmcode();
         for (int i = 0; i < array.size(); i++) {
             JSONObject o = array.getJSONObject(i);
             String name = JSONUtil.getText(o, "jp_nodeName", "jn_name");//节点名称
@@ -1314,14 +1314,14 @@ public class ApprovaPresenter implements OnHttpResultListener {
                     if (!isLog) {
                         a.setDfType(nodeDealCode);
                         a.setCaption(nodeDealName);
-                        if (status.equals("待审批")){
-                            LogUtil.i("gong","status="+status);
-                            if (myCode.equals(nodeDealCode)){
+                        if (status.equals("待审批")) {
+                            LogUtil.i("gong", "status=" + status);
+                            if (myCode.equals(nodeDealCode)) {
                                 a.setIdKey(status);
-                            }else{
+                            } else {
                                 a.setIdKey("");
                             }
-                        }else{
+                        } else {
                             a.setIdKey(status);
                         }
                     } else {
@@ -1474,6 +1474,11 @@ public class ApprovaPresenter implements OnHttpResultListener {
                         approval.setMustInput(neer.startsWith("Y"));
                         if (neer.contains("@A")) {
                             approval.setDfType("@A");
+                        } else if (neer.contains("@")) {
+                            String[] rets = neer.split("@");
+                            if (rets != null && rets.length > 1) {
+                                approval.setDfType("@" + rets[1]);
+                            }
                         }
                     }
                 }
@@ -1512,7 +1517,7 @@ public class ApprovaPresenter implements OnHttpResultListener {
     }
 
     private String getImageUrl(String path) {
-        return CommonUtil.getAppBaseUrl(MyApplication.getInstance()) + "common/download.action?path=" + path+ "&sessionId=" +
+        return CommonUtil.getAppBaseUrl(MyApplication.getInstance()) + "common/download.action?path=" + path + "&sessionId=" +
                 CommonUtil.getSharedPreferences(MyApplication.getInstance(), "sessionId") +
                 "&sessionUser=" + CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_username") +
                 "&master=" + CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_master");
@@ -1552,6 +1557,8 @@ public class ApprovaPresenter implements OnHttpResultListener {
                         }
                         if (approval.isDftypeEQ("@A")) {
                             customDes.append(approval.getCaption() + "(" + approval.getValues() + ")" + "@A@;");
+                        } else if (!StringUtil.isEmpty(approval.getDfType()) && approval.getDfType().contains("@")) {
+                            customDes.append(approval.getCaption() + "(" + approval.getValues() + ")" + approval.getDfType() + "@;");
                         } else {
                             customDes.append(approval.getCaption() + "(" + approval.getValues() + ");");
                         }