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

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

@@ -86,17 +86,31 @@ public class DataInquiryActivity extends BaseActivity {
     private void initDatas() {
         String dataInquiryMenuCache = CommonUtil.getSharedPreferences(this,
                 mCurrentUser + mCurrentMaster + com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.Constants.CONSTANT.DATA_INQUIRY_MENU_CACHE);
-        if (TextUtils.isEmpty(dataInquiryMenuCache)) {
+        if (dataInquiryMenuCache != null) {
+            try {
+                JSONObject resultObject = new JSONObject(dataInquiryMenuCache);
+                JSONArray dataArray = resultObject.optJSONArray("data");
+                if (dataArray == null || dataArray.length() == 0) {
+                    if (!CommonUtil.isNetWorkConnected(this)) {
+                        ToastMessage(getString(R.string.networks_out));
+                    } else {
+                        progressDialog.show();
+                        getMenuData();
+                    }
+                } else {
+                    analysisMenuData(dataInquiryMenuCache);
+                }
+            } catch (Exception e) {
+
+            }
+        } else {
             if (!CommonUtil.isNetWorkConnected(this)) {
                 ToastMessage(getString(R.string.networks_out));
             } else {
                 progressDialog.show();
                 getMenuData();
             }
-        } else {
-            analysisMenuData(dataInquiryMenuCache);
         }
-
     }
 
     private void initEvents() {

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

@@ -654,7 +654,8 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                                         property.setValue(value);
                                         property.setState(false);
 
-                                        propertyList.add(property);
+                                        if (!"$ALL".equals(display) && !"$ALL".equals(value))
+                                            propertyList.add(property);
                                     }
                                     schemeConditionBean.setProperties(propertyList);
                                 }

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

@@ -95,7 +95,8 @@ public class ReportQueryCriteriaActivity extends BaseActivity implements View.On
                                                     property.setValue(value);
                                                     property.setState(false);
 
-                                                    propertyList.add(property);
+                                                    if (!"$ALL".equals(display) && !"$ALL".equals(value))
+                                                        propertyList.add(property);
                                                 }
                                                 reportConditionBean.setProperties(propertyList);
                                             }

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

@@ -86,15 +86,30 @@ public class ReportStatisticsActivity extends BaseActivity {
     private void initDatas() {
         String reportQueryMenuCache = CommonUtil.getSharedPreferences(this,
                 mCurrentUser + mCurrentMaster + com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.Constants.CONSTANT.REPORT_QUERY_MENU_CACHE);
-        if (TextUtils.isEmpty(reportQueryMenuCache)) {
+        if (reportQueryMenuCache != null) {
+            try {
+                JSONObject resultObject = new JSONObject(reportQueryMenuCache);
+                JSONArray dataArray = resultObject.optJSONArray("data");
+                if (dataArray == null || dataArray.length() == 0) {
+                    if (!CommonUtil.isNetWorkConnected(this)) {
+                        ToastMessage(getString(R.string.networks_out));
+                    } else {
+                        progressDialog.show();
+                        getMenuData();
+                    }
+                } else {
+                    analysisMenuData(reportQueryMenuCache);
+                }
+            } catch (Exception e) {
+
+            }
+        } else {
             if (!CommonUtil.isNetWorkConnected(this)) {
                 ToastMessage(getString(R.string.networks_out));
             } else {
                 progressDialog.show();
                 getMenuData();
             }
-        } else {
-            analysisMenuData(reportQueryMenuCache);
         }
     }
 

WeiChat/src/main/res/layout/activity_data_inquiry.xml

@@ -16,6 +16,7 @@
         android:drawablePadding="6dp"
         android:gravity="center_vertical"
         android:padding="6dp"
+        android:visibility="gone"
         android:text="@string/search"/>
 
     <com.handmark.pulltorefresh.library.PullToRefreshListView