Merge branch 'feature_raomeng' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer

# Conflicts:
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/util/im/UserRoleUtils.java
#	app_core/common/src/main/java/com/core/net/http/ViewUtil.java

WeiChat/build.gradle

@@ -72,10 +72,10 @@ android {
         applicationId project.applicationId
         minSdkVersion rootProject.ext.android.minSdkVersion
         targetSdkVersion rootProject.ext.android.targetSdkVersion
-//        versionCode rootProject.ext.android.versionCode
-//        versionName rootProject.ext.android.versionName
-        versionCode versionArray[1]
-        versionName versionNames
+        versionCode rootProject.ext.android.versionCode
+        versionName rootProject.ext.android.versionName
+//        versionCode versionArray[1]
+//        versionName versionNames
         multiDexEnabled true
         signingConfig signingConfigs.config
         manifestPlaceholders = [UMENG_CHANNEL_VALUE: "umeng"]
@@ -119,29 +119,29 @@ android {
         flavor -> flavor.manifestPlaceholders = [UMENG_CHANNEL_VALUE: name]
     }
 
-    applicationVariants.all { variant ->
-        variant.outputs.each { output ->
-            def outputFile = output.outputFile
-            def fileName
-            if (outputFile != null && outputFile.name.endsWith('.apk')) {
-                if (variant.buildType.name.equals('release')) {
-                    //赋值app属性版本名
-                    //variant.mergedFlavor.versionName = getVersionName() + "_" + variant.productFlavors[0].name+"(Build"+currentVersionCode+")"
-                    //variant.mergedFlavor.versionName ="v"+versionArray[0].toString().substring(0,1)+"."+ versionArray[0].toString().substring(1,2)+"."+  versionArray[0].toString().substring(2,3)
-                    def releaseInfo= "v"+versionArray[0].toString().substring(0,1)+"."+ versionArray[0].toString().substring(1,2)+"."+  versionArray[0].toString().substring(2,3)+ "_" + variant.productFlavors[0].name+"(Build"+versionArray[1]+")"
-                    fileName = "WeiChat_${releaseInfo}_release.apk"
-                    
-                } else if (variant.buildType.name.equals('debug')) {
-                    //赋值app属性版本名
-                    //variant.mergedFlavor.versionName = getVersionName() + "_" + releaseTime() + "_" + variant.productFlavors[0].name+"(Build"+currentVersionCode+")"
-                    def debugInfo= getVersionName() + "_" + releaseTime() + "_" + variant.productFlavors[0].name+"(Build"+versionArray[3]+")"
-                    fileName = "WeiChat_${debugInfo}_debug.apk"
-                    
-                }
-                output.outputFile = new File(outputFile.parent, fileName)
-            }
-        }
-    }
+//    applicationVariants.all { variant ->
+//        variant.outputs.each { output ->
+//            def outputFile = output.outputFile
+//            def fileName
+//            if (outputFile != null && outputFile.name.endsWith('.apk')) {
+//                if (variant.buildType.name.equals('release')) {
+//                    //赋值app属性版本名
+//                    //variant.mergedFlavor.versionName = getVersionName() + "_" + variant.productFlavors[0].name+"(Build"+currentVersionCode+")"
+//                    //variant.mergedFlavor.versionName ="v"+versionArray[0].toString().substring(0,1)+"."+ versionArray[0].toString().substring(1,2)+"."+  versionArray[0].toString().substring(2,3)
+//                    def releaseInfo= "v"+versionArray[0].toString().substring(0,1)+"."+ versionArray[0].toString().substring(1,2)+"."+  versionArray[0].toString().substring(2,3)+ "_" + variant.productFlavors[0].name+"(Build"+versionArray[1]+")"
+//                    fileName = "WeiChat_${releaseInfo}_release.apk"
+//                    
+//                } else if (variant.buildType.name.equals('debug')) {
+//                    //赋值app属性版本名
+//                    //variant.mergedFlavor.versionName = getVersionName() + "_" + releaseTime() + "_" + variant.productFlavors[0].name+"(Build"+currentVersionCode+")"
+//                    def debugInfo= getVersionName() + "_" + releaseTime() + "_" + variant.productFlavors[0].name+"(Build"+versionArray[3]+")"
+//                    fileName = "WeiChat_${debugInfo}_debug.apk"
+//                    
+//                }
+//                output.outputFile = new File(outputFile.parent, fileName)
+//            }
+//        }
+//    }
 }
 
 dependencies {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/WorkMenuParentAdapter.java

@@ -2,6 +2,7 @@ package com.xzjmyk.pm.activity.ui.erp.adapter;
 
 import android.content.Context;
 import android.content.Intent;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -9,6 +10,7 @@ import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
 
+import com.common.LogUtil;
 import com.common.data.StringUtil;
 import com.common.preferences.PreferenceUtils;
 import com.core.api.wxapi.ApiPlatform;
@@ -109,16 +111,21 @@ public class WorkMenuParentAdapter extends BaseAdapter {
                             mOnAddFuncClickListener.onAddFuncClick(view, position);
                         }
                     } else {
-                        Intent intent = getWorkIntent(menuActivity, menuIcon);
+                        LogUtil.d(TAG, "menuActivity:" + menuActivity);
+//                        Intent intent = getWorkIntent(menuActivity, menuIcon);
+                        Intent intent = new Intent("com.modular.work.CommonDataFormActivity");
                         context.startActivity(intent);
                     }
                 } catch (Exception e) {
+                    Log.e("workException", e.getMessage());
                     ToastUtil.showToast(context, "页面访问异常");
                 }
             }
         });
     }
 
