Merge branch 'feature' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature_bitliker

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Wed Apr 04 09:21:24 CST 2018
-debugName=278
-versionName=626
-debugCode=278
-versionCode=165
+#Wed Apr 04 18:00:37 CST 2018
+debugName=283
+versionName=627
+debugCode=283
+versionCode=167

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

@@ -49,7 +49,6 @@ import com.core.widget.SquareCenterImageView;
 import com.core.widget.view.MyGridView;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.uas.appworks.CRM.erp.activity.DeviceDataFormAddActivity;
-import com.uas.appworks.CRM.erp.activity.TravelBusinessActivity;
 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;
@@ -132,6 +131,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
     private String real_status;
     private String emCode;
     private String mTitle;
+    private String statusKey;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -154,6 +154,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
         if (intent != null) {
             device = intent.getBooleanExtra("device", false);
             message = intent.getBooleanExtra("message", false);
+            statusKey=intent.getStringExtra("statusKey");
         }
 
         platform = ApiUtils.getApiModel() instanceof ApiPlatform;
@@ -347,7 +348,10 @@ public class CommonDocDetailsActivity extends BaseActivity {
                     onBackPressed();
                 } else {
                     LogUtil.d("非正常返回...");
-                    startActivity(new Intent(mContext, FormListSelectActivity.class).putExtra("caller", mCaller).putExtra("title", mTitle));
+                    startActivity(new Intent(mContext, FormListSelectActivity.class)
+                            .putExtra("caller", mCaller)
+                            .putExtra("statusKey",statusKey)
+                            .putExtra("title", mTitle));
                     finish();
                 }
             }
@@ -1181,8 +1185,11 @@ public class CommonDocDetailsActivity extends BaseActivity {
                 if (ActivityUtils.isExsitMianActivity(mContext, FormListSelectActivity.class)) {
                     LogUtil.d("正常返回...");
                     if ("1".equals(update)) {
-                        startActivity(new Intent(mContext, FormListSelectActivity.class).putExtra("caller", mCaller)
-                                .putExtra("update", update).putExtra("title", mTitle));
+                        startActivity(new Intent(mContext, FormListSelectActivity.class)
+                                .putExtra("caller", mCaller)
+                                .putExtra("update", update)
+                                .putExtra("statusKey",statusKey)
+                                .putExtra("title", mTitle));
                         finish();
                     } else {
                         onBackPressed();
@@ -1196,7 +1203,9 @@ public class CommonDocDetailsActivity extends BaseActivity {
                     }
                     startActivity(
                             new Intent(mContext, FormListSelectActivity.class)
-                                    .putExtra("caller", mCaller).putExtra("title", mTitle));
+                                    .putExtra("caller", mCaller)
+                                    .putExtra("statusKey",statusKey)
+                                    .putExtra("title", mTitle));
                     finish();
                 }
             }

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

@@ -154,6 +154,7 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
     private String caller;
     private String status;
     private int currentPosition;
+    private String statusKey;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -164,42 +165,22 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
         mEmptyLayout = new EmptyLayout(this, mlistview.getRefreshableView());
         mEmptyLayout.setEmptyButtonClickListener(mErrorClickListener);
         initView();
-        LogUtil.d("onCreate()");
         initData();
     }
 
     private void initIDs() {
-        mlistview = (PullToRefreshListView) findViewById(R.id.lv_sale_list);
-        voiceSearchView = (VoiceSearchView) findViewById(R.id.voiceSearchView);
-        ivDeleteText = (ImageView) findViewById(R.id.iv_DeleteText);
+        mlistview = findViewById(R.id.lv_sale_list);
+        voiceSearchView =findViewById(R.id.voiceSearchView);
+        ivDeleteText = findViewById(R.id.iv_DeleteText);
     }
 
-
+    private static final String TAG = "FormListSelectActivity";
     private void initView() {
         Intent intent = getIntent();
         caller = intent.getStringExtra("caller");
         from = intent.getStringExtra("from");
-        if ("Ask4Leave".equals(caller)) {
-            getSupportActionBar().setTitle("请假单");
-        }
-        if ("SpeAttendance".equals(caller)) {
-            getSupportActionBar().setTitle("特殊考勤");
-        }
-        if ("FeePlease!CCSQ".equals(caller) || "FeePlease!CCSQ!new".equals(caller)) {
-            getSupportActionBar().setTitle("出差单");
-        }
-        if ("Workovertime".equals(caller) || "ExtraWork$".equals(caller)) {
-            getSupportActionBar().setTitle("加班单");
-        }
-        if ("MaterielApply".equals(caller)) {
-            getSupportActionBar().setTitle("物料申请单");
-        } else if ("MainTain".equals(caller)) {
-            getSupportActionBar().setTitle("维修申请单");
-        }
-        if ("FeePlease!FYBX".equals(caller)) {
-            getSupportActionBar().setTitle("费用报销");
-        }
-
+        statusKey  =intent.getStringExtra("statusKey");
+        LogUtil.d(TAG,"statusKey:"+statusKey);
         if (!StringUtil.isEmpty(intent.getStringExtra("title"))) {
             getSupportActionBar().setTitle(intent.getStringExtra("title"));
         }
@@ -208,12 +189,13 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
         String master = CommonUtil.getSharedPreferences(
                 FormListSelectActivity.this, "master");
         key = user + master + caller;
-        // getSupportActionBar().setTitle(intent.getStringExtra("mTitle"));
         calendar = Calendar.getInstance();
         sBroadcast = new StateBroadcast();
+        
         IntentFilter intentFilter = new IntentFilter();
         intentFilter.addAction("com.erp.sale.dataupdate");
         registerReceiver(sBroadcast, intentFilter);
+        
         mlistview.setFilterTouchEvents(false);
         mlistview.setMode(PullToRefreshBase.Mode.BOTH);
         mlistview.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
@@ -226,9 +208,6 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
                 }
                 cur = 1;
                 mlistview.setMode(PullToRefreshBase.Mode.BOTH);
