Browse Source

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

# Conflicts:
#	WeiChat/version.properties
Arison 8 years ago
parent
commit
66fcae4e18
23 changed files with 1275 additions and 56 deletions
  1. 7 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/WorkMenuParentAdapter.java
  2. 39 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/WorkPlatFragment.java
  3. 1 1
      app_core/common/src/main/assets/work_menu.json
  4. 1 1
      app_core/common/src/main/assets/work_menu_b2b.json
  5. 1 1
      app_core/common/src/main/assets/work_menu_personal.json
  6. 1 2
      app_core/common/src/main/res/layout/activity_common_docui.xml
  7. 39 0
      app_core/common/src/main/res/layout/listitem_form_edit.xml
  8. 17 6
      app_modular/appworks/src/main/AndroidManifest.xml
  9. 1 0
      app_modular/appworks/src/main/java/com/uas/appworks/activity/CityIndustryActivity.java
  10. 1113 0
      app_modular/appworks/src/main/java/com/uas/appworks/activity/CommonCityIndustryDetailsActivity.java
  11. 28 24
      app_modular/appworks/src/main/java/com/uas/appworks/activity/CommonDataFormActivity.java
  12. 5 11
      app_modular/appworks/src/main/java/com/uas/appworks/activity/CommonFormListActivity.java
  13. 13 1
      app_modular/appworks/src/main/java/com/uas/appworks/adapter/CityIndustryParentAdapter.java
  14. 2 2
      app_modular/appworks/src/main/java/com/uas/appworks/adapter/WorkFuncSetChildAdapter.java
  15. 2 2
      app_modular/appworks/src/main/java/com/uas/appworks/adapter/WorkFuncSetParentAdapter.java
  16. 1 1
      app_modular/appworks/src/main/java/com/uas/appworks/adapter/WorkModuleSortAddAdapter.java
  17. BIN
      app_modular/appworks/src/main/res/drawable-hdpi/ic_work_city_industry_service.png
  18. BIN
      app_modular/appworks/src/main/res/drawable-xhdpi/ic_work_city_industry_service.png
  19. BIN
      app_modular/appworks/src/main/res/drawable-xxhdpi/ic_work_city_industry_service.png
  20. 1 0
      app_modular/appworks/src/main/res/values-en/strings.xml
  21. 1 0
      app_modular/appworks/src/main/res/values-zh-rCN/strings.xml
  22. 1 0
      app_modular/appworks/src/main/res/values-zh-rTW/strings.xml
  23. 1 0
      app_modular/appworks/src/main/res/values/strings.xml

+ 7 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/WorkMenuParentAdapter.java

