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

# Conflicts:
#	WeiChat/build.gradle

WeiChat/build.gradle

@@ -13,7 +13,7 @@ android {
     }
     signingConfigs {
         config {
-            storeFile file('D:/config/applicationsignname[20150409]')
+            storeFile file('C:/Users/Arison/Desktop/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

WeiChat/src/main/AndroidManifest.xml

@@ -765,7 +765,6 @@
         <activity android:name=".ui.erp.activity.form.DataFormFieldActivity" />
         <activity
             android:name=".ui.erp.activity.form.FormListSelectActivity"
-            android:hardwareAccelerated="false"
             android:launchMode="singleTask"
             android:windowSoftInputMode="adjustPan" />
         <activity

WeiChat/src/main/java/com/xzjmyk/pm/activity/CustomCrashActivity.java

@@ -8,6 +8,8 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
 
+import com.afollestad.materialdialogs.MaterialDialog;
+
 import cat.ereza.customactivityoncrash.CustomActivityOnCrash;
 
 /**
@@ -33,8 +35,8 @@ public class CustomCrashActivity extends Activity {
         stackTraceString = CustomActivityOnCrash.getAllErrorDetailsFromIntent(this,intent);
         if (stackTraceString != null){
             //Toast.makeText(this, stackTraceString, Toast.LENGTH_LONG).show();
-//            new MaterialDialog.Builder(this).content(stackTraceString)
-//                    .build().show();
+            new MaterialDialog.Builder(this).content(stackTraceString)
+                    .build().show();
         }
         final Class<? extends Activity> activityClassFromIntent = CustomActivityOnCrash.getRestartActivityClassFromIntent(intent);
         final CustomActivityOnCrash.EventListener listenerFromIntent = CustomActivityOnCrash.getEventListenerFromIntent(intent);

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

@@ -102,6 +102,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
     private String emCode;
     private View hide_above_af;
     private String last_status;
+    private String update;
 
 
     @Override
@@ -178,6 +179,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
         mCaller = intent.getStringExtra("caller");
         mkeyValue = intent.getIntExtra("keyValue", -1);
         real_status = intent.getStringExtra("status");
+        update=  intent.getStringExtra("update");
         Log.i("mCaller", mCaller);
         Log.isLoggable("keyValue", mkeyValue);
         Log.i("real_status", real_status);
@@ -272,6 +274,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
                     LogUtil.prinlnLongMsg("del_result", del_result);
                     Toast.makeText(getApplicationContext(), "单据删除成功", Toast.LENGTH_LONG).show();
                     FormListSelectActivity.isdelete = true;
+                    FormListSelectActivity.reload=false;
                     finish();
                     break;
                 case COM_DOC_RESUB_SUCCESSFUL:  //已提交状态 重新提交操作前的反提交
@@ -283,7 +286,10 @@ public class CommonDocDetailsActivity extends BaseActivity {
                             startActivity(new Intent(CommonDocDetailsActivity.this, DataFormDetailActivity.class)
                                     .putExtra("caller", mCaller)
                                     .putExtra("id", mkeyValue)
-                                    .putExtra("submittype", "resubmit"));
+                                    .putExtra("submittype", "resubmit")
+                                    .putExtra("status","已提交"));
+
+                            finish();
                         }
                     }
                     break;
@@ -845,10 +851,23 @@ public class CommonDocDetailsActivity extends BaseActivity {
         if ((keyCode == KeyEvent.KEYCODE_BACK)) {
             if (ActivityUtils.isExsitMianActivity(mContext, FormListSelectActivity.class)) {
                 LogUtil.d("正常返回...");
-                onBackPressed();
+                if ("1".equals(update)){
+                    startActivity(new Intent(mContext, FormListSelectActivity.class).putExtra("caller", mCaller)
+                            .putExtra("update", update));
+                    finish();
+                }else{
+                    onBackPressed();
+                }
             } else {
-                LogUtil.d("非正常返回...");
-                startActivity(new Intent(mContext, FormListSelectActivity.class).putExtra("caller", mCaller));
+                LogUtil.d("非正常返回..."+update);
+                if ("1".equals(update)){
+                    FormListSelectActivity.reload=true;
+                }else{
+                    FormListSelectActivity.reload=false;
+                }
+                startActivity(
+                        new Intent(mContext, FormListSelectActivity.class)
+                                .putExtra("caller", mCaller));
                 finish();
             }
             return false;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/form/DataFormDetailActivity.java

@@ -432,8 +432,14 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                             mHandler.postDelayed(new Runnable() {
                                 @Override
                                 public void run() {
+                                    startActivity(new Intent(mContext, CommonDocDetailsActivity.class)
+                                            .putExtra("caller", caller)
+                                            .putExtra("keyValue", formid)
+                                            .putExtra("update", "1")
+                                            .putExtra("status", "已提交"));
 
                                     finish();
+                                    overridePendingTransition(R.anim.anim_activity_in, R.anim.anim_activity_out);
                                 }
                             }, 2000);
 
@@ -469,13 +475,14 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
 
         initData();
     }
-
+    private String status;
     private void initView() {
         ViewUtils.inject(this);
         Intent intent = getIntent();
         formid = 0;
         if (intent != null) {
             formid = intent.getIntExtra("id", 0);
+            status= intent.getStringExtra("status");
             if (!StringUtils.isEmpty(intent.getStringExtra("caller"))) {
                 caller = intent.getStringExtra("caller");
                 if ("Ask4Leave".equals(caller)) {
@@ -1652,6 +1659,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
      * @author：Arison on 2016/11/22
      */
     public void updateData(String formStore, String gridStore) {
+        progressDialog.show();
         btn_update.setEnabled(false);
         String url = Constants.getAppBaseUrl(ct) + "/mobile/commonUpdate.action";
         Map<String, Object> params = new HashMap<>();
@@ -1675,7 +1683,17 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         if ((keyCode == KeyEvent.KEYCODE_BACK)) {
-            return super.onKeyDown(keyCode, event);
+            if ("在录入".equals(status)){
+                //不刷新列表
+                FormListSelectActivity.reload=false;
+                return super.onKeyDown(keyCode, event);
+            }else if ("已提交".equals(status)){
+                //刷新列表---必须要刷新列表
+                   FormListSelectActivity.reload=true;
+                return super.onKeyDown(keyCode, event);
+            }else{
+                return super.onKeyDown(keyCode, event);
+            }
         } else {
             return super.onKeyDown(keyCode, event);
         }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/form/FormListSelectActivity.java

@@ -408,13 +408,14 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
                     startActivity(new Intent(mContext,
                             DataFormDetailActivity.class)
                             .putExtra("caller", caller)
+                            .putExtra("status", status)
                             .putExtra("id", keyId));
                 }else{
                     startActivity(new Intent(mContext,
                             CommonDocDetailsActivity.class)
                             .putExtra("caller", caller)
                             .putExtra("keyValue", keyId)
-                            .putExtra("status",status));
+                            .putExtra("status", status));
                 }
   
             }
@@ -466,23 +467,32 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
         super.onStart();
     }
 