-//                if (adapter != null) {
-//                    adapter.notifyDataSetChanged();
-//                }
                 mEmptyLayout.showLoading();
                 String where = CommonUtil.getSharedPreferences(
                         FormListSelectActivity.this, "where");
@@ -236,11 +215,9 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
                         FormListSelectActivity.this, key);
 
                 if ("Ask4Leave".equals(caller)) {
-
                     condition = "va_emcode='" + CommonUtil.getSharedPreferences(ct, "erp_username") + "'";
 
                 } else if ("SpeAttendance".equals(caller)) {
-
                     condition = "sa_appmancode='" + CommonUtil.getSharedPreferences(ct, "erp_username") + "'";
 
                 } else if ("Workovertime".equals(caller) || "ExtraWork$".equals(caller)) {
@@ -303,9 +280,7 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
             }
         });
 
-        /**
-         * 搜索框监听事件
-         */
+     
 
         voiceSearchView.addTextChangedListener(new TextWatcher() {
             @Override
@@ -335,7 +310,8 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
             }
         });
 
-        /** @注释：已显示单据点击监听 */
+        
+        
         mlistview.setOnItemClickListener(new AdapterView.OnItemClickListener() {
 
             @Override
@@ -344,28 +320,30 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
                 currentPosition = position;
                 String keyField = (String) rMap.get("keyField");
                 String pfField = (String) rMap.get("pfField");
-                String statusKey="";
-                if ("Ask4Leave".equals(caller)) {
-                    statusKey = "va_status";
-                } else if ("SpeAttendance".equals(caller)) {
-                    statusKey = "sa_status";
-                } else if ("Workovertime".equals(caller) || "ExtraWork$".equals(caller)) {
-                    statusKey = "wo_status";
-                } else if ("FeePlease!CCSQ".equals(caller) || "FeePlease!CCSQ!new".equals(caller)) {
-                    statusKey = "fp_status";
-                } else if ("StandbyApplication".equals(caller)) {
-                    statusKey = "sa_status";
-                } else if ("MaterielApply".equals(caller)) {
-                    statusKey = "ama_status";
-                } else if ("MainTain".equals(caller)) {
-                    statusKey = "mt_status";
-                    getSupportActionBar().setTitle("维修申请单");
-                } else if ("FeePlease!FYBX".equals(caller)) {
-                    statusKey = "fp_status";
-                } else {
-                    statusKey = "ct_status";
+//                String statusKey="";
+//                if ("Ask4Leave".equals(caller)) {
+//                    statusKey = "va_status";
+//                } else if ("SpeAttendance".equals(caller)) {
+//                    statusKey = "sa_status";
+//                } else if ("Workovertime".equals(caller) || "ExtraWork$".equals(caller)) {
+//                    statusKey = "wo_status";
+//                } else if ("FeePlease!CCSQ".equals(caller) || "FeePlease!CCSQ!new".equals(caller)) {
+//                    statusKey = "fp_status";
+//                } else if ("StandbyApplication".equals(caller)) {
+//                    statusKey = "sa_status";
+//                } else if ("MaterielApply".equals(caller)) {
+//                    statusKey = "ama_status";
+//                } else if ("MainTain".equals(caller)) {
+//                    statusKey = "mt_status";
+//                    getSupportActionBar().setTitle("维修申请单");
+//                } else if ("FeePlease!FYBX".equals(caller)) {
+//                    statusKey = "fp_status";
+//                } else {
+//                    statusKey = "ct_status";
+//                }
+                if (StringUtil.isEmpty(statusKey)){
+                    statusKey="ct_status";
                 }
-                //防错处理
                 if (StringUtil.isEmpty(pfField)) {
                     pfField = keyField;
                 }
@@ -374,14 +352,11 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
                 }
                 List<Object> rList = (List<Object>) rMap.get("listdata");
                 @SuppressWarnings("unchecked")
-                Map<String, Object> itemMap = (Map<String, Object>) rList
-                        .get(position - 1);
+                Map<String, Object> itemMap = (Map<String, Object>) rList.get(position - 1);
                 int keyId = 0;
                 if (itemMap.get(keyField) != null) {
-                    keyId = Integer.valueOf(itemMap.get(keyField)
-                            .toString());
+                    keyId = Integer.valueOf(itemMap.get(keyField).toString());
                 }
-
                 if (itemMap.get(statusKey) == null) {
                     ToastMessage("单据状态为空！");
                     return;
@@ -439,8 +414,6 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
         mEmptyLayout.setShowErrorButton(false);
         mEmptyLayout.setShowLoadingButton(false);
         isdelete = false;
-
-
     }
 
 
@@ -520,7 +493,6 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
     protected void onDestroy() {
         super.onDestroy();
         unregisterReceiver(sBroadcast);
-        LogUtil.d("onDestroy()");
     }
 
     public class GetSaleData implements Runnable {
@@ -745,8 +717,7 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
                         ly.addView(rLayout);
 
 
-                        ly.setBackgroundDrawable(ct.getResources().getDrawable(
-                                R.drawable.shape_linear_detail));
+                        ly.setBackgroundDrawable(ct.getResources().getDrawable(R.drawable.shape_linear_detail));
                         convertView.setTag(tViews);
                     }
                 }