+    private static final String TAG = "WorkMenuParentAdapter";
+
     private Intent getWorkIntent(String menuActivity, String menuIcon) {
         Intent intent = new Intent(menuActivity);
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/WorkPlatFragment.java

@@ -221,7 +221,7 @@ public class WorkPlatFragment extends BaseMVPFragment<WorkPlatPresenter> impleme
                                     moduleListBean.setMenuUrl("");
                                     moduleListBean.setMenuName(JSONUtil.getText(serviceObject, "sv_name"));
                                     // TODO: 2017/11/17 页面设置
-                                    moduleListBean.setMenuActivity("");
+                                    moduleListBean.setMenuActivity("com.modular.work.CommonDataFormActivity");
                                     moduleListBean.setIsLocalMenu(false);
                                     moduleListBean.setIsHide(false);
                                     moduleListBean.setCaller(JSONUtil.getText(serviceObject, "sv_id"));

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Sat Nov 18 15:27:13 CST 2017
+#Sat Nov 18 18:46:27 CST 2017
 debugName=1
-versionName=605
-debugCode=4
-versionCode=105
+versionName=618
+debugCode=17
+versionCode=118

app_core/common/src/main/java/com/core/net/http/ViewUtil.java

@@ -1034,7 +1034,8 @@ public class ViewUtil {
     public static void LoginERPTask(String url, String master, String username,
                                     String password) {
         mdProcessDialog.setContent(MyApplication.getInstance().getString(R.string.login_progress_erp));
-        url = url + "mobile/login.action";
+//        url = url + "mobile/login.action";
+        url ="http://192.168.253.29:8080/ERP/mobile/login.action";
         Map<String, String> params = new HashMap<String, String>();
         params.put("username", username);
         params.put("password", password);

app_modular/appworks/src/main/AndroidManifest.xml

@@ -237,5 +237,12 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
+        
+        <activity android:name=".activity.CommonDataFormActivity">
+            <intent-filter>
+                <action android:name="com.modular.work.CommonDataFormActivity" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
     </application>
 </manifest>

app_modular/appworks/src/main/java/com/uas/appworks/activity/CommonDataFormActivity.java

@@ -1,4 +1,4 @@
-package com.uas.appworks.OA.erp.activity.form;
+package com.uas.appworks.activity;
 
 import android.app.Activity;
 import android.content.Context;
@@ -43,15 +43,17 @@ import com.core.base.BaseActivity;
 import com.core.model.SelectBean;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
-import com.modular.apputils.utils.PopupWindowHelper;
 import com.core.utils.time.wheel.DateTimePicker;
 import com.core.widget.view.Activity.SelectActivity;
 import com.core.widget.view.ListViewInScroller;
 import com.core.widget.view.model.SelectAimModel;
 import com.core.widget.view.selectcalendar.SelectCalendarActivity;
+import com.core.widget.view.selectcalendar.bean.Data;
 import com.lidroid.xutils.ViewUtils;
+import com.modular.apputils.utils.PopupWindowHelper;
 import com.uas.appworks.OA.erp.activity.CommonDocDetailsActivity;
-import com.core.widget.view.selectcalendar.bean.Data;
+import com.uas.appworks.OA.erp.activity.form.DataFormFieldActivity;
+import com.uas.appworks.OA.erp.activity.form.FormListSelectActivity;
 import com.uas.appworks.OA.erp.model.form.GroupData;
 import com.uas.appworks.R;
 
@@ -75,7 +77,7 @@ import java.util.regex.Pattern;
  * @desc:动态表单界面
  * @author：Arison on 2016/11/8
  */
-public class DataFormDetailActivity extends BaseActivity implements View.OnClickListener {
+public class CommonDataFormActivity extends BaseActivity implements View.OnClickListener {
 
 
     private boolean isLeave = true;
@@ -477,7 +479,9 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                         if ("ExtraWork$".equals(caller)) {
                             va_id = JSON.parseObject(result).getIntValue("wod_id");
                         } else {
-                            va_id = JSON.parseObject(result).getIntValue(formidkey);
+                            //rp_id
+                          //  va_id = JSON.parseObject(result).getIntValue(formidkey);
+                            va_id = JSON.parseObject(result).getIntValue("rp_id");
                         }
                         if (success) {
                             judgeApprovers(va_id);
@@ -828,15 +832,17 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
         }
         String url = "";
         if (id == 0) {
-            url = CommonUtil.getAppBaseUrl(ct) + "mobile/common/getformandgriddetail.action";
+            url = CommonUtil.getAppBaseUrl(ct) + "api/serve/config.action";
         } else {
             url = CommonUtil.getAppBaseUrl(ct) + "mobile/getformandgriddetail.action";
         }
         Map<String, Object> params = new HashMap<>();
-        params.put("caller", caller);
-        params.put("condition", "1=1");
-        params.put("id", id);
-        params.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
+        params.put("serve_id", "75");
+        params.put("client_type", "cc");
+       // params.put("access_token", "123456");
+//        LinkedHashMap<String, Object> header = new LinkedHashMap<>();
+//        header.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+       // params.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, load_success, null, null, "get");
@@ -2165,16 +2171,17 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
         }
         progressDialog.show();
         click_btn.setEnabled(false);
+        //  api/serve/save.action?data=?&operate_id=?&access_token=? 
         String url = null;
-        if ("ExtraWork$".equals(caller)) {
-            url = CommonUtil.getAppBaseUrl(ct) + "/mobile/oa/ExtraWorkSaveAndSubmit.action";
-        } else {
-            url = CommonUtil.getAppBaseUrl(ct) + "/mobile/oa/commonSaveAndSubmit.action";
-        }
+//        if ("ExtraWork$".equals(caller)) {
+//            url = CommonUtil.getAppBaseUrl(ct) + "/mobile/oa/ExtraWorkSaveAndSubmit.action";
+//        } else {
+            url = CommonUtil.getAppBaseUrl(ct) + "/api/serve/save.action";
+//        }
         Map<String, Object> params = new HashMap<>();
-        params.put("caller", caller);
-        params.put("formStore", formStore);
-        params.put("gridStore", gridStore);
+//        params.put("caller", caller);
+        params.put("data", formStore);
+        params.put("operate_id", "67");
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, Constants.HTTP_SUCCESS_INIT, null, null, "post");
@@ -2427,9 +2434,9 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
 
     private void judgeApprovers(int id) {
         LogUtil.d("id:" + id + "  caller:" + caller);
-        String url = CommonUtil.getSharedPreferences(ct, "erp_baseurl") + "common/getMultiNodeAssigns.action";
+        String url = CommonUtil.getAppBaseUrl(mContext) + "common/getMultiNodeAssigns.action";
         Map<String, Object> param = new HashMap<>();
-        param.put("caller", caller);
+        param.put("caller", "RepairApply");
         param.put("id", id);
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));