提交分类： 代码备份；

提交内容：  工作台网络获取应用优化
当前版本：  正式版本6.2.4
是否冲突：  否

WeiChat/build.gradle

@@ -120,7 +120,7 @@ android {
         flavor -> flavor.manifestPlaceholders = [UMENG_CHANNEL_VALUE: name]
     }
 
-    /*applicationVariants.all { variant ->
+    applicationVariants.all { variant ->
         variant.outputs.each { output ->
             def outputFile = output.outputFile
             def fileName
@@ -142,7 +142,7 @@ android {
                 output.outputFile = new File(outputFile.parent, fileName)
             }
         }
-    }*/
+    }
 }
 
 dependencies {

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

@@ -14,7 +14,6 @@ import android.widget.TextView;
 
 import com.common.LogUtil;
 import com.common.data.StringUtil;
-import com.common.data.TextUtil;
 import com.common.preferences.PreferenceUtils;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUAS;
@@ -103,6 +102,7 @@ public class WorkMenuParentAdapter extends BaseAdapter {
             moduleListBean.setIsHide(false);
             moduleListBean.setIsLocalMenu(true);
             moduleListBean.setMenuActivity("com.modular.work.WorkFuncSetActivity");
+            moduleListBean.setMenuTag(object.getModuleTag());
             moduleListBean.setMenuIcon("add_picture");
             moduleListBean.setMenuName("str_work_add_func");
             moduleListBean.setMenuUrl("");
@@ -204,6 +204,19 @@ public class WorkMenuParentAdapter extends BaseAdapter {
                             intent.putExtra("caller", travelCaller);
                         }
                     }
+                } else {
+                    intent.putExtra("caller", caller);
+                    String title = null;
+                    if (moduleListBean.isLocalMenu()) {
+                        try {
+                            title = context.getString(mResources.getIdentifier(moduleListBean.getMenuName(), "string", context.getPackageName()));
+                        } catch (Exception e) {
+                            title = moduleListBean.getMenuName();
+                        }
+                    } else {
+                        title = moduleListBean.getMenuName();
+                    }
+                    intent.putExtra("title", title);
                 }
                 break;
 

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

@@ -2,6 +2,7 @@ package com.xzjmyk.pm.activity.ui.erp.fragment;
 
 import android.content.Intent;
 import android.content.res.Resources;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -13,6 +14,7 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.common.config.BaseConfig;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.core.api.wxapi.ApiPlatform;
@@ -112,10 +114,10 @@ public class WorkPlatFragment extends BaseMVPFragment<WorkPlatPresenter> impleme
     @Override
     protected void initDatas() {
         getLocalMenu();
-        if (isFirstLoad) {
-            loadOrdersCaller();
-        }
-//        obtainCityIndustryService();
+//        if (isFirstLoad) {
+        loadOrdersCaller();
+//        }
+        obtainCityIndustryService();
     }
 
     private void getLocalMenu() {
@@ -153,14 +155,15 @@ public class WorkPlatFragment extends BaseMVPFragment<WorkPlatPresenter> impleme
     private void obtainCityIndustryService() {
         Map<String, Object> params = new HashMap<>();
         params.put("kind", "app");
-        params.put("Cookie", "JSESSIONID=" + com.core.utils.CommonUtil.getSharedPreferences(mContext, "sessionId"));
+        params.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(mContext, "sessionId"));
 
         LinkedHashMap<String, Object> header = new LinkedHashMap<>();
-        header.put("Cookie", "JSESSIONID=" + com.core.utils.CommonUtil.getSharedPreferences(mContext, "sessionId"));
+        header.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(mContext, "sessionId"));
 
         HttpParams request = new HttpParams.Builder()
                 .flag(OBTAIN_APP_CITY_INDUSTRY_SERVICE)
-                .url("api/serve/mainPage/getServices.action")
+//                .url("api/serve/mainPage/getServices.action")
+                .url("mobile/common/getServices.action")
                 .setHeaders(header)
                 .setParams(params)
                 .method(Method.GET)
@@ -196,7 +199,8 @@ public class WorkPlatFragment extends BaseMVPFragment<WorkPlatPresenter> impleme
         String url = "mobile/oa/getoaconifg.action";
         HttpParams request = new HttpParams.Builder()
                 .url(url)
