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/DataInquiryListActivity.java

@@ -55,6 +55,7 @@ import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -185,6 +186,9 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                                     }
                                 }
 
+                                Collections.sort(mAllSchemeConditions);
+                                Collections.sort(mAppSchemeConditions);
+
                                 try {
                                     mResetSchemeConditionBeans = deepCopy(mAppSchemeConditions);
                                 } catch (IOException e) {
@@ -252,6 +256,7 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
 
                                         for (int j = 0; j < mAllSchemeConditions.size(); j++) {
                                             String field = mAllSchemeConditions.get(j).getField();
+                                            String type = mAllSchemeConditions.get(j).getType();
                                             String value = dataObject.getString(field);
                                             if (value != null) {
                                                 DataInquiryFlexBean.RowBean.RowChildBean rowChildBean = new DataInquiryFlexBean.RowBean.RowChildBean();
@@ -259,6 +264,9 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                                                 if ("null".equals(value)) {
                                                     rowChildBean.setValue("");
                                                 } else {
+                                                    if ("D".equals(type) || "CD".equals(type)) {
+                                                        value = value.substring(0, value.length() - 8);
+                                                    }
                                                     rowChildBean.setValue(value);
                                                 }
                                                 rowChildBean.setWidth(mAllSchemeConditions.get(j).getWidth());
@@ -408,6 +416,10 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
         mExactOptionConfirmTv = (TextView) findViewById(R.id.data_inquiry_list_option_confirm_tv);
         mFuzzyViewBg = findViewById(R.id.data_inquiry_list_fuzzy_bg);
         mExactViewBg = findViewById(R.id.data_inquiry_list_exact_bg);
+
+//        mFuzzyWholeLl.setLayerType(View.LAYER_TYPE_HARDWARE, null);
+//        mExactWholeLl.setLayerType(View.LAYER_TYPE_HARDWARE, null);
+
         mHistoricalRecordBeans = new ArrayList<>();
         mAllSchemeConditions = new ArrayList<>();
         mAppSchemeConditions = new ArrayList<>();
@@ -488,9 +500,11 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                     }
 
                 } else {
-                    if (mFuzzyWholeLl.getVisibility() == View.VISIBLE)
-                        mFuzzyWholeLl.setVisibility(View.GONE);
                     CommonUtil.closeKeybord(mSearchEditText, DataInquiryListActivity.this);
+                    if (mFuzzyWholeLl.getVisibility() == View.VISIBLE) {
+                        mFuzzyWholeLl.setVisibility(View.GONE);
+                    }
+
                 }
             }
         });
@@ -540,12 +554,12 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                     mCondition = "";
                     for (int i = 0; i < mfuzzySchemeConditionBeans.size(); i++) {
                         mCondition = mCondition + "(" + mfuzzySchemeConditionBeans.get(i).getField()
-                                + " like \'%" + mSearchField + "%\') and ";
+                                + " like \'%" + mSearchField + "%\') or ";
                     }
