产城服务备份

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon Nov 20 14:10:43 CST 2017
+#Mon Nov 20 18:23:01 CST 2017
 debugName=1
 versionName=618
-debugCode=25
+debugCode=43
 versionCode=118

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"

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>

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);
 

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

@@ -82,8 +82,8 @@ public class CommonCityIndustryDetailsActivity extends BaseActivity {
     private CommonDocAMBean mCommonDocAMBean;
     private DBManager manager;
     private List<String> im_ids;
+    private String mCaller = "";
     private int mkeyValue;
-    private String mCaller;
     private String mServiceId;
     private EmptyLayout mEmptyLayput_applymsg;
     private JSONArray formdataBeans;
@@ -120,6 +120,7 @@ public class CommonCityIndustryDetailsActivity extends BaseActivity {
     private String type_emcode;
     private String real_status;
     private String emCode;
+    private String mTitle;
 
 
     @Override
@@ -202,55 +203,26 @@ public class CommonCityIndustryDetailsActivity extends BaseActivity {
 
     private void initDate() {
         final Intent intent = getIntent();
-        mCaller = intent.getStringExtra("caller");
         mkeyValue = intent.getIntExtra("keyValue", -1);
         real_status = intent.getStringExtra("status");
         update = intent.getStringExtra("update");
-
-        //当获取到正确的单据caller和单据id时
-        if (!TextUtils.isEmpty(mCaller) && mkeyValue != -1) {
-            if ("Ask4Leave".equals(mCaller)) {
-                getSupportActionBar().setTitle(getString(R.string.oavacation_apply) + getString(R.string.doc_detail));
-            }
-            if ("FeePlease!CCSQ!new".equals(mCaller)) {
-                getSupportActionBar().setTitle(getString(R.string.oatravel_apply) + getString(R.string.doc_detail));
-            }
-            if ("Workovertime".equals(mCaller) || "ExtraWork$".equals(mCaller)) {
-                getSupportActionBar().setTitle(getString(R.string.oaovertime_apply) + getString(R.string.doc_detail));
-            }
-            if ("SpeAttendance".equals(mCaller)) {
-                getSupportActionBar().setTitle(getString(R.string.oaspecial_attendance_apply) + getString(R.string.doc_detail));
-            }
-            if ("MaterielApply".equals(mCaller)) {
-                getSupportActionBar().setTitle(getString(R.string.oamaterials_apply) + getString(R.string.doc_detail));
-            } else if ("MainTain".equals(mCaller)) {
-                getSupportActionBar().setTitle(getString(R.string.oaservice_apply) + getString(R.string.doc_detail));
-            }
-            if ("StandbyApplication".equals(mCaller)) {
-                getSupportActionBar().setTitle(getString(R.string.oaStandby_machine_apply) + getString(R.string.doc_detail));
-            } else if (!StringUtil.isEmpty(intent.getStringExtra("title"))) {
-                getSupportActionBar().setTitle(intent.getStringExtra("title") + getString(R.string.doc_detail));
-            }
-            if ("FeePlease!FYBX".equals(mCaller)) {
-                getSupportActionBar().setTitle(getString(R.string.Expense_reimbursement) + 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");
-
-
-        } else {
-            appflow_lv.setVisibility(View.GONE);
-            hide_above_af.setVisibility(View.GONE);
+        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
@@ -279,17 +251,21 @@ public class CommonCityIndustryDetailsActivity extends BaseActivity {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.add_item) {
-            startActivity(new Intent(activity, DataFormDetailActivity.class)
-                    .putExtra("caller", mCaller));
+            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, FormListSelectActivity.class)) {
+            if (ActivityUtils.isExsitMianActivity(mContext, CommonFormListActivity.class)) {
                 LogUtil.d("正常返回...");
                 onBackPressed();
             } else {
                 LogUtil.d("非正常返回...");
-                startActivity(new Intent(mContext, FormListSelectActivity.class).putExtra("caller", mCaller));
+                startActivity(new Intent(mContext, CommonFormListActivity.class)
+                        .putExtra("serveId", mServiceId)
+                        .putExtra("caller", mCaller)
+                        .putExtra("title", mTitle));
                 finish();
             }
         }
@@ -314,8 +290,8 @@ public class CommonCityIndustryDetailsActivity extends BaseActivity {
                     LogUtil.prinlnLongMsg("del_result", del_result);
                     Toast.makeText(getApplicationContext(), getString(R.string.common_delete), Toast.LENGTH_LONG).show();
                     progressDialog.dismiss();
-                    FormListSelectActivity.isdelete = true;
-                    FormListSelectActivity.reload = false;
+                    CommonFormListActivity.isdelete = true;
+                    CommonFormListActivity.reload = false;
                     finish();
                     break;
                 case NEW_DELETE_DOC_REQUEST:
@@ -324,8 +300,8 @@ public class CommonCityIndustryDetailsActivity extends BaseActivity {
                         LogUtil.prinlnLongMsg("new_delete_doc_result", new_delete_doc_result);
                         Toast.makeText(getApplicationContext(), getString(R.string.common_delete), Toast.LENGTH_LONG).show();
                         progressDialog.dismiss();
-                        FormListSelectActivity.isdelete = true;
-                        FormListSelectActivity.reload = false;
+                        CommonFormListActivity.isdelete = true;
+                        CommonFormListActivity.reload = false;
                         finish();
                     }
                     break;
@@ -544,7 +520,7 @@ public class CommonCityIndustryDetailsActivity extends BaseActivity {
         //请求获取单据审批流数据
         String url = CommonUtil.getAppBaseUrl(getApplicationContext()) + "common/getCurrentJnodes.action";
         Map<String, Object> param = new HashMap<>();
-        param.put("caller", mCaller);
+        param.put("caller", "RepairApply");
         param.put("keyValue", mkeyValue);
         param.put("_noc", mNoc);
         LinkedHashMap headers = new LinkedHashMap();
@@ -571,13 +547,13 @@ public class CommonCityIndustryDetailsActivity extends BaseActivity {
                 } else {
                     status_tv.setTextColor(getApplicationContext().getResources().getColor(R.color.no_approval));
                     status_tv.setText(getString(R.string.status_pending));
-                    resanddel_ll.setVisibility(View.VISIBLE);
+                    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.VISIBLE);
+                resanddel_ll.setVisibility(View.GONE);
             }
         }
     }
@@ -1006,10 +982,13 @@ public class CommonCityIndustryDetailsActivity extends BaseActivity {
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         if ((keyCode == KeyEvent.KEYCODE_BACK)) {
-            if (ActivityUtils.isExsitMianActivity(mContext, FormListSelectActivity.class)) {
+            if (ActivityUtils.isExsitMianActivity(mContext, CommonFormListActivity.class)) {
                 LogUtil.d("正常返回...");
                 if ("1".equals(update)) {
-                    startActivity(new Intent(mContext, FormListSelectActivity.class).putExtra("caller", mCaller)
+                    startActivity(new Intent(mContext, CommonFormListActivity.class)
+                            .putExtra("serveId", mServiceId)
+                            .putExtra("caller", mCaller)
+                            .putExtra("title", mTitle)
                             .putExtra("update", update));
                     finish();
                 } else {
@@ -1018,13 +997,15 @@ public class CommonCityIndustryDetailsActivity extends BaseActivity {
             } else {
                 LogUtil.d("非正常返回..." + update);
                 if ("1".equals(update)) {
-                    FormListSelectActivity.reload = true;
+                    CommonFormListActivity.reload = true;
                 } else {
-                    FormListSelectActivity.reload = false;
+                    CommonFormListActivity.reload = false;
                 }
                 startActivity(
-                        new Intent(mContext, FormListSelectActivity.class)
-                                .putExtra("caller", mCaller));
+                        new Intent(mContext, CommonFormListActivity.class)
+                                .putExtra("serveId", mServiceId)
+                                .putExtra("caller", mCaller)
+                                .putExtra("title", mTitle));
                 finish();
             }
             return false;

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 {

app_modular/appworks/src/main/java/com/uas/appworks/adapter/CityIndustryParentAdapter.java

@@ -65,6 +65,7 @@ public class CityIndustryParentAdapter extends BaseAdapter {
             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);
             }
         });

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() {

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>

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>

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>

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>