-                .setParams(new HashMap<String, Object>())
+                .addParam("master", CommonUtil.getMaster())
+                .addHeader("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(BaseConfig.getContext(), "sessionId"))
                 .flag(LOAD_ORDERS_CALLER)
                 .method(Method.GET)
                 .build();
@@ -215,6 +219,8 @@ public class WorkPlatFragment extends BaseMVPFragment<WorkPlatPresenter> impleme
 
     @Override
     public void requestSuccess(int what, Object object) {
+        if (object != null)
+            Log.d("worksuccess", object.toString());
         if (what == Constants.LOAD_WORK_MENU_CACHE) {
             mCacheMenuTypeBeans = (List<WorkMenuBean>) object;
             mWorkMenuBeans.clear();
@@ -248,7 +254,8 @@ public class WorkPlatFragment extends BaseMVPFragment<WorkPlatPresenter> impleme
                     workMenuBean.setModuleVisible(true);
                     workMenuBean.setIsLocalModule(false);
                     workMenuBean.setModuleName(JSONUtil.getText(configObject, "st_name"));
-                    workMenuBean.setModuleTag(JSONUtil.getText(configObject, "st_id"));
+                    // TODO: 2018/3/16 待修改
+                    workMenuBean.setModuleTag(JSONUtil.getText(configObject, "st_tag"));
                     workMenuBean.setModuleId(JSONUtil.getText(configObject, "st_id"));
 
                     JSONArray serviceArray = configObject.getJSONArray("serves");
@@ -260,10 +267,12 @@ public class WorkPlatFragment extends BaseMVPFragment<WorkPlatPresenter> impleme
                                 WorkMenuBean.ModuleListBean moduleListBean = new WorkMenuBean.ModuleListBean();
                                 moduleListBean.setMenuUrl("");
                                 moduleListBean.setMenuName(JSONUtil.getText(serviceObject, "sv_name"));
-                                moduleListBean.setMenuActivity("com.modular.work.CommonDataFormActivity");
+                                moduleListBean.setMenuActivity("com.modular.form.DataFormDetailActivity");
+                                // TODO: 2018/3/16 待修改
+                                moduleListBean.setMenuTag(JSONUtil.getText(serviceObject, "sv_tag"));
                                 moduleListBean.setIsLocalMenu(false);
                                 moduleListBean.setIsHide(false);
-                                moduleListBean.setCaller(JSONUtil.getText(serviceObject, "sv_id"));
+                                moduleListBean.setCaller(JSONUtil.getText(serviceObject, "sv_caller"));
 
                                 JSONObject logourlObject = serviceObject.getJSONObject("sv_logourl");
                                 if (logourlObject != null) {
@@ -279,45 +288,30 @@ public class WorkPlatFragment extends BaseMVPFragment<WorkPlatPresenter> impleme
                 }
             }
 
+            //循环遍历网络数据，更新本地的网络应用，添加新增的网络应用
             for (WorkMenuBean netWorkMenuBean : netWorkMenuBeans) {
                 boolean isExist = false;
-                String netModuleName = netWorkMenuBean.getModuleName();
+                String netModuleTag = netWorkMenuBean.getModuleTag();
                 List<WorkMenuBean.ModuleListBean> netModuleList = netWorkMenuBean.getModuleList();
                 for (WorkMenuBean cacheWorkMenuBean : mCacheMenuTypeBeans) {
-                    String cacheModuleName = null;
-                    if (cacheWorkMenuBean.isLocalModule()) {
-                        try {
-                            cacheModuleName = getString(mResources.getIdentifier(cacheWorkMenuBean.getModuleName(), "string", mContext.getPackageName()));
-                        } catch (Exception e) {
-                            cacheModuleName = cacheWorkMenuBean.getModuleName();
-                        }
-                    } else {
-                        cacheModuleName = cacheWorkMenuBean.getModuleName();
-                    }
+                    String cacheModuleTag = cacheWorkMenuBean.getModuleTag();
                     List<WorkMenuBean.ModuleListBean> cacheModuleList = cacheWorkMenuBean.getModuleList();
-                    if (cacheModuleName.equals(netModuleName)) {
+                    //如果缓存数据中存在网络返回的模块，则根据网络数据更新缓存
+                    if (cacheModuleTag.equals(netModuleTag)) {
                         isExist = true;
                         cacheWorkMenuBean.setModuleId(netWorkMenuBean.getModuleId());
                         cacheWorkMenuBean.setModuleTag(netWorkMenuBean.getModuleTag());
                         for (WorkMenuBean.ModuleListBean netModuleListBean : netModuleList) {
                             boolean isFuncExist = false;
-                            String netMenuName = netModuleListBean.getMenuName();
+                            String netMenuTag = netModuleListBean.getMenuTag();
                             for (WorkMenuBean.ModuleListBean cacheModuleListBean : cacheModuleList) {
-                                String cacheMenuName = null;
-                                if (cacheModuleListBean.isLocalMenu()) {
-                                    try {
-                                        cacheMenuName = getString(mResources.getIdentifier(cacheModuleListBean.getMenuName(), "string", mContext.getPackageName()));
-                                    } catch (Exception e) {
-                                        cacheMenuName = cacheModuleListBean.getMenuName();
-                                    }
-                                } else {
-                                    cacheMenuName = cacheModuleListBean.getMenuName();
-                                }
-                                if (cacheMenuName.equals(netMenuName)) {
+                                String cacheMenuTag = cacheModuleListBean.getMenuTag();
+                                if (cacheMenuTag.equals(netMenuTag)) {
                                     isFuncExist = true;
                                     if (!cacheModuleListBean.isLocalMenu()) {
                                         cacheModuleListBean.setCaller(netModuleListBean.getCaller());
                                         cacheModuleListBean.setMenuActivity(netModuleListBean.getMenuActivity());
+                                        cacheModuleListBean.setMenuTag(netModuleListBean.getMenuTag());
                                         cacheModuleListBean.setMenuIcon(netModuleListBean.getMenuIcon());
                                         cacheModuleListBean.setMenuName(netModuleListBean.getMenuName());
                                         cacheModuleListBean.setMenuUrl(netModuleListBean.getMenuUrl());
@@ -325,28 +319,21 @@ public class WorkPlatFragment extends BaseMVPFragment<WorkPlatPresenter> impleme
                                     break;
                                 }
                             }
+                            //如果缓存中不存在，说明是新增的网络引用，则直接添加到缓存中
                             if (!isFuncExist) {
                                 cacheModuleList.add(netModuleListBean);
                             }
                         }
 
+                        //循环缓存数据和网络数据，将缓存中多余的网络应用去掉
                         for (int i = cacheModuleList.size() - 1; i >= 0; i--) {
                             WorkMenuBean.ModuleListBean cacheModuleListBean = cacheModuleList.get(i);
                             if (!cacheModuleListBean.isLocalMenu()) {
                                 boolean isCacheExist = false;
-                                String cacheMenuName = null;
-                                if (cacheModuleListBean.isLocalMenu()) {
-                                    try {
-                                        cacheMenuName = getString(mResources.getIdentifier(cacheModuleListBean.getMenuName(), "string", mContext.getPackageName()));
-                                    } catch (Exception e) {
-                                        cacheMenuName = cacheModuleListBean.getMenuName();
-                                    }
-                                } else {
-                                    cacheMenuName = cacheModuleListBean.getMenuName();
-                                }
+                                String cacheMenuTag = cacheModuleListBean.getMenuTag();
                                 for (WorkMenuBean.ModuleListBean netModuleListBean : netModuleList) {
-                                    String netMenuName = netModuleListBean.getMenuName();
-                                    if (cacheMenuName.equals(netMenuName)) {
+                                    String netMenuTag = netModuleListBean.getMenuTag();
+                                    if (cacheMenuTag.equals(netMenuTag)) {
                                         isCacheExist = true;
                                         break;
                                     }
@@ -360,37 +347,21 @@ public class WorkPlatFragment extends BaseMVPFragment<WorkPlatPresenter> impleme
                         break;
                     }
                 }
+                //如果缓存数据中不存在，说明是网络数据新增的模块，则直接添加进缓存中
                 if (!isExist) {
                     mCacheMenuTypeBeans.add(netWorkMenuBean);
                 }
             }
 
+            //循环遍历缓存数据和网络数据，如果缓存数据中存在网络数据中不存在的模块，则需要去除
             for (int i = mCacheMenuTypeBeans.size() - 1; i >= 0; i--) {
                 WorkMenuBean cacheWorkMenuBean = mCacheMenuTypeBeans.get(i);
                 if (!cacheWorkMenuBean.isLocalModule()) {
                     boolean isCacheExist = false;
-                    String cacheModuleName = null;
-                    if (cacheWorkMenuBean.isLocalModule()) {
-                        try {
-                            cacheModuleName = getString(mResources.getIdentifier(cacheWorkMenuBean.getModuleName(), "string", mContext.getPackageName()));
-                        } catch (Exception e) {
-                            cacheModuleName = cacheWorkMenuBean.getModuleName();
-                        }
-                    } else {
-                        cacheModuleName = cacheWorkMenuBean.getModuleName();
-                    }
+                    String cacheModuleTag = cacheWorkMenuBean.getModuleTag();
                     for (WorkMenuBean netWorkMenuBean : netWorkMenuBeans) {
-                        String netModuleName = null;
-                        if (netWorkMenuBean.isLocalModule()) {
-                            try {
-                                netModuleName = getString(mResources.getIdentifier(netWorkMenuBean.getModuleName(), "string", mContext.getPackageName()));
-                            } catch (Exception e) {
-                                netModuleName = netWorkMenuBean.getModuleName();
-                            }
-                        } else {
-                            netModuleName = netWorkMenuBean.getModuleName();
-                        }
-                        if (cacheModuleName.equals(netModuleName)) {
+                        String netModuleTag = netWorkMenuBean.getModuleTag();
+                        if (cacheModuleTag.equals(netModuleTag)) {
                             isCacheExist = true;
                             break;
                         }
@@ -436,8 +407,8 @@ public class WorkPlatFragment extends BaseMVPFragment<WorkPlatPresenter> impleme
 
     @Override
     public void requestError(int what, String errorMsg) {
-        if (errorMsg != null && errorMsg.length() <= 40) {
-            toast(errorMsg);
-        }
+//        if (errorMsg != null && errorMsg.length() <= 40) {
+//            toast(errorMsg);
+//        }
     }
 }

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu Mar 15 16:31:15 CST 2018
-debugName=286
-versionName=622
-debugCode=286
-versionCode=161
+#Tue Mar 20 21:36:12 CST 2018
+debugName=310
+versionName=624
+debugCode=310
+versionCode=163

app_core/common/src/main/java/com/core/utils/CommonUtil.java

@@ -108,7 +108,7 @@ public class CommonUtil {
 //        if (BaseConfig.isDebug()){
 //            baseUrl="http://192.168.253.203:8090/ERP/";
 //        }
-//        baseUrl="http://192.168.253.203:8090/ERP/
+//        baseUrl = "http://192.168.253.29:8080/ERP/";
 
         return baseUrl;
     }
@@ -125,6 +125,7 @@ public class CommonUtil {
         }
 //        return "https://admin-city.ubtob.com/";
         return "https://city-service.ubtob.com/city/thxz/";
+//        return "http://192.168.253.29:8080/ERP/";
     }
 
     /**

app_modular/appworks/src/main/AndroidManifest.xml

@@ -317,6 +317,13 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
+        <activity android:name=".activity.WorkDataFormActivity">
+            <intent-filter>
+                <action android:name="com.modular.work.WorkDataFormActivity" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
         <activity
             android:name=".activity.CommonFormListActivity"
             android:hardwareAccelerated="false"

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/CommonDocDetailsActivity.java

@@ -28,17 +28,17 @@ import com.common.LogUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
-import com.common.data.TextUtil;
 import com.common.system.ActivityUtils;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
+import com.core.app.AppConstant;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.dao.DBManager;
+import com.core.model.Approval;
 import com.core.model.EmployeesEntity;
 import com.core.net.http.ViewUtil;
-import com.core.model.Approval;
 import com.core.utils.CommonUtil;
 import com.core.utils.ToastUtil;
 import com.core.utils.helper.AvatarHelper;
@@ -47,10 +47,8 @@ import com.core.widget.EmptyLayout;
 import com.core.widget.MyListView;
 import com.core.widget.SquareCenterImageView;
 import com.core.widget.view.MyGridView;
-import com.core.app.AppConstant;
-import com.uas.appworks.CRM.erp.activity.DeviceDataFormAddActivity;
-import com.uas.appworks.R;
 import com.nostra13.universalimageloader.core.ImageLoader;
+import com.uas.appworks.CRM.erp.activity.DeviceDataFormAddActivity;
 import com.uas.appworks.OA.erp.activity.form.DataFormDetailActivity;
 import com.uas.appworks.OA.erp.activity.form.FormListSelectActivity;
 import com.uas.appworks.OA.erp.adapter.ComDocGriddataOutAdapter;
@@ -59,6 +57,7 @@ import com.uas.appworks.OA.erp.model.CommonApprovalFlowBean;
 import com.uas.appworks.OA.erp.model.CommonDocAMBean;
 import com.uas.appworks.OA.erp.utils.approvautils.ApprovaNodeUtil;
 import com.uas.appworks.OA.erp.utils.approvautils.NodeAdapter;
+import com.uas.appworks.R;
 import com.uas.appworks.activity.DeviceQueryActivity;
 
 import java.util.ArrayList;
@@ -127,7 +126,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
     private String type_emcode;
     private String real_status;
     private String emCode;
-
+    private String mTitle;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -245,30 +244,31 @@ public class CommonDocDetailsActivity extends BaseActivity {
         //当获取到正确的单据caller和单据id时
         if (!TextUtils.isEmpty(mCaller) && mkeyValue != -1) {
             if ("Ask4Leave".equals(mCaller)) {
-                getSupportActionBar().setTitle(getString(R.string.oavacation_apply) + getString(R.string.doc_detail));
+                mTitle = getString(R.string.oavacation_apply);
             }
             if ("FeePlease!CCSQ!new".equals(mCaller)) {
-                getSupportActionBar().setTitle(getString(R.string.oatravel_apply) + getString(R.string.doc_detail));
+                mTitle = getString(R.string.oatravel_apply);
             }
             if ("Workovertime".equals(mCaller) || "ExtraWork$".equals(mCaller)) {
-                getSupportActionBar().setTitle(getString(R.string.oaovertime_apply) + getString(R.string.doc_detail));
+                mTitle = getString(R.string.oaovertime_apply);
             }
             if ("SpeAttendance".equals(mCaller)) {
-                getSupportActionBar().setTitle(getString(R.string.oaspecial_attendance_apply) + getString(R.string.doc_detail));
+                mTitle = getString(R.string.oaspecial_attendance_apply);
             }
             if ("MaterielApply".equals(mCaller)) {
-                getSupportActionBar().setTitle(getString(R.string.oamaterials_apply) + getString(R.string.doc_detail));
+                mTitle = getString(R.string.oamaterials_apply);
             } else if ("MainTain".equals(mCaller)) {
-                getSupportActionBar().setTitle(getString(R.string.oaservice_apply) + getString(R.string.doc_detail));
+                mTitle = getString(R.string.oaservice_apply);
             }
             if ("StandbyApplication".equals(mCaller)) {
-                getSupportActionBar().setTitle(getString(R.string.oaStandby_machine_apply) + getString(R.string.doc_detail));
+                mTitle = getString(R.string.oaStandby_machine_apply);
             } else if (!StringUtil.isEmpty(intent.getStringExtra("title"))) {
-                getSupportActionBar().setTitle(intent.getStringExtra("title") + getString(R.string.doc_detail));
+                mTitle = intent.getStringExtra("title");
             }
             if ("FeePlease!FYBX".equals(mCaller)) {
-                getSupportActionBar().setTitle(getString(R.string.Expense_reimbursement) + getString(R.string.doc_detail));
+                mTitle = getString(R.string.Expense_reimbursement);
             }
+            getSupportActionBar().setTitle(mTitle + getString(R.string.doc_detail));
             //请求获取单据提交内容数据
             progressDialog.show();
             String docmsg_url = CommonUtil.getAppBaseUrl(getApplicationContext()) + "mobile/common/getformandgriddata.action";
@@ -313,7 +313,8 @@ public class CommonDocDetailsActivity extends BaseActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.add_item) {
             startActivity(new Intent(activity, DataFormDetailActivity.class)
-                    .putExtra("caller", mCaller));
+                    .putExtra("caller", mCaller).putExtra("title", mTitle)
+            );
             finish();
         }
         if (item.getItemId() == android.R.id.home) {
@@ -327,7 +328,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
                     onBackPressed();
                 } else {
                     LogUtil.d("非正常返回...");
-                    startActivity(new Intent(mContext, FormListSelectActivity.class).putExtra("caller", mCaller));
+                    startActivity(new Intent(mContext, FormListSelectActivity.class).putExtra("caller", mCaller).putExtra("title", mTitle));
                     finish();
                 }
             }
@@ -392,6 +393,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
                             startActivity(new Intent(CommonDocDetailsActivity.this, device ? DeviceDataFormAddActivity.class : DataFormDetailActivity.class)
                                     .putExtra("caller", mCaller)
                                     .putExtra("id", mkeyValue)
+                                    .putExtra("title", mTitle)
                                     .putExtra("submittype", "resubmit")
                                     .putExtra("status", "已提交"));
 
@@ -418,6 +420,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
                             startActivity(new Intent(CommonDocDetailsActivity.this, DataFormDetailActivity.class)
                                     .putExtra("caller", mCaller)
                                     .putExtra("id", mkeyValue)
+                                    .putExtra("title", mTitle)
                                     .putExtra("submittype", "resubmit")
                                     .putExtra("status", "已提交"));
 
@@ -937,7 +940,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
             } catch (Exception e) {
                 e.printStackTrace();
             }
-        }else{
+        } else {
             String em_name = CommonUtil.getName();
             name_tv.setText(em_name);
             String loginUserId = MyApplication.getInstance().mLoginUser.getUserId();
@@ -963,6 +966,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
                         startActivity(new Intent(CommonDocDetailsActivity.this, device ? DeviceDataFormAddActivity.class : DataFormDetailActivity.class)
                                 .putExtra("caller", mCaller)
                                 .putExtra("id", mkeyValue)
+                                .putExtra("title", mTitle)
                                 .putExtra("submittype", "dosubmit"));
                         setResult(0x21);
                         finish();
@@ -1090,7 +1094,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
                     Log.i("aptodo", "imId=" + imId + "imName" + imName + "imDepartment" + imDepartment + "imPosition" + imPosition);
                 } else {
                     name_tv.setText(CommonUtil.getName());
-                    String imId=MyApplication.getInstance().getLoginUserId();
+                    String imId = MyApplication.getInstance().getLoginUserId();
                     if (!StringUtil.isEmpty(imId)) {
                         AvatarHelper.getInstance().display(imId, photo_im, true, false);
                     }
@@ -1125,7 +1129,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
                     LogUtil.d("正常返回...");
                     if ("1".equals(update)) {
                         startActivity(new Intent(mContext, FormListSelectActivity.class).putExtra("caller", mCaller)
-                                .putExtra("update", update));
+                                .putExtra("update", update).putExtra("title", mTitle));
                         finish();
                     } else {
                         onBackPressed();
@@ -1139,7 +1143,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
                     }
                     startActivity(
                             new Intent(mContext, FormListSelectActivity.class)
-                                    .putExtra("caller", mCaller));
+                                    .putExtra("caller", mCaller).putExtra("title", mTitle));
                     finish();
                 }
             }

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/form/DataFormDetailActivity.java

@@ -52,7 +52,6 @@ import com.core.widget.view.selectcalendar.bean.Data;
 import com.lidroid.xutils.ViewUtils;
 import com.modular.apputils.activity.SelectNetAcitivty;
 import com.modular.apputils.utils.PopupWindowHelper;
-import com.modular.apputils.utils.SwitchUtil;
 import com.uas.appworks.OA.erp.activity.CommonDocDetailsActivity;
 import com.uas.appworks.OA.erp.model.form.GroupData;
 import com.uas.appworks.R;
@@ -90,6 +89,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
     private LinearLayout ll_top;
 
     private String caller = "";
+    private String mTitle = "";
 
     private DataAdapter mAdapter;
 
@@ -598,12 +598,14 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                     startActivity(new Intent(mContext, CommonDocDetailsActivity.class)
                             .putExtra("caller", caller)
                             .putExtra("keyValue", va_id)
+                            .putExtra("title", mTitle)
                             .putExtra("status", "已提交"));
                 } else {
                     startActivity(new Intent(mContext, CommonDocDetailsActivity.class)
                             .putExtra("caller", caller)
                             .putExtra("keyValue", formid)
                             .putExtra("update", "1")
+                            .putExtra("title", mTitle)
                             .putExtra("status", "已提交"));
                 }
                 finish();
@@ -640,12 +642,12 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                     formidkey = "va_id";
                     startDate = "va_startime";
                     endDate = "va_endtime";
-                    getSupportActionBar().setTitle("请假单");
+                    mTitle = "请假单";
                 } else if ("SpeAttendance".equals(caller)) {
                     startDate = "sa_appdate";
                     endDate = "sa_enddate";
                     formidkey = "sa_id";
-                    getSupportActionBar().setTitle("特殊考勤");
+                    mTitle = "特殊考勤";
                 } else if ("Workovertime".equals(caller) || "ExtraWork$".equals(caller)) {
                     startDate = "wod_startdate";
                     endDate = "wod_enddate";
@@ -658,7 +660,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                     }
                     detailkey_id = "wod_id";//明细id
                     detailkey_did = "wod_woid";//主表id
-                    getSupportActionBar().setTitle("加班单");
+                    mTitle = "加班单";
                 } else if ("FeePlease!CCSQ".equals(caller) || "FeePlease!CCSQ!new".equals(caller)) {
                     startDate = "fp_prestartdate";
                     endDate = "fp_preenddate";
@@ -668,28 +670,32 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                     formidkey = "fp_id";
                     detailkey_id = "fpd_id";//明细id
                     detailkey_did = "fpd_fpid";
-                    getSupportActionBar().setTitle("出差单");
+                    mTitle = "出差单";
                 } else if ("StandbyApplication".equals(caller)) {
                     formidkey = "sa_id";
                     detailkey_id = "sad_id";//明细id
                     detailkey_did = "sad_said";//关联id 主表
-                    getSupportActionBar().setTitle("备用机申请单");
+                    mTitle = "备用机申请单";
                 } else if ("MaterielApply".equals(caller)) {
                     formidkey = "ama_id";
                     detailkey_id = "amad_id";//明细id
                     detailkey_did = "amad_amaid";//关联id 主表
-                    getSupportActionBar().setTitle("物料申请单");
+                    mTitle = "物料申请单";
                 } else if ("MainTain".equals(caller)) {
                     formidkey = "mt_id";
                     detailkey_id = "mtd_id";//明细id
                     detailkey_did = "mtd_mtid";//关联id 主表
-                    getSupportActionBar().setTitle("维修申请单");
+                    mTitle = "维修申请单";
+                } else {
+                    formidkey = "keyvalue";
                 }
 
             }
             if (!StringUtil.isEmpty(intent.getStringExtra("title"))) {
-                getSupportActionBar().setTitle(intent.getStringExtra("title"));
+                mTitle = intent.getStringExtra("title");
             }
+            getSupportActionBar().setTitle(mTitle);
+
             LogUtil.d("更新caller：" + caller);
             LogUtil.d("更新id：" + formid);
         }
@@ -1180,7 +1186,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                                     fields = new String[]{"ama_customer"};
                                 }
                                 param.put("caller", caller);
-                                LogUtil.d("DataFormDetailActivity","SelectNetAcitivty:"+caller);
+                                LogUtil.d("DataFormDetailActivity", "SelectNetAcitivty:" + caller);
                                 if (caller.equals("MainTain")) {
                                     if ("mt_custcode".equals(data.getField())) {
                                         fields = new String[]{"mt_custname"};
@@ -1195,9 +1201,9 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                                         fields = new String[]{"mtd_proname", "mtd_remark", "mtd_unit"};
                                         param.put("caller", "sProduct");
                                     }
-                                }else{
+                                } else {
                                     //SF类型需求更改，支持联动
-                                    LogUtil.d("DataFormDetailActivity","SelectNetAcitivty:"+caller);
+                                    LogUtil.d("DataFormDetailActivity", "SelectNetAcitivty:" + caller);
                                     startActivityForResult(new Intent(ct, SelectNetAcitivty.class)
                                                     .putExtra("fieldKey", data.getField())
                                                     .putExtra("caller", caller)
@@ -1527,7 +1533,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
 
         if (90 == requestCode && data != null) {
             String json = data.getStringExtra("data");
-            LogUtil.d("DataFormDetailActivity","json=" + json);
+            LogUtil.d("DataFormDetailActivity", "json=" + json);
             try {
                 paseSelectDbFind(JSON.parseObject(json));
             } catch (Exception e) {
@@ -1538,7 +1544,6 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
     }
 
 
-
     private void paseSelectDbFind(JSONObject object) throws Exception {
         List<Data> tempLists = mAdapter.getmListData().get(0).getDatas();
         if (!ListUtils.isEmpty(tempLists) && object != null && !object.isEmpty()) {
@@ -1626,7 +1631,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                 mAdapter.getmListData().get(model.getGroupId()).getDatas().get(va_alltimes - 1).setValue(startDate);
                 mAdapter.getmListData().get(model.getGroupId()).getDatas().get(va_alldays - 1).setValue(endDate);
             }
-            if ("fpd_date1".equals(field) || "fpd_date2".equals(field)||"fpd_start_time".equals(field)||"fpd_end_time".equals(field)) {
+            if ("fpd_date1".equals(field) || "fpd_date2".equals(field) || "fpd_start_time".equals(field) || "fpd_end_time".equals(field)) {
                 List<Data> tempLists = mAdapter.getmListData().get(model.getGroupId()).getDatas();
                 for (int i = 0; i < tempLists.size(); i++) {
                     Data tempData = tempLists.get(i);

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/form/FormListSelectActivity.java

@@ -347,25 +347,15 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
                 String statusKey = "";
 
                 if ("Ask4Leave".equals(caller)) {
-
                     statusKey = "va_status";
-
                 } else if ("SpeAttendance".equals(caller)) {
-
                     statusKey = "sa_status";
-
                 } else if ("Workovertime".equals(caller) || "ExtraWork$".equals(caller)) {
-
                     statusKey = "wo_status";
-
                 } else if ("FeePlease!CCSQ".equals(caller) || "FeePlease!CCSQ!new".equals(caller)) {
-
                     statusKey = "fp_status";
-
-
                 } else if ("StandbyApplication".equals(caller)) {
                     statusKey = "sa_status";
-
                 } else if ("MaterielApply".equals(caller)) {
                     statusKey = "ama_status";
                 } else if ("MainTain".equals(caller)) {
@@ -373,6 +363,8 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
                     getSupportActionBar().setTitle("维修申请单");
                 } else if ("FeePlease!FYBX".equals(caller)) {
                     statusKey = "fp_status";
+                } else {
+                    statusKey = "ct_status";
                 }
                 //防错处理
                 if (StringUtil.isEmpty(pfField)) {
@@ -608,7 +600,7 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
         }
 
     }
-    
+
     public class SaleAdapter extends BaseAdapter implements Filterable {
 
         private Context ct;
@@ -854,7 +846,7 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
                     if (!StringUtil.isEmpty(constraint.toString())) {
                         //这里为什么这样做，主要是由于item是动态创建的，查询的数据的item高度大于其它item高度时，
                         //会发生错位问题，重新设置adaper就没有问题
-                         mlistview.setAdapter(adapter);
+                        mlistview.setAdapter(adapter);
                     } else {
                         adapter.notifyDataSetInvalidated();
                     }

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

@@ -143,6 +143,8 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
     private StringBuilder mPhotoIds;
     private int mUploadImgCount = 0;
 
+    private String mOperateUrl;
+
     private Handler mHandler = new Handler() {
 
         @Override
@@ -158,6 +160,7 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
                     LogUtil.prinlnLongMsg("result:", result);
                     JSONObject resultObject = JSON.parseObject(result);
                     mOperateId = JSONUtil.getText(resultObject, "operateid");
+                    mOperateUrl = JSONUtil.getText(resultObject, "operateurl");
                     JSONArray forms = resultObject.getJSONObject("data").getJSONArray("formdetail");
                     sessionId = resultObject.getString("sessionId");
                     grids = resultObject.getJSONObject("data").getJSONArray("gridetail");
@@ -865,7 +868,8 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
         if (caller == null) {
             caller = "Ask4Leave";
         }
-        String url = CommonUtil.getCityBaseUrl(ct) + "api/serve/config.action";
+//        String url = CommonUtil.getCityBaseUrl(ct) + "api/serve/config.action";
+        String url = CommonUtil.getCityBaseUrl(ct) + "mobile/common/getConfig.action";
 
         Map<String, Object> params = new HashMap<>();
         params.put("serve_id", mServeId);
@@ -2284,7 +2288,7 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
         progressDialog.show();
         click_btn.setEnabled(false);
         //  api/serve/save.action?data=?&operate_id=?&access_token=?
-        String url = CommonUtil.getCityBaseUrl(ct) + "api/serve/save.action";
+        String url = CommonUtil.getCityBaseUrl(ct) + mOperateUrl;
         Map<String, Object> params = new HashMap<>();
         params.put("data", formStore);
         params.put("operate_id", mOperateId);

app_modular/appworks/src/main/java/com/uas/appworks/model/WorkPlatModel.java

@@ -101,35 +101,17 @@ public class WorkPlatModel implements IWorkPlatModel {
             List<WorkMenuBean> cacheWorkMenuBeans = getWorkMenuBeans(cacheJson);
 
             // TODO: 2017/11/15 循环逻辑待优化
+            //循环遍历缓存数据，目的是用本地文件来更新缓存数据
             for (WorkMenuBean cacheWorkMenuBean : cacheWorkMenuBeans) {
                 String cacheModuleTag = cacheWorkMenuBean.getModuleTag();
-                String cacheModuleName = null;
-                if (cacheWorkMenuBean.isLocalModule()) {
-                    try {
-                        cacheModuleName = context.getString(mResources.getIdentifier(cacheWorkMenuBean.getModuleName(), "string", context.getPackageName()));
-                    } catch (Exception e) {
-                        cacheModuleName = cacheWorkMenuBean.getModuleName();
-                    }
-                } else {
-                    cacheModuleName = cacheWorkMenuBean.getModuleName();
-                }
                 List<WorkMenuBean.ModuleListBean> cacheTypeList = cacheWorkMenuBean.getModuleList();
                 boolean isWorkMenuExist = false;
 
+                //先循环本地文件，如果是本地的模块，则按照本地文件更新缓存中的属性
                 for (WorkMenuBean localWorkMenuBean : localWorkMenuBeans) {
                     String localModuleTag = localWorkMenuBean.getModuleTag();
-                    String localModuleName = null;
-                    if (localWorkMenuBean.isLocalModule()) {
-                        try {
-                            localModuleName = context.getString(mResources.getIdentifier(localWorkMenuBean.getModuleName(), "string", context.getPackageName()));
-                        } catch (Exception e) {
-                            localModuleName = localWorkMenuBean.getModuleName();
-                        }
-                    } else {
-                        localModuleName = localWorkMenuBean.getModuleName();
-                    }
                     List<WorkMenuBean.ModuleListBean> localModuleList = localWorkMenuBean.getModuleList();
-                    if (localModuleName.equals(cacheModuleName)) {
+                    if (localModuleTag.equals(cacheModuleTag)) {
                         //本地模块存在，按本地模块更新缓存数据
                         isWorkMenuExist = true;
                         WorkMenuBean workMenuBean = new WorkMenuBean();
@@ -152,6 +134,7 @@ public class WorkPlatModel implements IWorkPlatModel {
                                     resultModuleListBean.setIsHide(cacheModuleListBean.isHide());
                                     resultModuleListBean.setIsLocalMenu(localModuleListBean.isLocalMenu());
                                     resultModuleListBean.setMenuActivity(localModuleListBean.getMenuActivity());
+                                    resultModuleListBean.setMenuTag(localModuleListBean.getMenuTag());
                                     resultModuleListBean.setMenuIcon(localModuleListBean.getMenuIcon());
                                     resultModuleListBean.setMenuName(localModuleListBean.getMenuName());
                                     resultModuleListBean.setMenuUrl(localModuleListBean.getMenuUrl());
@@ -187,36 +170,18 @@ public class WorkPlatModel implements IWorkPlatModel {
                     }
                 }
 
+                //如果本地文件中不存在，则说明是网络模块，直接添加
                 if (!isWorkMenuExist && !cacheWorkMenuBean.isLocalModule()) {
                     mMenuTypeBeen.add(cacheWorkMenuBean);
                 }
             }
+            //循环遍历本地菜单，目的是想缓存数据中添加新增的本地应用
             for (WorkMenuBean localWorkMenuBean : localWorkMenuBeans) {
                 boolean isExist = false;
                 String localModuleTag = localWorkMenuBean.getModuleTag();
-                String localModuleName = null;
-                if (localWorkMenuBean.isLocalModule()) {
-                    try {
-                        localModuleName = context.getString(mResources.getIdentifier(localWorkMenuBean.getModuleName(), "string", context.getPackageName()));
-                    } catch (Exception e) {
-                        localModuleName = localWorkMenuBean.getModuleName();
-                    }
-                } else {
-                    localModuleName = localWorkMenuBean.getModuleName();
-                }
                 for (WorkMenuBean workMenuBean : mMenuTypeBeen) {
                     String moduleTag = workMenuBean.getModuleTag();
-                    String moduleName = null;
-                    if (workMenuBean.isLocalModule()) {
-                        try {
-                            moduleName = context.getString(mResources.getIdentifier(workMenuBean.getModuleName(), "string", context.getPackageName()));
-                        } catch (Exception e) {
-                            moduleName = workMenuBean.getModuleName();
-                        }
-                    } else {
-                        moduleName = workMenuBean.getModuleName();
-                    }
-                    if (localModuleName.equals(moduleName)) {
+                    if (localModuleTag.equals(moduleTag)) {
                         isExist = true;
                         break;
                     }