-                    if (mCondition.length() >= 5) {
-                        mCondition = mCondition.substring(0, mCondition.length() - 5);
+                    if (mCondition.length() >= 4) {
+                        mCondition = mCondition.substring(0, mCondition.length() - 4);
+                        mCondition = "(" + mCondition + ")";
                     }
-
                     Log.d("fuzzyCondition", mCondition);
 
                     mPageIndex = 1;
@@ -562,10 +576,12 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.data_inquiry_filter_iv:
+//                CommonUtil.closeKeybord(mSearchEditText, this);
                 if (mFuzzyWholeLl.getVisibility() == View.VISIBLE) {
                     mFuzzyWholeLl.setVisibility(View.GONE);
                 }
                 mSearchEditText.clearFocus();
+                mSearchField = "";
                 if (mAppSchemeConditions.size() > 0) {
                     if (mExactWholeLl.getVisibility() == View.VISIBLE) {
                         mExactOptionLl.startAnimation(mOutAnimation);
@@ -593,8 +609,10 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                 mAppSchemeConditions.clear();
                 try {
                     List<SchemeConditionBean> conditionBeans = deepCopy(mResetSchemeConditionBeans);
-                    mAppSchemeConditions.addAll(conditionBeans);
-                    mDataInquirySchemeConditionAdapter.notifyDataSetChanged();
+                    if (conditionBeans != null) {
+                        mAppSchemeConditions.addAll(conditionBeans);
+                        mDataInquirySchemeConditionAdapter.notifyDataSetChanged();
+                    }
                 } catch (IOException e) {
                     e.printStackTrace();
                 } catch (ClassNotFoundException e) {
@@ -702,8 +720,9 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                     mCondition = mCondition + "(" + mfuzzySchemeConditionBeans.get(i).getField()
                             + " like \'%" + searchField + "%\') or ";
                 }
-                if (mCondition.length() >= 5) {
+                if (mCondition.length() >= 4) {
                     mCondition = mCondition.substring(0, mCondition.length() - 4);
+                    mCondition = "(" + mCondition + ")";
                 }
 
                 Log.d("fuzzyCondition", mCondition);

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

@@ -215,8 +215,10 @@ public class ReportQueryCriteriaActivity extends BaseActivity implements View.On
                 mReportConditionBeans.clear();
                 try {
                     List<ReportConditionBean> conditionBeans = deepCopy(mResetReportConditionBeans);
-                    mReportConditionBeans.addAll(conditionBeans);
-                    mReportQueryConditionAdapter.notifyDataSetChanged();
+                    if (conditionBeans != null) {
+                        mReportConditionBeans.addAll(conditionBeans);
+                        mReportQueryConditionAdapter.notifyDataSetChanged();
+                    }
                 } catch (IOException e) {
                     e.printStackTrace();
                 } catch (ClassNotFoundException e) {

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

@@ -59,13 +59,18 @@ public class DataInquiryFlexAdapter extends BaseAdapter {
             holder.itemDataInquiryFlexIv.setImageResource(R.drawable.ic_menu_spread);
         } else {
             holder.itemDataInquiryFlexIv.setImageResource(R.drawable.ic_menu_retract);
-            for (int i = 0; i < 2; i++) {
+            for (int i = 0; i < (object.getRowBeans().size() < 2 ? object.getRowBeans().size() : 2); i++) {
                 rowBeans.add(object.getRowBeans().get(i));
             }
         }
         DataInquiryFlexChildAdapter dataInquiryFlexChildAdapter = new DataInquiryFlexChildAdapter(context, rowBeans);
 
         holder.itemDataInquiryFlexLv.setAdapter(dataInquiryFlexChildAdapter);
+        if (rowBeans.size() < 2) {
+            holder.itemDataInquiryFlexIv.setVisibility(View.INVISIBLE);
+        } else {
+            holder.itemDataInquiryFlexIv.setVisibility(View.VISIBLE);
+        }
         holder.itemDataInquiryFlexIv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

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

@@ -63,7 +63,7 @@ public class DataInquiryMenuListAdapter extends BaseAdapter {
     }
 
     private void initializeViews(final GridMenuDataInquiryBean object, final ViewHolder holder, int position) {
-        final int gridColor = mGridColors[(position + 1) % mGridColors.length];
+        final int gridColor = mGridColors[(position) % mGridColors.length];
         holder.dataInquiryModulView.setBackgroundColor(context.getResources().getColor(gridColor));
         holder.dataInquiryModulTitleTv.setText(object.getModelName());
 

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

@@ -159,22 +159,14 @@ public class DataInquirySchemeConditionAdapter extends BaseAdapter {
                 holder.calendar1.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        showDateDialog(holder.textview1);
-                        if (object.getProperties().size() == 2) {
-                            object.getProperties().get(0).setDisplay(holder.textview1.getText().toString());
-                            object.getProperties().get(0).setValue(holder.textview1.getText().toString());
-                        }
+                        showDateDialog(holder.textview1, object, 0);
                     }
                 });
 
                 holder.calendar2.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        showDateDialog(holder.textview2);
-                        if (object.getProperties().size() == 2) {
-                            object.getProperties().get(1).setDisplay(holder.textview2.getText().toString());
-                            object.getProperties().get(1).setValue(holder.textview2.getText().toString());
-                        }
+                        showDateDialog(holder.textview2, object, 1);
                     }
                 });
                 break;
@@ -310,7 +302,7 @@ public class DataInquirySchemeConditionAdapter extends BaseAdapter {
         return simpleFormate.format(calendar.getTime());
     }
 
-    private void showDateDialog(final TextView tv) {
+    private void showDateDialog(final TextView tv, SchemeConditionBean object, int i) {
         OASigninPicker picker = new OASigninPicker((Activity) context);
         picker.setRange(CalendarUtils.getCurrentYear(), CalendarUtils.getCurrentMonth(), CalendarUtils.getCurrentDate());
         picker.setSelectedItem(CalendarUtils.getCurrentYear(), CalendarUtils.getCurrentMonth(), CalendarUtils.getCurrentDate());
@@ -319,6 +311,10 @@ public class DataInquirySchemeConditionAdapter extends BaseAdapter {
             public void setTime(String year, String month, String day) {
                 String time = year + "-" + month + "-" + day;
                 tv.setText(time);
+                if (object.getProperties().size() == 2) {
+                    object.getProperties().get(i).setDisplay(time);
+                    object.getProperties().get(i).setValue(time);
+                }
             }
         });
         picker.show();

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

@@ -159,22 +159,14 @@ public class ReportQueryConditionAdapter extends BaseAdapter {
                 holder.calendar1.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        showDateDialog(holder.textview1);
-                        if (object.getProperties().size() == 2) {
-                            object.getProperties().get(0).setDisplay(holder.textview1.getText().toString());
-                            object.getProperties().get(0).setValue(holder.textview1.getText().toString());
-                        }
+                        showDateDialog(holder.textview1, object, 0);
                     }
                 });
 
                 holder.calendar2.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        showDateDialog(holder.textview2);
-                        if (object.getProperties().size() == 2) {
-                            object.getProperties().get(1).setDisplay(holder.textview2.getText().toString());
-                            object.getProperties().get(1).setValue(holder.textview2.getText().toString());
-                        }
+                        showDateDialog(holder.textview2, object, 1);
                     }
                 });
                 break;