@@ -111,7 +111,7 @@ public class WorkMenuParentAdapter extends BaseAdapter {
                             mOnAddFuncClickListener.onAddFuncClick(view, position);
                         }
                     } else {
-                        Intent intent = getWorkIntent(menuActivity, menuIcon, caller);
+                        Intent intent = getWorkIntent(typeListBeen.get(position));
                         context.startActivity(intent);
                     }
                 } catch (Exception e) {
@@ -124,7 +124,11 @@ public class WorkMenuParentAdapter extends BaseAdapter {
 
     private static final String TAG = "WorkMenuParentAdapter";
 
-    private Intent getWorkIntent(String menuActivity, String menuIcon, String caller) {
+    private Intent getWorkIntent(WorkMenuBean.ModuleListBean moduleListBean) {
+        String menuActivity = moduleListBean.getMenuActivity();
+        String menuIcon = moduleListBean.getMenuIcon();
+        String caller = moduleListBean.getCaller();
+
         Intent intent = new Intent(menuActivity);
 
         switch (menuActivity) {
@@ -209,6 +213,7 @@ public class WorkMenuParentAdapter extends BaseAdapter {
                 break;
             case "com.modular.work.CommonDataFormActivity":
                 intent.putExtra("serve_id", caller);
+                intent.putExtra("title", moduleListBean.getMenuName());
                 break;
             default:
                 break;

+ 39 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/WorkPlatFragment.java

@@ -118,8 +118,9 @@ public class WorkPlatFragment extends BaseMVPFragment<WorkPlatPresenter> impleme
     private void obtainCityIndustryService() {
         Map<String, Object> params = new HashMap<>();
         params.put("kind", "app");
-//        params.put("client_type", "cc");
-//        params.put("access_token", "123456");
+        params.put("client_type", "cc");
+        params.put("access_token", "123456");
+        params.put("Cookie", "JSESSIONID=" + com.core.utils.CommonUtil.getSharedPreferences(mContext, "sessionId"));
 
         LinkedHashMap<String, Object> header = new LinkedHashMap<>();
         header.put("Cookie", "JSESSIONID=" + com.core.utils.CommonUtil.getSharedPreferences(mContext, "sessionId"));
@@ -278,6 +279,24 @@ public class WorkPlatFragment extends BaseMVPFragment<WorkPlatPresenter> impleme
                             }
                         }
 
+                        for (int i = cacheModuleList.size() - 1; i >= 0; i--) {
+                            WorkMenuBean.ModuleListBean cacheModuleListBean = cacheModuleList.get(i);
+                            if (!cacheModuleListBean.isLocalMenu()) {
+                                boolean isCacheExist = false;
+                                String cacheMenuName = cacheModuleListBean.getMenuName();
+                                for (WorkMenuBean.ModuleListBean netModuleListBean : netModuleList) {
+                                    String netMenuName = netModuleListBean.getMenuName();
+                                    if (cacheMenuName.equals(netMenuName)) {
+                                        isCacheExist = true;
+                                        break;
+                                    }
+                                }
+                                if (!isCacheExist) {
+                                    cacheModuleList.remove(i);
+                                }
+                            }
+                        }
+
                         break;
                     }
                 }
@@ -286,6 +305,24 @@ public class WorkPlatFragment extends BaseMVPFragment<WorkPlatPresenter> impleme
                 }
             }
 
+            for (int i = mCacheMenuTypeBeans.size() - 1; i >= 0; i--) {
+                WorkMenuBean cacheWorkMenuBean = mCacheMenuTypeBeans.get(i);
+                if (!cacheWorkMenuBean.isLocalModule()) {
+                    boolean isCacheExist = false;
+                    String cacheModuleName = cacheWorkMenuBean.getModuleName();
+                    for (WorkMenuBean netWorkMenuBean : netWorkMenuBeans) {
+                        String netModuleName = netWorkMenuBean.getModuleName();
+                        if (cacheModuleName.equals(netModuleName)) {
+                            isCacheExist = true;
+                            break;
+                        }
+                    }
+                    if (!isCacheExist) {
+                        mCacheMenuTypeBeans.remove(i);
+                    }
+                }
+            }
+
             String resultJson = JSON.toJSONString(mCacheMenuTypeBeans);
             com.core.utils.CommonUtil.setUniqueSharedPreferences(mContext, Constants.WORK_MENU_CACHE, resultJson);
 

+ 1 - 1
app_core/common/src/main/assets/work_menu.json

@@ -270,7 +270,7 @@
       {
         "isLocalMenu": true,
         "menuName": "产城服务",
-        "menuIcon": "defaultpic",
+        "menuIcon": "ic_work_city_industry_service",
         "menuActivity": "com.modular.work.CityIndustryActivity",
         "menuUrl": "",
         "caller": "",

+ 1 - 1
app_core/common/src/main/assets/work_menu_b2b.json

@@ -135,7 +135,7 @@
       {
         "isLocalMenu": true,
         "menuName": "产城服务",
-        "menuIcon": "defaultpic",
+        "menuIcon": "ic_work_city_industry_service",
         "menuActivity": "com.modular.work.CityIndustryActivity",
         "menuUrl": "",
         "caller": "",

+ 1 - 1
app_core/common/src/main/assets/work_menu_personal.json

@@ -45,7 +45,7 @@
       {
         "isLocalMenu": true,
         "menuName": "产城服务",
-        "menuIcon": "defaultpic",
+        "menuIcon": "ic_work_city_industry_service",
         "menuActivity": "com.modular.work.CityIndustryActivity",
         "menuUrl": "",
         "caller": "",

+ 1 - 2
app_core/common/src/main/res/layout/activity_common_docui.xml

@@ -169,8 +169,7 @@
         android:orientation="horizontal"
         android:background="@color/bg_main"
         android:paddingBottom="5dp"
-        android:visibility="gone"
-       >
+        android:visibility="gone">
 
         <LinearLayout
             android:id="@+id/common_docui_resubmit_ll"

+ 39 - 0
app_core/common/src/main/res/layout/listitem_form_edit.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <LinearLayout
+        android:id="@+id/ll_moment"
+        android:background="@color/white"
+        android:layout_height="wrap_content"
+        android:maxHeight="180dp"
+        android:minHeight="50dp"
+        style="@style/LinearLayout_horizontal">
+        <TextView
+            android:id="@+id/tv_less_key"
+            style="@style/TextView_Basic"
+            android:layout_margin="10dp"
+            android:layout_width="60dp"
+            android:textSize="14sp"
+            android:textColor="@color/text_main"
+            android:layout_gravity="center_vertical"
+            android:text="商机阶段商机阶段阶段:" />
+<!--android:background="@drawable/shape_from_edit"-->
+        <EditText
+            android:id="@+id/tv_less_value"
+            style="@style/TextView_Basic"
+            android:maxWidth="260dp"
+            android:minWidth="240dp"
+            android:maxHeight="150dp"
+            android:textSize="14sp"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_vertical"
+            android:layout_width="match_parent"
+            android:background="@drawable/shape_from_edit"
+            android:gravity="right|center"
+            android:padding="5dp"
+            android:layout_marginRight="10dp"
+            android:hint="@string/common_input" />
+    </LinearLayout>
+</LinearLayout>

+ 17 - 6
app_modular/appworks/src/main/AndroidManifest.xml

@@ -239,17 +239,28 @@
         </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>
+            <intent-filter>
+                <action android:name="com.modular.work.CommonDataFormActivity" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
 
-        <activity android:name=".activity.CommonFormListActivity">
+        <activity
+            android:name=".activity.CommonFormListActivity"
+            android:hardwareAccelerated="false"
+            android:launchMode="singleTask"
+            android:windowSoftInputMode="adjustPan">
             <intent-filter>
                 <action android:name="com.modular.work.CommonFormListActivity" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
+
+        <activity android:name=".activity.CommonCityIndustryDetailsActivity">
+            <intent-filter>
+                <action android:name="com.modular.work.CommonCityIndustryDetailsActivity" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
     </application>
 </manifest>

+ 1 - 0
app_modular/appworks/src/main/java/com/uas/appworks/activity/CityIndustryActivity.java

@@ -45,6 +45,7 @@ public class CityIndustryActivity extends BaseMVPActivity<WorkPlatPresenter> imp
 
     @Override
     protected void initView() {
+        getSupportActionBar().setTitle(R.string.city_industry_service);
         mPullToRefreshListView = $(R.id.city_industry_ptlv);
         mPullToRefreshListView.setMode(PullToRefreshBase.Mode.DISABLED);
 

+ 1113 - 0
app_modular/appworks/src/main/java/com/uas/appworks/activity/CommonCityIndustryDetailsActivity.java

@@ -0,0 +1,1113 @@
+package com.uas.appworks.activity;
+
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.support.v7.app.AlertDialog;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONException;
+import com.alibaba.fastjson.JSONObject;
+import com.common.LogUtil;
+import com.common.data.ListUtils;
+import com.common.data.StringUtil;
+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.utils.CommonUtil;
+import com.core.utils.helper.AvatarHelper;
+import com.core.widget.CustomerScrollView;
+import com.core.widget.EmptyLayout;
+import com.core.widget.MyListView;
+import com.core.widget.SquareCenterImageView;
+import com.core.widget.view.MyGridView;
+import com.nostra13.universalimageloader.core.ImageLoader;
+import com.uas.appworks.OA.erp.activity.ExpenseReimbursementActivity;
+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;
+import com.uas.appworks.OA.erp.adapter.CommonDocMainMsgAdapter;
+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 java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 产城服务通用表单详情页
+ */
+public class CommonCityIndustryDetailsActivity extends BaseActivity {
+
+    private static final int COM_DOC_RESUB_SUCCESSFUL = 1213;
+    private static final int COM_DOC_REDELETE_SUCCESSFUL = 1215;
+    private static final int NEW_DOC_RESUB_SUCCESSFUL = 52601;
+    private static final int New_DOC_REDELETE_SUCCESSFUL = 52602;
+    private static final int NEW_DELETE_DOC_REQUEST = 52603;
+    private int mNoc = 1;
+    private final static int COMMON_DOC_AF_REQUEST = 1125;
+    private final static int COMMON_DOC_MSG_REQUEST = 1126;
+    private static final int DELETE_DOC_REQUEST = 1127;
+    private EmptyLayout mEmptyLayput_approvalflow;
+    private CommonApprovalFlowBean mCommonApprovalFlowBean;
+    private CommonDocAMBean mCommonDocAMBean;
+    private DBManager manager;
+    private List<String> im_ids;
+    private String mCaller = "";
+    private int mkeyValue;
+    private String mServiceId;
+    private EmptyLayout mEmptyLayput_applymsg;
+    private JSONArray formdataBeans;
+    private JSONArray griddataBeans;
+    private List<CommonDocAMBean.DatasBean.FormconfigsBean> mFormconfigsBean;
+    private List<CommonDocAMBean.DatasBean.GridconfigsBean> mGridconfigsBean;
+    private CommonDocMainMsgAdapter mCommonDocMainMsgAdapter;
+    private ComDocGriddataOutAdapter mComDocGriddataOutAdapter;
+
+    private MyListView main_msg_lv;
+    private ImageView photo_im;
+    private TextView name_tv;
+    private TextView section_tv;
+    private TextView status_tv;
+    private MyListView appflow_lv;
+    private MyListView second_msg_lv;
+    private LinearLayout secondmsg_ll;
+    private LinearLayout approval_ll;
+    private LinearLayout agree_ll;
+    private LinearLayout change_deal_man_ll;
+    private LinearLayout disagree_ll;
+    private LinearLayout resanddel_ll;
+    private LinearLayout resubmit_ll;
+    private LinearLayout delete_ll;
+    private CustomerScrollView commondoc_sv;
+    private View hide_above_af;
+    private LinearLayout ex_invoice_ll;
+    private MyGridView grid_view;
+    private GridViewAdapter mAdapter;
+    private String last_status;
+    private String update;
+    private Boolean platform;
+    private String em_number;
+    private String type_emcode;
+    private String real_status;
+    private String emCode;
+    private String mTitle;
+
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        initView();
+    }
+
+    @Override
+    protected void onResume() {
+        initDate();
+        commondoc_sv.smoothScrollTo(0, 0);
+        super.onResume();
+    }
+
+    public void initView() {
+        platform = ApiUtils.getApiModel() instanceof ApiPlatform;
+        setContentView(R.layout.activity_common_docui);
+        initIDS();
+        mEmptyLayput_applymsg = new EmptyLayout(this, main_msg_lv);
+        mEmptyLayput_applymsg.setShowEmptyButton(false);
+        mEmptyLayput_applymsg.setShowErrorButton(false);
+        mEmptyLayput_applymsg.setShowLoadingButton(false);
+
+        //加载主单据信息适配器
+        formdataBeans = new JSONArray();
+        mFormconfigsBean = new ArrayList<>();
+        mCommonDocMainMsgAdapter = new CommonDocMainMsgAdapter(this);
+
+        //加载从单据信息外面层listview适配器
+        griddataBeans = new JSONArray();
+        mGridconfigsBean = new ArrayList<>();
+        mComDocGriddataOutAdapter = new ComDocGriddataOutAdapter(this);
+
+        mEmptyLayput_approvalflow = new EmptyLayout(this, appflow_lv);
+        mEmptyLayput_approvalflow.setShowEmptyButton(false);
+        mEmptyLayput_approvalflow.setShowErrorButton(false);
+        mEmptyLayput_approvalflow.setShowLoadingButton(false);
+        //加载审批流的适配器
+        mCommonApprovalFlowBean = new CommonApprovalFlowBean();
+
+        manager = new DBManager(this);
+        im_ids = new ArrayList<>();
+        em_number = new String(); //单据申请人编号
+        real_status = new String();//单据真实状态
+
+        String imageUri = "drawable://" + R.drawable.common_header_boy;
+        AvatarHelper.getInstance().display(imageUri, photo_im, true);
+
+        im_ids = new ArrayList<>();
+        afpeople_names = new ArrayList<>();
+
+
+        mAdapter = new GridViewAdapter();
+        grid_view.setAdapter(mAdapter);
+    }
+
+    private void initIDS() {
+        main_msg_lv = (MyListView) findViewById(R.id.common_docui_main_msg_lv);
+        photo_im = (ImageView) findViewById(R.id.common_docui_photo_img);
+        name_tv = (TextView) findViewById(R.id.common_docui_name_tv);
+        section_tv = (TextView) findViewById(R.id.common_docui_Section_tv);
+        status_tv = (TextView) findViewById(R.id.common_docui_status_tv);
+        appflow_lv = (MyListView) findViewById(R.id.common_docui_approval_flow_lv);
+        second_msg_lv = (MyListView) findViewById(R.id.common_docui_second_msg_lv);
+        secondmsg_ll = (LinearLayout) findViewById(R.id.common_docui_secondmsg_ll);
+        approval_ll = (LinearLayout) findViewById(R.id.common_docui_agree_and_change_ll);
+        agree_ll = (LinearLayout) findViewById(R.id.common_docui_agree_ll);
+        change_deal_man_ll = (LinearLayout) findViewById(R.id.common_docui_change_dealman_ll);
+        disagree_ll = (LinearLayout) findViewById(R.id.common_docui_disagree_ll);
+        resanddel_ll = (LinearLayout) findViewById(R.id.item_common_docui_res_and_del_ll);
+        resubmit_ll = (LinearLayout) findViewById(R.id.common_docui_resubmit_ll);
+        delete_ll = (LinearLayout) findViewById(R.id.common_docui_delete_ll);
+        commondoc_sv = (CustomerScrollView) findViewById(R.id.common_docui_sv);
+        hide_above_af = findViewById(R.id.hide_above_af);
+        ex_invoice_ll = (LinearLayout) findViewById(R.id.ex_invoice_ll);
+        grid_view = (MyGridView) findViewById(R.id.grid_view);
+
+    }
+
+    private void initDate() {
+        final Intent intent = getIntent();
+        mkeyValue = intent.getIntExtra("keyValue", -1);
+        real_status = intent.getStringExtra("status");
+        update = intent.getStringExtra("update");
+        mServiceId = intent.getStringExtra("serve_id");
+        mTitle = intent.getStringExtra("title");
+        if (!StringUtil.isEmpty(mTitle)) {
+            getSupportActionBar().setTitle(mTitle + getString(R.string.doc_detail));
+        }
+        //请求获取单据提交内容数据
+        progressDialog.show();
+        String docmsg_url = CommonUtil.getAppBaseUrl(getApplicationContext()) + "api/serve/config.action";
+        Map<String, Object> param_am = new HashMap<>();
+        param_am.put("serve_id", mServiceId);
+        param_am.put("client_type", "cc");
+        param_am.put("access_token", "111111");
+        param_am.put("id", mkeyValue);
+        LinkedHashMap headers_am = new LinkedHashMap();
+        headers_am.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(getApplicationContext(), "sessionId"));
+        ViewUtil.httpSendRequest(getApplicationContext(), docmsg_url, param_am, mHandler, headers_am, COMMON_DOC_MSG_REQUEST, null, null, "post");
+
+    }
+
+//    @Override
+//    public boolean onCreateOptionsMenu(Menu menu) {
+//        getMenuInflater().inflate(R.menu.comdoc_list, menu);
+//        return super.onCreateOptionsMenu(menu);
+//    }
+//
+//    @Override
+//    public boolean onOptionsItemSelected(MenuItem item) {
+//        if (item.getItemId() == R.id.more_doc){
+//            startActivity(new Intent(mContext,FormListSelectActivity.class)
+//                    .putExtra("caller", mCaller));
+//        }
+//        return super.onOptionsItemSelected(item);
+//    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        if (!"FeePlease!FYBX".equals(mCaller)) {
+            getMenuInflater().inflate(R.menu.menu_add_icon, menu);
+        }
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.add_item) {
+            startActivity(new Intent(activity, CommonDataFormActivity.class)
+                    .putExtra("serve_id", mServiceId)
+                    .putExtra("title", mTitle));
+            finish();
+        }
+        if (item.getItemId() == android.R.id.home) {
+            if (ActivityUtils.isExsitMianActivity(mContext, CommonFormListActivity.class)) {
+                LogUtil.d("正常返回...");
+                onBackPressed();
+            } else {
+                LogUtil.d("非正常返回...");
+                startActivity(new Intent(mContext, CommonFormListActivity.class)
+                        .putExtra("serveId", mServiceId)
+                        .putExtra("caller", mCaller)
+                        .putExtra("title", mTitle));
+                finish();
+            }
+        }
+        return true;
+    }
+
+    public Handler mHandler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+                case COMMON_DOC_MSG_REQUEST:
+                    String msg_result = msg.getData().getString("result");
+                    AMshow(msg_result); //单据申请信息展示
+                    break;
+                case COMMON_DOC_AF_REQUEST:
+                    String af_result = msg.getData().getString("result");
+                    LogUtil.prinlnLongMsg("af_result", af_result);
+                    AFshow(af_result);  //单据审批流信息展示
+                    break;
+                case DELETE_DOC_REQUEST:
+                    String del_result = msg.getData().getString("result");
+                    LogUtil.prinlnLongMsg("del_result", del_result);
+                    Toast.makeText(getApplicationContext(), getString(R.string.common_delete), Toast.LENGTH_LONG).show();
+                    progressDialog.dismiss();
+                    CommonFormListActivity.isdelete = true;
+                    CommonFormListActivity.reload = false;
+                    finish();
+                    break;
+                case NEW_DELETE_DOC_REQUEST:
+                    if (msg.getData() != null) {
+                        String new_delete_doc_result = msg.getData().getString("result");
+                        LogUtil.prinlnLongMsg("new_delete_doc_result", new_delete_doc_result);
+                        Toast.makeText(getApplicationContext(), getString(R.string.common_delete), Toast.LENGTH_LONG).show();
+                        progressDialog.dismiss();
+                        CommonFormListActivity.isdelete = true;
+                        CommonFormListActivity.reload = false;
+                        finish();
+                    }
+                    break;
+                case COM_DOC_RESUB_SUCCESSFUL:  //已提交状态 重新提交操作前的反提交
+                    if (msg.getData() != null) {
+                        if (!StringUtil.isEmpty(msg.getData().getString("result"))) {
+                            String result = msg.getData().getString("result");
+                            LogUtil.prinlnLongMsg("RESUBMITTED_message", result);
+//                            Toast.makeText(ct, "单据反提交成功", Toast.LENGTH_SHORT).show();
+                            startActivity(new Intent(CommonCityIndustryDetailsActivity.this, DataFormDetailActivity.class)
+                                    .putExtra("caller", mCaller)
+                                    .putExtra("id", mkeyValue)
+                                    .putExtra("submittype", "resubmit")
+                                    .putExtra("status", "已提交"));
+
+                            finish();
+                        }
+                    }
+                    break;
+                case COM_DOC_REDELETE_SUCCESSFUL:  // 已提交状态 删除操作前的反提交
+                    if (msg.getData() != null) {
+                        if (!StringUtil.isEmpty(msg.getData().getString("result"))) {
+                            String refordelete_result = msg.getData().getString("result");
+                            LogUtil.prinlnLongMsg("refordelete", refordelete_result);
+                            DeleteComDocRequest(mCaller, mkeyValue);
+                        }
+                    }
+                    break;
+                case NEW_DOC_RESUB_SUCCESSFUL:
+                    if (msg.getData() != null) {
+                        String new_doc_resub_result = msg.getData().getString("result");
+                        LogUtil.prinlnLongMsg("new_doc_resub_result", new_doc_resub_result + "");
+                        if (StringUtil.isEmpty(new_doc_resub_result)) return;
+                        if (JSON.parseObject(new_doc_resub_result).containsKey("success")
+                                && JSON.parseObject(new_doc_resub_result).getBoolean("success")) {
+                            startActivity(new Intent(CommonCityIndustryDetailsActivity.this, DataFormDetailActivity.class)
+                                    .putExtra("caller", mCaller)
+                                    .putExtra("id", mkeyValue)
+                                    .putExtra("submittype", "resubmit")
+                                    .putExtra("status", "已提交"));
+
+                            finish();
+                        }
+
+                    }
+                    break;
+
+                case New_DOC_REDELETE_SUCCESSFUL:
+                    if (msg.getData() != null) {
+                        String new_doc_redelete_result = msg.getData().getString("result");
+                        LogUtil.prinlnLongMsg("new_doc_redelete_result", new_doc_redelete_result);
+                        if (StringUtil.isEmpty(new_doc_redelete_result)) return;
+                        if (JSON.parseObject(new_doc_redelete_result).containsKey("success")
+                                && JSON.parseObject(new_doc_redelete_result).getBoolean("success")) {
+                            DeleteComDocRequest(mCaller, mkeyValue);
+                        }
+                    }
+                    break;
+
+                case 0x01:
+                    if (msg.getData() != null) {
+                        String result = msg.getData().getString("result");
+                        LogUtil.prinlnLongMsg("0x01result", result);
+                        if (!StringUtil.isEmpty(result) && result.contains("success") &&
+                                JSON.parseObject(result).getBoolean("success")) {
+                            startActivity(new Intent(CommonCityIndustryDetailsActivity.this, ExpenseReimbursementActivity.class)
+                                    .putExtra("caller", mCaller)
+                                    .putExtra("id", mkeyValue)
+                                    .putExtra("submittype", "resubmit")
+                                    .putExtra("status", "已提交"));
+                            finish();
+                        }
+                    }
+                    break;
+                case 0x02:
+                    if (msg.getData() != null) {
+                        String result = msg.getData().getString("result");
+                        LogUtil.prinlnLongMsg("0x02result", result);
+                        DeleteComDocRequest(mCaller, mkeyValue);
+                    }
+                    break;
+                case Constants.APP_SOCKETIMEOUTEXCEPTION:
+                    Toast.makeText(CommonCityIndustryDetailsActivity.this, msg.getData().getString("result"), Toast.LENGTH_LONG).show();
+                    if (!TextUtils.isEmpty(real_status) && real_status.equals("已审核")) {
+                        commondoc_sv.setVisibility(View.VISIBLE);
+                        resanddel_ll.setVisibility(View.GONE);
+                    } else if (!TextUtils.isEmpty(real_status) && real_status.equals("已提交")) {
+                        commondoc_sv.setVisibility(View.VISIBLE);
+                    }
+
+                    break;
+            }
+        }
+    };
+
+    /**
+     * @param mCaller
+     * @param mkeyValue
+     */
+    private void DeleteComDocRequest(String mCaller, int mkeyValue) {
+        Map<String, Object> formStoreMap = new HashMap<>();
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("caller", mCaller);
+        params.put("id", mkeyValue);
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        String url = "";
+        if ("ExtraWork$".equals(mCaller)) {
+            url = CommonUtil.getSharedPreferences(ct, "erp_baseurl") + "/hr/attendance/deleteExtraWork.action";
+            ViewUtil.httpSendRequest(this, url, params, mHandler, headers, NEW_DELETE_DOC_REQUEST, null, null, "post");
+        } else {
+            url = CommonUtil.getSharedPreferences(ct, "erp_baseurl") + "/mobile/commondelete.action";
+            ViewUtil.httpSendRequest(this, url, params, mHandler, headers, DELETE_DOC_REQUEST, null, null, "get");
+        }
+
+    }
+
+    /**
+     * 处理请求申请单据url后获取到的数据并显示
+     *
+     * @param msg_result
+     */
+    public void AMshow(String msg_result) {
+        mFormconfigsBean.clear();
+        mGridconfigsBean.clear();
+        try {
+            JSONObject amresultJsonObject = JSON.parseObject(msg_result);
+            JSONObject dataObjecty = amresultJsonObject.getJSONObject("datas");
+            JSONArray formdataArray = dataObjecty.getJSONArray("formdata");
+            showExP(formdataArray);
+            JSONArray griddataArray = dataObjecty.getJSONArray("griddata");
+
+            LogUtil.prinlnLongMsg("amresultJsonObject", amresultJsonObject.toString());
+            if (formdataArray == null) {
+                mEmptyLayput_applymsg.showEmpty();
+                resanddel_ll.setVisibility(View.GONE);
+            } else {
+                commondoc_sv.setVisibility(View.VISIBLE);
+                mCommonDocMainMsgAdapter.setFormdataBeans(formdataArray);
+                if (griddataArray == null) {
+                    secondmsg_ll.setVisibility(View.GONE);
+                } else {
+                    mComDocGriddataOutAdapter.setGriddataBeans(griddataArray);
+                    mComDocGriddataOutAdapter.setCaller(mCaller);
+                }
+                mCommonDocAMBean = JSON.parseObject(amresultJsonObject.toString(), CommonDocAMBean.class);
+
+                if (mCommonDocAMBean.getDatas().getFormdata() == null) {
+                    mEmptyLayput_applymsg.showEmpty();
+                } else {
+
+                    //  获取需要显示的主表单配置数据属性保存到mFormconfigsBean中
+                    if (mCommonDocAMBean.getDatas().getFormdata() != null && mCommonDocAMBean.getDatas().getFormconfigs() != null) {
+                        int allFormconfigs_num = mCommonDocAMBean.getDatas().getFormconfigs().size();
+                        type_emcode = new String();
+                        for (int i = 0; i < allFormconfigs_num; i++) {
+                            String fd_caption = mCommonDocAMBean.getDatas().getFormconfigs().get(i).getFD_CAPTION();
+                            String fd_field = mCommonDocAMBean.getDatas().getFormconfigs().get(i).getFD_FIELD();
+                            int mfd_isdefault = mCommonDocAMBean.getDatas().getFormconfigs().get(i).getMFD_ISDEFAULT();
+                            if (mfd_isdefault == -1 && fd_caption != null && fd_field != null) {
+                                mFormconfigsBean.add(mCommonDocAMBean.getDatas().getFormconfigs().get(i));
+                            }
+
+                            //申请单据申请人emcode,从申请单据信息获取
+                            if ((!TextUtils.isEmpty(fd_field) && fd_field.equals("va_emcode")) ||
+                                    (!TextUtils.isEmpty(fd_field) && fd_field.equals("wo_emcode")) ||
+                                    (!TextUtils.isEmpty(fd_field) && fd_field.equals("sa_appmancode")) ||
+                                    (!TextUtils.isEmpty(fd_field) && fd_field.equals("FP_PEOPLE2"))) {
+                                if (!fd_field.equals("null")) {
+                                    em_number = formdataArray.getJSONObject(0).getString(fd_field);
+                                    Log.i("em_number", em_number + "");
+                                }
+                            }
+
+                            //单据真正的状态
+                            if ((!TextUtils.isEmpty(fd_field) && fd_field.equals("va_status")) ||
+                                    (!TextUtils.isEmpty(fd_field) && fd_field.equals("wo_status")) ||
+                                    (!TextUtils.isEmpty(fd_field) && fd_field.equals("sa_status")) ||
+                                    (!TextUtils.isEmpty(fd_field) && fd_field.equals("FP_status"))) {
+                                if (!fd_field.equals("null")) {
+                                    last_status = formdataArray.getJSONObject(0).getString(fd_field);
+                                }
+                            }
+
+                            SetComDocStatus(real_status); //显示单据提交状态
+                            getapplypeomsg(em_number);
+                        }
+                        mCommonDocMainMsgAdapter.setmFormconfigsBean(mFormconfigsBean);
+                        main_msg_lv.setAdapter(mCommonDocMainMsgAdapter);
+                        LogUtil.prinlnLongMsg("mFormconfigsBean", mFormconfigsBean.toString());
+                    }
+
+                    //  获取需要显示的从表单配置数据属性保存到mGridconfigsBean中
+                    if (mCommonDocAMBean.getDatas().getGriddata() != null && mCommonDocAMBean.getDatas().getGridconfigs() != null) {
+                        int allGridconfigs_num = mCommonDocAMBean.getDatas().getGridconfigs().size();
+                        for (int i = 0; i < allGridconfigs_num; i++) {
+                            String dg_caption = mCommonDocAMBean.getDatas().getGridconfigs().get(i).getDG_CAPTION();
+                            String dg_field = mCommonDocAMBean.getDatas().getGridconfigs().get(i).getDG_FIELD();
+                            int mdg_isdefault = mCommonDocAMBean.getDatas().getGridconfigs().get(i).getMDG_ISDEFAULT();
+                            if (mdg_isdefault == -1 && dg_caption != null && dg_field != null) {
+                                mGridconfigsBean.add(mCommonDocAMBean.getDatas().getGridconfigs().get(i));
+                            }
+                        }
+                        mComDocGriddataOutAdapter.setmGridconfigsBean(mGridconfigsBean);
+                        second_msg_lv.setAdapter(mComDocGriddataOutAdapter);
+                        LogUtil.prinlnLongMsg("mGridconfigsBean", mGridconfigsBean.toString());
+                    }
+                }
+            }
+        } catch (JSONException e) {
+            e.printStackTrace();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        //请求获取单据审批流数据
+        String url = CommonUtil.getAppBaseUrl(getApplicationContext()) + "common/getCurrentJnodes.action";
+        Map<String, Object> param = new HashMap<>();
+        param.put("caller", "RepairApply");
+        param.put("keyValue", mkeyValue);
+        param.put("_noc", mNoc);
+        LinkedHashMap headers = new LinkedHashMap();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(getApplicationContext(), "sessionId"));
+        ViewUtil.httpSendRequest(getApplicationContext(), url, param, mHandler, headers, COMMON_DOC_AF_REQUEST, null, null, "post");
+
+    }
+
+    /**
+     * 申请单据的审批,提交,录入状态
+     */
+    private void SetComDocStatus(String real_status) {
+        if (!TextUtils.isEmpty(real_status)) {
+            if (real_status.equals("已审核")) {
+                status_tv.setTextColor(getApplicationContext().getResources().getColor(R.color.approval));
+                status_tv.setText(getString(R.string.status_approved));
+                resanddel_ll.setVisibility(View.GONE);
+            } else if (real_status.equals("已提交")) {
+
+                if (!TextUtils.isEmpty(last_status) && last_status.equals("已审核")) {
+                    status_tv.setTextColor(getApplicationContext().getResources().getColor(R.color.approval));
+                    status_tv.setText(getString(R.string.status_approved));
+                    resanddel_ll.setVisibility(View.GONE);
+                } else {
+                    status_tv.setTextColor(getApplicationContext().getResources().getColor(R.color.no_approval));
+                    status_tv.setText(getString(R.string.status_pending));
+                    resanddel_ll.setVisibility(View.GONE);
+                }
+
+            } else if (real_status.equals("在录入")) {
+                status_tv.setTextColor(getApplicationContext().getResources().getColor(R.color.titleBlue));
+                status_tv.setText(getString(R.string.status_unsubmit));
+                resanddel_ll.setVisibility(View.GONE);
+            }
+        }
+    }
+
+    /**
+     * 处理请求审批流url后获取到的数据并显示
+     *
+     * @param af_result
+     */
+    private String em_code;
+    private List<String> afpeople_names;
+    private String af_name;
+
+    public void AFshow(String af_result) {
+        try {
+            JSONObject resultJsonObject = JSON.parseObject(af_result);
+            //JSONArray dailynodeArray = resultJsonObject.getJSONArray("nodes");
+            if (resultJsonObject == null) {
+                appflow_lv.setVisibility(View.GONE);
+            } else {
+                mCommonApprovalFlowBean = JSON.parseObject(resultJsonObject.toString(), CommonApprovalFlowBean.class);
+                em_code = new String();
+                if (manager == null) manager = new DBManager(mContext);
+                if ("已审核".equals(real_status) && (mCommonApprovalFlowBean.getData().size() == 0 ||
+                        mCommonApprovalFlowBean.getData().size() == mCommonApprovalFlowBean.getNodes().size())) {  // TODO 已审核直接从node里面取数据
+                    for (int i = 0; i < mCommonApprovalFlowBean.getNodes().size(); i++) {
+                        //取名字
+                        if (!TextUtils.isEmpty(mCommonApprovalFlowBean.getNodes().get(i).getJn_dealManName())) {
+                            afpeople_names.add(mCommonApprovalFlowBean.getNodes().get(i).getJn_dealManName());
+                        } else {
+                            afpeople_names.add("");
+                        }
+                        //取头像id
+                        if (!TextUtils.isEmpty(mCommonApprovalFlowBean.getNodes().get(i).getJn_dealManId())) {
+                            em_code = mCommonApprovalFlowBean.getNodes().get(i).getJn_dealManId();
+                            if (em_code.contains(",")) {
+                                String str[] = em_code.split(",");
+                                em_code = str[0];
+//                                ToastMessage("多人审批,头像已显示为首个");   //该情况只有在测试账号情况下出现
+                            }
+                        } else {
+                            em_code = " ";
+                        }
+                        try {
+                            String whichsys = CommonUtil.getSharedPreferences(mContext, "erp_master");
+                            String[] selectionArgs = {em_code == null ? "" : em_code, whichsys};
+                            String selection = "em_code=? and whichsys=? ";
+                            //获取数据库数据
+                            EmployeesEntity bean = manager.selectForEmployee(selectionArgs, selection);
+                            if (bean != null) {
+                                String imId = String.valueOf(bean.getEm_IMID());
+                                Log.i("todo", "imId=" + imId);
+                                im_ids.add(imId);
+                            } else {
+                                im_ids.add("");
+//                                            ToastMessage("审批流头像获取异常,已显示为默认");
+                            }
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+
+                    }
+                } else if ("已提交".equals(real_status)) {
+                    String whichsys = CommonUtil.getSharedPreferences(mContext, "erp_master");
+                    if (!ListUtils.isEmpty(afpeople_names))
+                        afpeople_names.clear();
+                    if (!ListUtils.isEmpty(im_ids))
+                        im_ids.clear();
+                    // TODO 已提交状态判断是否有变更处理人,所以得先去process中判断,好麻烦噢
+                    if (!ListUtils.isEmpty(mCommonApprovalFlowBean.getProcesss()) && !ListUtils.isEmpty(mCommonApprovalFlowBean.getData())) {
+                        int processnum = mCommonApprovalFlowBean.getProcesss().size();
+                        //取process数据
+                        for (int i = 0; i < processnum; i++) {
+                            if (!TextUtils.isEmpty(mCommonApprovalFlowBean.getProcesss().get(i).getJp_nodeDealMan())) {
+                                em_code = mCommonApprovalFlowBean.getProcesss().get(i).getJp_nodeDealMan();
+                                if (em_code.contains(",")) {
+                                    String str[] = em_code.split(",");
+                                    em_code = str[0];
+//                                    ToastMessage("多人审批,头像已显示为首个");   //该情况只有在测试账号情况下出现
+                                }
+                                String[] selectionArgs = {em_code == null ? "" : em_code, whichsys};
+                                String selection = "em_code=? and whichsys=? ";
+                                try {
+                                    EmployeesEntity bean = manager.selectForEmployee(selectionArgs, selection);
+                                    if (bean != null) {
+                                        //获取数据库数据获得名字
+                                        String imName = String.valueOf(bean.getEM_NAME());
+                                        if (!StringUtil.isEmpty(imName)) {
+                                            af_name = imName;
+                                        }
+                                        //从数据库数据获得imid
+                                        String imId = String.valueOf(bean.getEm_IMID());
+                                        Log.i("todo", "imId=" + imId);
+                                        im_ids.add(imId);
+                                    } else {
+                                        im_ids.add("");
+                                    }
+                                } catch (Exception e) {
+                                    e.printStackTrace();
+                                }
+                            } else {
+                                im_ids.add("");
+                            }
+
+                            //获取process审批人姓名
+                            if (!TextUtils.isEmpty(mCommonApprovalFlowBean.getProcesss().get(i).getJp_nodeDealManName())) {
+                                afpeople_names.add(mCommonApprovalFlowBean.getProcesss().get(i).getJp_nodeDealManName());
+                            } else if (!TextUtils.isEmpty(af_name)) {
+                                afpeople_names.add(af_name);
+                            } else {
+                                afpeople_names.add("");
+                            }
+                        }
+
+                        //取data数据
+                        for (int j = processnum; j < mCommonApprovalFlowBean.getData().size(); j++) {
+                            //取process之后的审批人名字
+                            if (!TextUtils.isEmpty(mCommonApprovalFlowBean.getData().get(j).getJP_NODEDEALMANNAME())) {
+                                afpeople_names.add(mCommonApprovalFlowBean.getData().get(j).getJP_NODEDEALMANNAME());
+                            } else {
+                                afpeople_names.add("");
+                            }
+                            //取process之后的imid
+                            if (!TextUtils.isEmpty(mCommonApprovalFlowBean.getData().get(j).getJP_NODEDEALMAN())) {
+                                em_code = mCommonApprovalFlowBean.getData().get(j).getJP_NODEDEALMAN();
+                                if (em_code.contains(",")) {
+                                    String str[] = em_code.split(",");
+                                    em_code = str[0];
+//                                    ToastMessage("多人审批,头像已显示为首个");   //该情况只有在测试账号情况下出现
+                                }
+                                String[] selectionArgs = {em_code == null ? "" : em_code, whichsys};
+                                String selection = "em_code=? and whichsys=? ";
+                                try {
+                                    //获取数据库数据
+                                    EmployeesEntity bean = manager.selectForEmployee(selectionArgs, selection);
+                                    if (bean != null) {
+                                        String imId = String.valueOf(bean.getEm_IMID());
+                                        Log.i("todo", "imId=" + imId);
+                                        im_ids.add(imId);
+                                    } else {
+                                        im_ids.add("");
+//                                            ToastMessage("审批流头像获取异常,已显示为默认");
+                                    }
+                                } catch (Exception e) {
+                                    e.printStackTrace();
+                                }
+                            } else {
+                                im_ids.add("");
+                            }
+                        }
+                    }
+
+                    // TODO 标准版刚刚提交时无变更时,全部取data数据
+                    if (ListUtils.isEmpty(mCommonApprovalFlowBean.getProcesss()) && !ListUtils.isEmpty(mCommonApprovalFlowBean.getData())) {
+                        for (int i = 0; i < mCommonApprovalFlowBean.getData().size(); i++) {
+                            //取名字
+                            if (manager == null) manager = new DBManager(mContext);
+                            if (!TextUtils.isEmpty(mCommonApprovalFlowBean.getData().get(i).getJP_NODEDEALMANNAME())) {
+                                afpeople_names.add(mCommonApprovalFlowBean.getData().get(i).getJP_NODEDEALMANNAME());
+                            } else {
+                                afpeople_names.add("");
+                            }
+                            //取头像id
+                            if (!TextUtils.isEmpty(mCommonApprovalFlowBean.getData().get(i).getJP_NODEDEALMAN())) {
+                                em_code = mCommonApprovalFlowBean.getData().get(i).getJP_NODEDEALMAN();
+                                if (em_code.contains(",")) {
+                                    String str[] = em_code.split(",");
+                                    em_code = str[0];
+//                                    ToastMessage("多人审批,头像已显示为首个");   //该情况只有在测试账号情况下出现
+                                }
+                            } else {
+                                em_code = " ";
+                            }
+                            try {
+                                String[] selectionArgs = {em_code == null ? "" : em_code, whichsys};
+                                String selection = "em_code=? and whichsys=? ";
+                                //获取数据库数据
+                                EmployeesEntity bean = manager.selectForEmployee(selectionArgs, selection);
+                                if (bean != null) {
+                                    String imId = String.valueOf(bean.getEm_IMID());
+                                    Log.i("todo", "imId=" + imId);
+                                    im_ids.add(imId);
+                                } else {
+                                    im_ids.add("");
+//                                            ToastMessage("审批流头像获取异常,已显示为默认");
+                                }
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                            }
+
+                        }
+                    }
+                } else if ("已审核".equals(real_status) && mCommonApprovalFlowBean.getData().size() != 0
+                        && mCommonApprovalFlowBean.getData().size() != mCommonApprovalFlowBean.getNodes().size()) {
+                    appflow_lv.setVisibility(View.GONE);
+                }
+                Log.i("last_afpeople_names", afpeople_names.toString());
+                Log.i("last_imids", im_ids.toString());
+//                mCommonDocApprovalFlowAdapter.setIm_ids(im_ids);
+//                mCommonDocApprovalFlowAdapter.setAfpeople_names(afpeople_names);
+                // 设置数据之前先通过数据库获取到所有的imid保存到内存中
+//                mCommonDocApprovalFlowAdapter.setmCommonApprovalFlowBean(mCommonApprovalFlowBean);
+//                appflow_lv.setAdapter(mCommonDocApprovalFlowAdapter);
+
+                if (ListUtils.isEmpty(mCommonApprovalFlowBean.getData()) && ListUtils.isEmpty(mCommonApprovalFlowBean.getNodes())) {
+                    hide_above_af.setVisibility(View.GONE);
+                }
+            }
+        } catch (JSONException e) {
+            e.printStackTrace();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        handlerNode(af_result);
+        getemcodefromAF();
+    }
+
+    private void handlerNode(String message) {
+        List<Approval> approvals = ApprovaNodeUtil.handlerNode(manager, message);
+        if (!ListUtils.isEmpty(approvals)) {
+            NodeAdapter nodeAdapter = new NodeAdapter(this, approvals);
+            appflow_lv.setAdapter(nodeAdapter);
+        } else {
+            //TODO 为空时候
+        }
+        progressDialog.dismiss();
+    }
+
+    /**
+     * 申请单据申请人emcode,从审批流数据获取
+     */
+    public void getemcodefromAF() {
+
+        //  当单据是提交状态 触发审批流时获取
+        if (!ListUtils.isEmpty(mCommonApprovalFlowBean.getProcesss())) {
+            if (TextUtils.isEmpty(em_number)) {
+                em_number = mCommonApprovalFlowBean.getProcesss().get(0).getJp_launcherId();   //申请人编号 从process获取
+//                name_tv.setText(mCommonApprovalFlowBean.getProcesss().get(0).getJp_launcherName());  //申请人姓名 从process获取
+                getapplypeomsg(em_number);
+            }
+        }
+
+        // 当单据未提交 未触发审批流时,默认静态显示申请人的信息
+        if (ListUtils.isEmpty(mCommonApprovalFlowBean.getProcesss()) && TextUtils.isEmpty(em_number)) {
+            String en_code = CommonUtil.getSharedPreferences(ct, "erp_username");
+            manager = new DBManager(ct);
+            try {
+                List<EmployeesEntity> db = manager.select_getEmployee(
+                        new String[]{CommonUtil.getSharedPreferences(ct, "erp_master"),
+                                CommonUtil.getSharedPreferences(ct, "erp_username")}
+                        , "whichsys=? and em_code=? ");
+
+                if (!ListUtils.isEmpty(db)) {
+                    section_tv.setText(db.get(0).getEM_DEPART() + ">" + db.get(0).getEM_POSITION());
+                    AvatarHelper.getInstance().displayAvatar(String.valueOf(db.get(0).getEm_IMID()), photo_im, true);
+                    if (!StringUtil.isEmpty(db.get(0).getEM_NAME())) {
+                        name_tv.setText(db.get(0).getEM_NAME());
+                    } else {
+                        name_tv.setText(MyApplication.getInstance().mLoginUser.getNickName());
+                    }
+                } else {
+                    String em_name = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_emname");
+                    name_tv.setText(em_name);
+                    String loginUserId = MyApplication.getInstance().mLoginUser.getUserId();
+                    AvatarHelper.getInstance().display(loginUserId, photo_im, true, false);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+        // 界面下面的按钮操作
+        if ((!ListUtils.isEmpty(mCommonApprovalFlowBean.getNodes()) && !ListUtils.isEmpty(mCommonApprovalFlowBean.getData()) &&
+                mCommonApprovalFlowBean.getData().size() == mCommonApprovalFlowBean.getNodes().size())
+                && mCommonApprovalFlowBean.getNodes().get(mCommonApprovalFlowBean.getNodes().size() - 1).getJn_dealResult().equals("同意")) {
+            resanddel_ll.setVisibility(View.GONE);
+            approval_ll.setVisibility(View.GONE);
+        } else {
+            approval_ll.setVisibility(View.GONE);
+            resubmit_ll.setOnClickListener(new View.OnClickListener() { // 重新提交
+                @Override
+                public void onClick(View v) {
+
+                    if (ListUtils.isEmpty(mCommonApprovalFlowBean.getProcesss())
+                            && ListUtils.isEmpty(mCommonApprovalFlowBean.getNodes())
+                            && ListUtils.isEmpty(mCommonApprovalFlowBean.getData())) {  //在录入状态不反提交
+
+                        startActivity(new Intent(CommonCityIndustryDetailsActivity.this, DataFormDetailActivity.class)
+                                .putExtra("caller", mCaller)
+                                .putExtra("id", mkeyValue)
+                                .putExtra("submittype", "dosubmit"));
+
+
+                    } else {  //已提交状态可进行反提交
+                        new AlertDialog
+                                .Builder(mContext)
+                                .setTitle(getString(R.string.common_notice))
+                                .setMessage(getString(R.string.daily_resubmit_notice1))
+                                .setNegativeButton(getString(R.string.common_cancel), null)
+                                .setPositiveButton(getString(R.string.common_sure), new DialogInterface.OnClickListener() {
+                                    @Override
+                                    public void onClick(DialogInterface dialog, int which) {
+                                        Map<String, Object> params = new HashMap<>();
+                                        params.put("caller", mCaller);
+                                        params.put("id", mkeyValue);
+                                        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+                                        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+                                        String url = "";
+                                        if ("ExtraWork$".equals(mCaller)) { // 新的加班单反提交
+                                            url = CommonUtil.getAppBaseUrl(ct) + "/hr/attendance/resSubmitExtraWork.action";
+                                            ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, NEW_DOC_RESUB_SUCCESSFUL, null, null, "post");
+
+                                        } else if ("FeePlease!FYBX".equals(mCaller)) { // 报销单
+                                            url = CommonUtil.getAppBaseUrl(ct) + "oa/fee/resSubmitFeePlease.action";
+                                            ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, 0x01, null, null, "post");
+                                        } else { // 通用老的反提交
+                                            url = CommonUtil.getAppBaseUrl(ct) + "/mobile/commonres.action";
+                                            ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, COM_DOC_RESUB_SUCCESSFUL, null, null, "post");
+                                        }
+
+                                    }
+                                }).show();
+                    }
+
+                }
+            });
+
+        }
+
+        // 删除
+        delete_ll.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+                if (!TextUtils.isEmpty(real_status) && real_status.equals("在录入")) {
+                    new AlertDialog
+                            .Builder(mContext)
+                            .setTitle(getString(R.string.common_notice))
+                            .setMessage(getString(R.string.delete_doc_notice2))
+                            .setNegativeButton(getString(R.string.common_cancel), null)
+                            .setPositiveButton(getString(R.string.common_sure), new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+                                    DeleteComDocRequest(mCaller, mkeyValue);
+                                }
+                            }).show();
+                } else if (!TextUtils.isEmpty(real_status) && real_status.equals("已提交")) {
+                    new AlertDialog
+                            .Builder(mContext)
+                            .setTitle(getString(R.string.common_notice))
+                            .setMessage(getString(R.string.delete_sumited_notice1))
+                            .setNegativeButton(getString(R.string.common_cancel), null)
+                            .setPositiveButton(getString(R.string.common_sure), new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {  //反提交
+                                    progressDialog.show();
+
+                                    Map<String, Object> params = new HashMap<>();
+                                    params.put("caller", mCaller);
+                                    params.put("id", mkeyValue);
+                                    LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+                                    headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+                                    String url = "";
+                                    if ("ExtraWork$".equals(mCaller)) { // 新的加班单反提交
+                                        url = CommonUtil.getAppBaseUrl(ct) + "/hr/attendance/resSubmitExtraWork.action";
+                                        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, New_DOC_REDELETE_SUCCESSFUL, null, null, "post");
+                                    } else if ("FeePlease!FYBX".equals(mCaller)) {
+                                        url = CommonUtil.getAppBaseUrl(ct) + "oa/fee/resSubmitFeePlease.action";
+                                        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, 0x02, null, null, "post");
+                                    } else { // 通用老的反提交s
+                                        url = CommonUtil.getAppBaseUrl(ct) + "/mobile/commonres.action";
+                                        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, COM_DOC_REDELETE_SUCCESSFUL, null, null, "post");
+                                    }
+                                }
+                            }).show();
+                }
+            }
+        });
+    }
+
+    private void getapplypeomsg(String em_number) {
+        if (!em_number.isEmpty()) {
+            String whichsys = CommonUtil.getSharedPreferences(mContext, "erp_master");
+            String[] selectionArgs = {em_number == null ? "" : em_number, whichsys};
+            String selection = "em_code=? and whichsys=? ";
+            try {
+                //获取数据库数据
+                EmployeesEntity bean = manager.selectForEmployee(selectionArgs, selection);
+                if (bean != null) {
+                    String imId = String.valueOf(bean.getEm_IMID());
+                    String imName = String.valueOf(bean.getEM_NAME());
+                    String imDepartment = String.valueOf(bean.getEM_DEPART());
+                    String imPosition = String.valueOf(bean.getEM_POSITION());
+
+                    name_tv.setText(imName);
+                    if (!StringUtil.isEmpty(imId)) {
+                        AvatarHelper.getInstance().display(imId, photo_im, true, false);
+                    } else {
+                        String imageUri = "drawable://" + R.drawable.common_header_boy;
+                        AvatarHelper.getInstance().display(imageUri, photo_im, true);
+                    }//显示圆角图片
+                    section_tv.setText(imDepartment + ">" + imPosition);
+
+                    Log.i("aptodo", "imId=" + imId + "imName" + imName + "imDepartment" + imDepartment + "imPosition" + imPosition);
+                } else {
+//                    ToastMessage("单据申请人数据获取异常");
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+        progressDialog.dismiss();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (manager != null) {
+            manager.closeDB();
+        }
+    }
+
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if ((keyCode == KeyEvent.KEYCODE_BACK)) {
+            if (ActivityUtils.isExsitMianActivity(mContext, CommonFormListActivity.class)) {
+                LogUtil.d("正常返回...");
+                if ("1".equals(update)) {
+                    startActivity(new Intent(mContext, CommonFormListActivity.class)
+                            .putExtra("serveId", mServiceId)
+                            .putExtra("caller", mCaller)
+                            .putExtra("title", mTitle)
+                            .putExtra("update", update));
+                    finish();
+                } else {
+                    onBackPressed();
+                }
+            } else {
+                LogUtil.d("非正常返回..." + update);
+                if ("1".equals(update)) {
+                    CommonFormListActivity.reload = true;
+                } else {
+                    CommonFormListActivity.reload = false;
+                }
+                startActivity(
+                        new Intent(mContext, CommonFormListActivity.class)
+                                .putExtra("serveId", mServiceId)
+                                .putExtra("caller", mCaller)
+                                .putExtra("title", mTitle));
+                finish();
+            }
+            return false;
+        } else {
+            return super.onKeyDown(keyCode, event);
+        }
+
+    }
+
+    /**
+     * 图片适配器
+     */
+    private class GridViewAdapter extends BaseAdapter {
+        private String fb_attachs[];
+
+        public String[] getFb_attachs() {
+            return fb_attachs;
+        }
+
+        public void setFb_attachs(String[] fb_attachs) {
+            this.fb_attachs = fb_attachs;
+        }
+
+        @Override
+        public int getCount() {
+            return getFb_attachs() == null ? 0 : getFb_attachs().length;
+        }
+
+        @Override
+        public Object getItem(int position) {
+            return position;
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public int getViewTypeCount() {
+            return 1;
+        }
+
+        @Override
+        public int getItemViewType(int position) {
+            return position;
+        }
+
+        @Override
+        public View getView(final int position, View convertView, ViewGroup parent) {
+            SquareCenterImageView imageView = new SquareCenterImageView(ct);
+            imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
+            int id = CommonUtil.getNumByString(getFb_attachs()[position]);
+            ImageLoader.getInstance().displayImage(getImageUrl(id), imageView);
+            return imageView;
+        }
+    }
+
+    private String fb_attachs[] = {};
+
+    /**
+     * 获取报销单的发票并显示
+     *
+     * @param formdataArray
+     */
+    private void showExP(JSONArray formdataArray) {
+        if (formdataArray != null && "FeePlease!FYBX".equals(mCaller)) {
+            try {
+                String fb_attach = formdataArray.getJSONObject(0).getString("fb_attach");
+                Log.i("fb_attachshow", fb_attach + "show");
+                if (fb_attach == null || "null".equals(fb_attach) || fb_attach.length() <= 0) {
+                    ex_invoice_ll.setVisibility(View.GONE);
+                } else {
+                    fb_attachs = fb_attach.split(";");
+                    mAdapter.setFb_attachs(fb_attachs);
+                    grid_view.deferNotifyDataSetChanged();
+                    ex_invoice_ll.setVisibility(View.VISIBLE);
+                }
+            } catch (JSONException e) {
+                e.printStackTrace();
+            }
+        } else {
+            return;
+        }
+
+        grid_view.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                int mPosition = (int) parent.getItemIdAtPosition(position);
+                Intent intent = new Intent("com.modular.tool.SingleImagePreviewActivity");
+                intent.putExtra(AppConstant.EXTRA_IMAGE_URI,
+                        getImageUrl(CommonUtil.getNumByString(fb_attachs[position])));
+                startActivity(intent);
+                Log.i("P_position", mPosition + "");
+            }
+        });
+    }
+
+    private String getImageUrl(int id) {
+        return CommonUtil.getAppBaseUrl(ct) + "common/downloadbyId.action?id=" + id + "&sessionId=" +
+                CommonUtil.getSharedPreferences(ct, "sessionId") +
+                "&sessionUser=" + CommonUtil.getSharedPreferences(ct, "erp_username") +
+                "&master=" + CommonUtil.getSharedPreferences(ct, "erp_master");
+    }
+}