+    
+    public static  boolean reload=false;
     @Override
     protected void onResume() {
         super.onResume();
-        try {
-            if (currentPosition!=0&&isdelete){
-                LogUtil.d(String.valueOf(currentPosition));
-                List<Object>  lists=(List<Object>)rMap.get("listdata");
-                lists.remove(currentPosition-1);
-                rMap.put("listdata", lists);
-                adapter.notifyDataSetChanged();
-                if (adapter.getCount()==0){
-                    mEmptyLayout.showEmpty();
+        LogUtil.d("onResume intent:"+reload);
+        if (reload){
+            initData();
+        }else{
+            try {
+                if (currentPosition!=0&&isdelete){
+                    LogUtil.d(String.valueOf(currentPosition));
+                    List<Object>  lists=(List<Object>)rMap.get("listdata");
+                    lists.remove(currentPosition-1);
+                    rMap.put("listdata", lists);
+                    LogUtil.d("onResume:"+JSON.toJSONString(lists));
+                    adapter.notifyDataSetChanged();
+                    if (adapter.getCount()==0){
+                        mEmptyLayout.showEmpty();
+                    }
                 }
+            } catch (Exception e) {
+                e.printStackTrace();
             }
-        } catch (Exception e) {
-            e.printStackTrace();
         }
+       
         LogUtil.d("onResume()");
     }
 
@@ -745,7 +755,7 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
                 @Override
                 protected FilterResults performFiltering(CharSequence constraint) {
                     FilterResults searchResults = new FilterResults();
-                    @SuppressWarnings("unchecked")
+                  
                     List<Object> tList = ((List<Object>) dMap.get("listdata"));
                     if (constraint == null || constraint.length() == 0) {
                         searchResults.values = dMap;
@@ -770,14 +780,14 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
                                 }
                             }
                         }
-                        LogUtil.d(JSON.toJSONString(tList));
+                       // LogUtil.d(JSON.toJSONString(tList));
                         //循环遍历values
                         List<Object> nList = new ArrayList<Object>();
                         for (int i = 0; i < tList.size(); i++) {
                             @SuppressWarnings("unchecked")
                             HashMap<String, Object> t = (HashMap<String, Object>) tList
                                     .get(i);
-                            LogUtil.d(JSON.toJSONString(searchkey));
+//                            LogUtil.d(JSON.toJSONString(searchkey));
                             if (searchkey != null && searchkey.size() != 0) {
                                 for (int j = 0; j < searchkey.size(); j++) {
                                     if (t.get(searchkey.get(j))
@@ -787,7 +797,7 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
                                                     constraint.toString()
                                                             .toLowerCase())) {
                                         nList.add(t);
-                                        LogUtil.d(JSON.toJSONString(t));
+                                       // LogUtil.d(JSON.toJSONString(t));
                                         break;
                                     }
                                 }
@@ -795,7 +805,7 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
 
                         }
                         teMap.put("listdata", nList);
-                        LogUtil.d("preare:" + JSON.toJSONString(nList));
+                        //LogUtil.d("preare:" + JSON.toJSONString(nList));
                         searchResults.values = teMap;
                         searchResults.count = nList.size();
                     }
@@ -807,6 +817,7 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
                 protected void publishResults(CharSequence constraint,
                                               FilterResults results) {
                     data = (Map<String, Object>) results.values;
+                    LogUtil.d("遍历过后的数据："+JSON.toJSONString(data));
                     rMap = data;//传递数据源
                     if (adapter.getCount() == 0) {
                         mEmptyLayout.showEmpty();

WeiChat/src/main/res/drawable/bg_bule_btn.xml

@@ -7,6 +7,13 @@
             <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
         </shape>
     </item>
+    <item android:state_enabled="false">
+        <shape>
+            <solid android:color="@color/btn_orange_press" />
+            <corners android:radius="8dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
     <item>
         <shape>
             <solid android:color="@color/titleBlue" />