@@ -310,7 +302,7 @@ public class ReportQueryConditionAdapter extends BaseAdapter {
         return simpleFormate.format(calendar.getTime());
     }
 
-    private void showDateDialog(final TextView tv) {
+    private void showDateDialog(final TextView tv, ReportConditionBean object, int i) {
         OASigninPicker picker = new OASigninPicker((Activity) context);
         picker.setRange(CalendarUtils.getCurrentYear(), CalendarUtils.getCurrentMonth(), CalendarUtils.getCurrentDate());
         picker.setSelectedItem(CalendarUtils.getCurrentYear(), CalendarUtils.getCurrentMonth(), CalendarUtils.getCurrentDate());
@@ -319,6 +311,10 @@ public class ReportQueryConditionAdapter extends BaseAdapter {
             public void setTime(String year, String month, String day) {
                 String time = year + "-" + month + "-" + day;
                 tv.setText(time);
+                if (object.getProperties().size() == 2) {
+                    object.getProperties().get(i).setDisplay(time);
+                    object.getProperties().get(i).setValue(time);
+                }
             }
         });
         picker.show();

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

@@ -61,7 +61,7 @@ public class ReportStatisticsMenuListAdapter extends BaseAdapter {
     }
 
     private void initializeViews(final GridMenuReportStatisticsBean object, ViewHolder holder, int position) {
-        final int gridColor = mGridColors[(position + 1) % mGridColors.length];
+        final int gridColor = mGridColors[(position) % mGridColors.length];
         holder.dataInquiryModulView.setBackgroundColor(context.getResources().getColor(gridColor));
         holder.dataInquiryModulTitleTv.setText(object.getModelName());
 

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

@@ -6,7 +6,7 @@ import java.util.List;
 /**
  * Created by RaoMeng on 2017/8/17.
  */
-public class SchemeConditionBean implements Serializable {
+public class SchemeConditionBean implements Serializable, Comparable<SchemeConditionBean> {
     private String mPosition;
     private String mCaption;
     private String mField;
@@ -80,6 +80,23 @@ public class SchemeConditionBean implements Serializable {
         mProperties = properties;
     }
 
+    @Override
+    public int compareTo(SchemeConditionBean o) {
+        String currentPostion = this.getPosition().substring(4);
+        String comPosition = o.getPosition().substring(4);
+        int currentPos = 0;
+        int comPos = 0;
+        try {
+            currentPos = Integer.parseInt(currentPostion);
+            comPos = Integer.parseInt(comPosition);
+        } catch (Exception e) {
+
+        }
+
+        return currentPos - comPos;
+    }
+
+
     public static class Property implements Serializable {
         private String mDisplay = "";
         private String mValue = "";

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

@@ -134,8 +134,9 @@ public class HttpUtil {
                 Set<Entry<String, Object>> entrys = params.entrySet();
                 for (Map.Entry<String, Object> entry : entrys) {
                     if (entry.getValue() != null)
+                        //去掉了百分号替换方法
                         nvps.add(new BasicNameValuePair(entry.getKey(),
-                                URLDecoder.decode(URLEncoder.encode(entry.getValue().toString().replaceAll("%", ""), "utf-8"), "utf-8")));
+                                URLDecoder.decode(URLEncoder.encode(entry.getValue().toString(), "utf-8"), "utf-8")));
                     else
                         nvps.add(new BasicNameValuePair(entry.getKey(), URLDecoder.decode("", "utf-8")));
                 }

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

@@ -17,7 +17,6 @@
             android:id="@+id/item_data_inquiry_child_caption_tv1"
             android:layout_width="60dp"
             android:layout_height="match_parent"
-            android:gravity="center_vertical"
             android:textSize="14sp"
             />
 
@@ -41,7 +40,6 @@
             android:id="@+id/item_data_inquiry_child_caption_tv2"
             android:layout_width="60dp"
             android:layout_height="match_parent"
-            android:gravity="center_vertical"
             android:textSize="14sp"
             />
 

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

@@ -13,8 +13,8 @@
 
         <View
             android:id="@+id/data_inquiry_modul_view"
-            android:layout_width="10dp"
-            android:layout_height="20dp"
+            android:layout_width="8dp"
+            android:layout_height="16dp"
             android:layout_marginLeft="10dp" />
 
         <TextView

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

@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/white"
+    android:background="@drawable/selector_me_menu_item_bg"
     android:gravity="center_vertical"
     android:orientation="horizontal"
     android:padding="6dp">