+ 28 - 24
app_modular/appworks/src/main/java/com/uas/appworks/activity/CommonDataFormActivity.java

@@ -24,7 +24,6 @@ import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -159,7 +158,7 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
                             ArrayList<Data> itemData = new ArrayList<>();
                             ArrayList<Data> itemDataNet = new ArrayList<>();//传输给配置界面
                             String value = iter.next();
-                            
+
                             for (int i = 0; i < forms.size(); i++) {
                                 JSONObject items = forms.getJSONObject(i);
                                 Data data = new Data();
@@ -597,10 +596,15 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
                 if (mContext == null) return;
                 LogUtil.d("当前线程是:" + CommonUtil.isMainThread());
                 if (formid == 0) {
-                    startActivity(new Intent(mContext, CommonDocDetailsActivity.class)
-                            .putExtra("caller", caller)
+                    startActivity(new Intent(mContext,
+                            CommonCityIndustryDetailsActivity.class)
+                            .putExtra("title", getSupportActionBar().getTitle().toString())
                             .putExtra("keyValue", va_id)
-                            .putExtra("status", "已提交"));
+                            .putExtra("serve_id", mServeId));
+//                    startActivity(new Intent(mContext, CommonDocDetailsActivity.class)
+//                            .putExtra("caller", caller)
+//                            .putExtra("keyValue", va_id)
+//                            .putExtra("status", "已提交"));
                 } else {
                     startActivity(new Intent(mContext, CommonDocDetailsActivity.class)
                             .putExtra("caller", caller)
@@ -758,13 +762,13 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
         if (CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "erp_master")
                 .equals("USOFTSYS")) {
             if (PreferenceUtils.getBoolean(AppConfig.IS_ADMIN, false)) {
-                menu.findItem(R.id.oa_signin_set).setVisible(true);
+                menu.findItem(R.id.oa_signin_set).setVisible(false);
             } else {
                 menu.findItem(R.id.oa_signin_set).setVisible(false);
             }
         } else {
             if (PreferenceUtils.getBoolean(AppConfig.IS_ADMIN, false)) {
-                menu.findItem(R.id.oa_signin_set).setVisible(true);
+                menu.findItem(R.id.oa_signin_set).setVisible(false);
             } else {
                 menu.findItem(R.id.oa_signin_set).setVisible(false);
             }
@@ -809,7 +813,7 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
                     0x25);
         } else if (item.getItemId() == R.id.oa_leave) {
             startActivity(new Intent(mContext, CommonFormListActivity.class)
-                    .putExtra("serveId",mServeId)
+                    .putExtra("serveId", mServeId)
                     .putExtra("caller", caller)
                     .putExtra("title", getSupportActionBar().getTitle().toString()));
             if (formid != 0) {
@@ -1098,8 +1102,8 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
                     HashMap<String, Object> results = isLastItem(position);
                     final Integer categoryIndex = (Integer) results.get("categoryIndex");
                     model.text.setText(data.getName());
-                    
-                    if ("F".equals(data.getReadonly()) || 
+
+                    if ("F".equals(data.getReadonly()) ||
                             "necessaryField".equals(data.getReadonly())) {
                         model.editText.setHint("请输入(必填)");
                     } else {
@@ -1109,8 +1113,8 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
                             data.getType().equals("C") ||
                             data.getType().equals("MF") ||
                             data.getType().equals("SF") ||
-                            data.getType().equals("DF")||
-                            data.getType().equals("RG")||
+                            data.getType().equals("DF") ||
+                            data.getType().equals("RG") ||
                             data.getType().equals("CBG")) {
                         model.editText.setKeyListener(null);
                         model.editText.setFocusable(false);
@@ -1177,19 +1181,19 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
                             }
                             //单选,多选处理
                             if (data.getType().equals("MF") || data.getType().equals("SF")
-                                    ||data.getType().equals("RG")||
+                                    || data.getType().equals("RG") ||
                                     data.getType().equals("CBG")) {
                                 ArrayList<SelectBean> formBeaan = new ArrayList<>();
-                                String logicType=   data.getFd_logictype();
-                                String [] items=logicType.split(";");
-                                for (int i = 0; i <items.length ; i++) {
+                                String logicType = data.getFd_logictype();
+                                String[] items = logicType.split(";");
+                                for (int i = 0; i < items.length; i++) {
                                     SelectBean selectBean = new SelectBean();
                                     selectBean.setName(items[i]);
                                     formBeaan.add(selectBean);
                                 }
                                 Intent intent = new Intent(ct, SelectActivity.class);
                                 intent.putExtra("type", 2);//本地数据加载
-                                if (data.getType().equals("SF")||data.getType().equals("RG")) {
+                                if (data.getType().equals("SF") || data.getType().equals("RG")) {
                                     intent.putExtra("isSingle", true);
                                 } else {
                                     intent.putExtra("isSingle", false);
@@ -1417,7 +1421,7 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
                             muiltCallerMainTain(vaules, value);//维修申请单特殊处理
                         }
                         if ("SF".equals(vaules.getType()) || "DF".equals(vaules.getType())
-                                ||"RG".equals(vaules.getType())||"CBG".equals(vaules.getType())) {
+                                || "RG".equals(vaules.getType()) || "CBG".equals(vaules.getType())) {
                             mulitSelectUpdate(b, vaules);//联动字段选择
                         }
                         mulitAsk4Leave(b, vaules, value);//请假单特殊处理
@@ -1459,7 +1463,7 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
             case 0x21://多选
                 if (data == null) return;
                 ArrayList<SelectBean> muliData = data.getParcelableArrayListExtra("data");
-                LogUtil.d("HttpLogs","muliData:"+JSON.toJSONString(muliData));
+                LogUtil.d("HttpLogs", "muliData:" + JSON.toJSONString(muliData));
                 int id = data.getIntExtra("id", 0);
                 if (requestCode == id && resultCode == 0x21) {//多选框
                     StringBuilder str = new StringBuilder("");
@@ -1475,9 +1479,9 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
                         }
                     }
                     LogUtil.d(str.toString());
-                    mAdapter.getmListData().get(0).getDatas().get(id-1).setValue(str.toString());
+                    mAdapter.getmListData().get(0).getDatas().get(id - 1).setValue(str.toString());
                     //Toast.makeText(ct, "下拉项:" + datas.get(id - 1).getName() + "返回值:" + str.toString(), Toast.LENGTH_LONG).show();
-                   // mAdapter.get
+                    // mAdapter.get
                     mAdapter.notifyDataSetChanged();
                 }
                 break;
@@ -1677,10 +1681,10 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
      */
     private void mulitSelectUpdate(SelectBean b, Data vaules) {
         JSONObject jdata = JSON.parseObject(b.getJson());
-       
+
         Data tdata = JSON.parseObject(b.getObject(), Data.class);
-        mAdapter.getmListData().get(vaules.getGroupId()).getDatas().get(b.getId()-1).setValue(b.getName());
-        
+        mAdapter.getmListData().get(vaules.getGroupId()).getDatas().get(b.getId() - 1).setValue(b.getName());
+
         if (caller.equals("StandbyApplication")) {
             String cu_name = jdata.getString("cu_name");
             int sa_custname = 0;

+ 5 - 11
app_modular/appworks/src/main/java/com/uas/appworks/activity/CommonFormListActivity.java

@@ -41,7 +41,6 @@ import com.core.widget.VoiceSearchView;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
-import com.uas.appworks.OA.erp.activity.CommonDocDetailsActivity;
 import com.uas.appworks.OA.erp.activity.ExpenseReimbursementActivity;
 import com.uas.appworks.OA.erp.activity.form.DataFormDetailActivity;
 import com.uas.appworks.R;
@@ -181,7 +180,7 @@ public class CommonFormListActivity extends BaseActivity implements View.OnClick
         Intent intent = getIntent();
         caller = intent.getStringExtra("caller");
         from = intent.getStringExtra("from");
-        serveId=intent.getStringExtra("serveId");
+        serveId = intent.getStringExtra("serveId");
         if ("Ask4Leave".equals(caller)) {
             getSupportActionBar().setTitle("请假单");
         }
@@ -404,11 +403,7 @@ public class CommonFormListActivity extends BaseActivity implements View.OnClick
                 if (itemMap.get(statusKey) == null) {
 //                    ToastMessage("单据状态为空!");
 //                    return;
-                } 
-                LogUtil.d("状态:" + itemMap.get(statusKey)
-                        .toString());
-//                status = itemMap.get(statusKey)
-//                        .toString();
+                }
                 status = "无状态";
                 LogUtil.d("caller:" + caller + "  id:" + id);
                 if ("在录入".equals(status)) {
@@ -427,11 +422,10 @@ public class CommonFormListActivity extends BaseActivity implements View.OnClick
                     }
                 } else {
                     startActivity(new Intent(mContext,
-                            CommonDocDetailsActivity.class)
-                            .putExtra("caller", caller)
+                            CommonCityIndustryDetailsActivity.class)
                             .putExtra("title", getSupportActionBar().getTitle().toString())
                             .putExtra("keyValue", keyId)
-                            .putExtra("status", status));
+                            .putExtra("serve_id", serveId));
                 }
 
             }
@@ -544,7 +538,7 @@ public class CommonFormListActivity extends BaseActivity implements View.OnClick
         Map<String, String> params = new HashMap<String, String>();
         params.put("page", page);
         params.put("pageSize", size);
-        params.put("serve_id",serveId);
+        params.put("serve_id", serveId);
         params.put("sessionId", CommonUtil.getSharedPreferences(this, "sessionId"));
         String result = null;
         try {

+ 13 - 1
app_modular/appworks/src/main/java/com/uas/appworks/adapter/CityIndustryParentAdapter.java

@@ -1,9 +1,11 @@
 package com.uas.appworks.adapter;
 
 import android.content.Context;
+import android.content.Intent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
 
@@ -51,12 +53,22 @@ public class CityIndustryParentAdapter extends BaseAdapter {
         return convertView;
     }
 
-    private void initializeViews(CityIndustryMenuBean object, ViewHolder holder) {
+    private void initializeViews(final CityIndustryMenuBean object, ViewHolder holder) {
         holder.cityIndustryParentTitleTv.setText(object.getSt_name());
         if (object.getServes() != null) {
             mCityIndustryChildAdapter = new CityIndustryChildAdapter(mContext, object.getServes());
             holder.cityIndustryParentGv.setAdapter(mCityIndustryChildAdapter);
         }
+
+        holder.cityIndustryParentGv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                Intent intent = new Intent("com.modular.work.CommonDataFormActivity");
+                intent.putExtra("serve_id", object.getServes().get(position).getSv_id() + "");
+                intent.putExtra("title", object.getServes().get(position).getSv_name() + "");
+                mContext.startActivity(intent);
+            }
+        });
     }
 
     protected class ViewHolder {

+ 2 - 2
app_modular/appworks/src/main/java/com/uas/appworks/adapter/WorkFuncSetChildAdapter.java

@@ -49,7 +49,7 @@ public class WorkFuncSetChildAdapter extends RecyclerView.Adapter<WorkFuncSetChi
     }
 
     @Override
-    public void onBindViewHolder(ChildViewHolder holder, final int position) {
+    public void onBindViewHolder(final ChildViewHolder holder, final int position) {
         holder.mTextView.setText(mModuleListBeans.get(position).getMenuName());
         if (TextUtils.isEmpty(mModuleListBeans.get(position).getMenuIcon())) {
             holder.mImageView.setImageResource(R.drawable.defaultpic);
@@ -66,7 +66,7 @@ public class WorkFuncSetChildAdapter extends RecyclerView.Adapter<WorkFuncSetChi
         holder.mCheckBox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
-                mModuleListBeans.get(position).setIsHide(!b);
+                mModuleListBeans.get(holder.getLayoutPosition()).setIsHide(!b);
                 /*if (mOnVisibleChangeListener != null) {
                     mOnVisibleChangeListener.onVisibleChange(b, position);
                 }*/

+ 2 - 2
app_modular/appworks/src/main/java/com/uas/appworks/adapter/WorkFuncSetParentAdapter.java

@@ -29,7 +29,6 @@ public class WorkFuncSetParentAdapter extends RecyclerView.Adapter<WorkFuncSetPa
     private List<WorkMenuBean> mWorkMenuBeans;
     private LayoutInflater mLayoutInflater;
     private Resources mResources;
-    private ItemTouchHelper mItemTouchHelper;
 
     public List<WorkMenuBean> getWorkMenuBeans() {
         return mWorkMenuBeans;
@@ -58,7 +57,7 @@ public class WorkFuncSetParentAdapter extends RecyclerView.Adapter<WorkFuncSetPa
         holder.parentRecyclerView.setLayoutManager(new GridLayoutManager(mContext, 4));
         holder.parentRecyclerView.setAdapter(childAdapter);
 
-        mItemTouchHelper = new ItemTouchHelper(new ItemTouchHelper.Callback() {
+        ItemTouchHelper mItemTouchHelper = new ItemTouchHelper(new ItemTouchHelper.Callback() {
             @Override
             public int getMovementFlags(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
                 //首先回调的方法 返回int表示是否监听该方向
@@ -120,6 +119,7 @@ public class WorkFuncSetParentAdapter extends RecyclerView.Adapter<WorkFuncSetPa
                 viewHolder.itemView.setScaleY(1.0f);
             }
         });
+
         mItemTouchHelper.attachToRecyclerView(holder.parentRecyclerView);
 
         childAdapter.setOnVisibleChangeListener(new WorkFuncSetChildAdapter.OnVisibleChangeListener() {

+ 1 - 1
app_modular/appworks/src/main/java/com/uas/appworks/adapter/WorkModuleSortAddAdapter.java

@@ -113,7 +113,7 @@ public class WorkModuleSortAddAdapter extends RecyclerView.Adapter<WorkModuleSor
             public void onClick(View view) {
                 if (mOnDeleteItemClickListener != null) {
                     msg.setModuleVisible(false);
-                    mOnDeleteItemClickListener.onDeleteItemClick(view, position);
+                    mOnDeleteItemClickListener.onDeleteItemClick(view, holder.getLayoutPosition());
                 }
             }
         });

BIN
app_modular/appworks/src/main/res/drawable-hdpi/ic_work_city_industry_service.png


BIN
app_modular/appworks/src/main/res/drawable-xhdpi/ic_work_city_industry_service.png


BIN
app_modular/appworks/src/main/res/drawable-xxhdpi/ic_work_city_industry_service.png


+ 1 - 0
app_modular/appworks/src/main/res/values-en/strings.xml

@@ -37,4 +37,5 @@
     <string name="module_not_start_using">未启用的功能模块</string>
     <string name="work_module_custom">模块自定义</string>
     <string name="work_func_set">应用设置</string>
+    <string name="city_industry_service">产城服务</string>
 </resources>

+ 1 - 0
app_modular/appworks/src/main/res/values-zh-rCN/strings.xml

@@ -37,4 +37,5 @@
     <string name="module_not_start_using">未启用的功能模块</string>
     <string name="work_module_custom">模块自定义</string>
     <string name="work_func_set">应用设置</string>
+    <string name="city_industry_service">产城服务</string>
 </resources>

+ 1 - 0
app_modular/appworks/src/main/res/values-zh-rTW/strings.xml

@@ -37,4 +37,5 @@
     <string name="module_not_start_using">未启用的功能模块</string>
     <string name="work_module_custom">模块自定义</string>
     <string name="work_func_set">应用设置</string>
+    <string name="city_industry_service">产城服务</string>
 </resources>

+ 1 - 0
app_modular/appworks/src/main/res/values/strings.xml

@@ -44,4 +44,5 @@
     <string name="module_not_start_using">未启用的功能模块</string>
     <string name="work_module_custom">模块自定义</string>
     <string name="work_func_set">应用设置</string>
+    <string name="city_industry_service">产城服务</string>
 </resources>