样式修改备份

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

@@ -126,10 +126,6 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                                         String defaultValue = optStringNotNull(dataObject, "defaultValue");
                                         String type = optStringNotNull(dataObject, "type");
 
-                                        if (appCondition && "S".equals(type)) {
-                                            fuzzyHint = fuzzyHint + caption + "/";
-                                        }
-
                                         if (!dataObject.isNull("properties")) {
                                             JSONArray properties = dataObject.optJSONArray("properties");
                                             if (properties != null) {
@@ -171,6 +167,8 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
 
                                             } else {
                                                 SchemeConditionBean.Property property = new SchemeConditionBean.Property();
+                                                property.setValue(defaultValue);
+                                                property.setDisplay(defaultValue);
                                                 properties.add(property);
                                             }
                                             schemeConditionBean.setProperties(properties);
@@ -208,6 +206,11 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
 
                                 mDataInquirySchemeConditionAdapter.notifyDataSetChanged();
 
+                                for (int i = 0; i < mAppSchemeConditions.size(); i++) {
+                                    if ("S".equals(mAppSchemeConditions.get(i).getType())) {
+                                        fuzzyHint = fuzzyHint + mAppSchemeConditions.get(i).getCaption() + "/";
+                                    }
+                                }
                                 if (fuzzyHint.length() > 0) {
                                     fuzzyHint = fuzzyHint.substring(0, fuzzyHint.length() - 1);
                                     mSearchEditText.setHint(fuzzyHint);
@@ -694,8 +697,8 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                 if (schemeConditionBean.getProperties().size() == 1) {
                     if (!TextUtils.isEmpty(schemeConditionBean.getProperties().get(0).getDisplay())) {
                         mCondition = mCondition + "(" + schemeConditionBean.getField()
-                                + " = \'" + schemeConditionBean.getProperties().get(0).getDisplay() + "\')"
-                                + " and ";
+                                + " like \'%" + schemeConditionBean.getProperties().get(0).getDisplay()
+                                + "%\') and ";
                     }
                 }
             }
@@ -724,6 +727,8 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                 String s = mSearchEditText.getText().toString() + CommonUtil.getPlaintext(text);
                 mSearchEditText.setText(s);
                 mSearchEditText.setSelection(s.length());
+
+                searchEvent();
             }
 
             @Override
@@ -740,38 +745,41 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
         if (actionId == EditorInfo.IME_ACTION_SEARCH
                 || actionId == EditorInfo.IME_ACTION_SEND
                 || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-            if (!CommonUtil.isNetWorkConnected(this)) {
-                ToastMessage(getString(R.string.networks_out));
-            } else {
-                String searchField = mSearchEditText.getText().toString().trim();
-                if (!TextUtils.isEmpty(searchField)) {
-                    mCondition = "";
-                    for (int i = 0; i < mfuzzySchemeConditionBeans.size(); i++) {
-                        mCondition = mCondition + "(" + mfuzzySchemeConditionBeans.get(i).getField()
-                                + " like \'%" + searchField + "%\') or ";
-                    }
-                    if (mCondition.length() >= 4) {
-                        mCondition = mCondition.substring(0, mCondition.length() - 4);
-                        mCondition = "(" + mCondition + ")";
-                    }
-
-                    Log.d("fuzzyCondition", mCondition);
+            searchEvent();
+            return true;
+        }
+        return false;
+    }
 
-                } else {
-                    mCondition = "1 = 1";
+    private void searchEvent() {
+        if (!CommonUtil.isNetWorkConnected(this)) {
+            ToastMessage(getString(R.string.networks_out));
+        } else {
+            String searchField = mSearchEditText.getText().toString().trim();
+            if (!TextUtils.isEmpty(searchField)) {
+                mCondition = "";
+                for (int i = 0; i < mfuzzySchemeConditionBeans.size(); i++) {
+                    mCondition = mCondition + "(" + mfuzzySchemeConditionBeans.get(i).getField()
+                            + " like \'%" + searchField + "%\') or ";
+                }
+                if (mCondition.length() >= 4) {
+                    mCondition = mCondition.substring(0, mCondition.length() - 4);
+                    mCondition = "(" + mCondition + ")";
                 }
-                mPageIndex = 1;
-                mSearchField = searchField;
-                mSearchEditText.clearFocus();
-                mFuzzyWholeLl.setVisibility(View.GONE);
-                mHistoryDataLv.setEnabled(false);
-                progressDialog.show();
-                getSchemeData();
-            }
 
-            return true;
+                Log.d("fuzzyCondition", mCondition);
+
+            } else {
+                mCondition = "1 = 1";
+            }
+            mPageIndex = 1;
+            mSearchField = searchField;
+            mSearchEditText.clearFocus();
+            mFuzzyWholeLl.setVisibility(View.GONE);
+            mHistoryDataLv.setEnabled(false);
+            progressDialog.show();
+            getSchemeData();
         }
-        return false;
     }
 
     private void getSchemeData() {

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

@@ -38,7 +38,7 @@ public class PDFDownloadActivity extends BaseActivity implements View.OnClickLis
     private RelativeLayout mDownloadRelativeLayout;
     private LinearLayout mErrorLinearLayout;
     private String downloadUrl = "", mReportName = "";
-    private String mCondition;
+    private String mCondition, mTitle;
 
     private Handler mHandler = new Handler() {
         @Override
@@ -131,8 +131,12 @@ public class PDFDownloadActivity extends BaseActivity implements View.OnClickLis
         if (intent != null) {
             mCondition = intent.getStringExtra("condition");
             mReportName = intent.getStringExtra("reportName");
+            mTitle = intent.getStringExtra("title");
         }
 
+        if (mTitle != null)
+            getSupportActionBar().setTitle(mTitle);
+
 //        downloadUrl = com.xzjmyk.pm.activity.ui.erp.util.Constants.getAppBaseUrl(this)
 //                + "report/pdf/data?u=" + CommonUtil.getSharedPreferences(ct, "erp_master")
 //                + "&pf=phone&r=" + mReportName + "&w=" + mCondition;

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

@@ -53,7 +53,7 @@ public class ReportQueryCriteriaActivity extends BaseActivity implements View.On
     private ListView mOptionListView;
     private TextView mCancelTextView, mResetTextView, mConfirmTextView;
     private GridMenuReportStatisticsBean.ListBean mReportInfo;
-    private String mCondition = "";
+    private String mCondition = "", mDefaultCondition = "";
     private List<ReportConditionBean> mReportConditionBeans, mResetReportConditionBeans;
     private ReportQueryConditionAdapter mReportQueryConditionAdapter;
 
@@ -68,6 +68,7 @@ public class ReportQueryCriteriaActivity extends BaseActivity implements View.On
                         LogUtil.prinlnLongMsg("querycriteria", msg.getData().getString("result"));
                         try {
                             JSONObject resultObject = new JSONObject(result);
+                            mDefaultCondition = optStringNotNull(resultObject, "defaultCondition");
                             JSONArray conditionArray = resultObject.optJSONArray("listCondition");
                             if (conditionArray != null) {
                                 String fuzzyHint = "";
@@ -108,10 +109,10 @@ public class ReportQueryCriteriaActivity extends BaseActivity implements View.On
                                             } else if ("D".equals(type) || "CD".equals(type)) {
                                                 for (int m = 0; m < 2; m++) {
                                                     ReportConditionBean.Property property = new ReportConditionBean.Property();
-                                                    if (m == 0){
+                                                    if (m == 0) {
                                                         property.setDisplay(getMonthFirstDay());
                                                         property.setValue(getMonthFirstDay());
-                                                    }else if (m == 1){
+                                                    } else if (m == 1) {
                                                         property.setDisplay(getMonthLastDay());
                                                         property.setValue(getMonthLastDay());
                                                     }
@@ -186,6 +187,10 @@ public class ReportQueryCriteriaActivity extends BaseActivity implements View.On
         if (intent != null) {
             mReportInfo = (GridMenuReportStatisticsBean.ListBean) intent.getSerializableExtra("reportinfo");
         }
+
+        if (mReportInfo != null) {
+            getSupportActionBar().setTitle(mReportInfo.getTitle() == null ? "" : mReportInfo.getTitle());
+        }
     }
 
     private void initEvents() {
@@ -330,17 +335,19 @@ public class ReportQueryCriteriaActivity extends BaseActivity implements View.On
 
         Log.d("exactCondition", mCondition);
 
+
+        Intent intent = new Intent();
+        intent.setClass(this, PDFDownloadActivity.class);
         if (mCondition.length() == 0) {
-            ToastMessage("请确认报表查询条件");
+            intent.putExtra("condition", mDefaultCondition);
         } else {
-            Intent intent = new Intent();
-            intent.setClass(this, PDFDownloadActivity.class);
             intent.putExtra("condition", mCondition);
-            if (mReportInfo != null)
-                intent.putExtra("reportName", mReportInfo.getReportName());
-
-            startActivity(intent);
         }
+        if (mReportInfo != null) {
+            intent.putExtra("reportName", mReportInfo.getReportName());
+            intent.putExtra("title", mReportInfo.getTitle());
+        }
+        startActivity(intent);
     }
 
     public String optStringNotNull(JSONObject json, String key) {

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

@@ -52,11 +52,16 @@ public class DataInquiryFlexChildAdapter extends BaseAdapter {
             convertView = layoutInflater.inflate(R.layout.item_list_data_inquiry_child, null);
             convertView.setTag(new ViewHolder(convertView));
         }
-        initializeViews((DataInquiryFlexBean.RowBean) getItem(position), (ViewHolder) convertView.getTag());
+        initializeViews((DataInquiryFlexBean.RowBean) getItem(position), (ViewHolder) convertView.getTag(), position);
         return convertView;
     }
 
-    private void initializeViews(DataInquiryFlexBean.RowBean object, ViewHolder holder) {
+    private void initializeViews(DataInquiryFlexBean.RowBean object, ViewHolder holder, int position) {
+        if (position == getCount() - 1 && getCount() > 2) {
+            LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(holder.itemDataInquiryChildCaptionTv1.getLayoutParams());
+            layoutParams.setMargins(0, 0, 0, 2);
+            holder.itemDataInquiryChildCaptionTv1.setLayoutParams(layoutParams);
+        }
         if (object.getRowChildBeans().size() == 1) {
             holder.itemDataInquiryChildLl2.setVisibility(View.GONE);
 

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

@@ -348,7 +348,7 @@ public class DataInquirySchemeConditionAdapter extends BaseAdapter {
 
                 strChanged = true;
                 if (mProperties != null && object.getProperties().size() == 1) {
-                    holder.stringEdittext.setText(mProperties.get(0).getDisplay());
+                    holder.stringEdittext.setText(object.getDefaultValue());
                     strChanged = false;
                 }
 

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

@@ -53,7 +53,7 @@ public class ItemGridDataInquiryExactAdapter extends BaseAdapter {
     private void initializeViews(SchemeConditionBean.Property object, ViewHolder holder) {
         holder.itemDataInquiryExactGridTv.setText(object.getDisplay());
         if (object.isState()) {
-            holder.itemDataInquiryExactGridTv.setTextColor(context.getResources().getColor(R.color.blue));
+            holder.itemDataInquiryExactGridTv.setTextColor(context.getResources().getColor(R.color.data_inquiry_gird_menu_color1));
         } else {
             holder.itemDataInquiryExactGridTv.setTextColor(context.getResources().getColor(android.R.color.black));
         }

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/shape_corner_shallow_blue_bg" android:state_selected="true"/>
-    <item android:drawable="@drawable/shape_corner_shallow_blue_bg" android:state_pressed="true"/>
-    <item android:drawable="@drawable/shape_corner_shallow_blue_bg" android:state_checked="true"/>
-    <item android:drawable="@drawable/shape_corner_white_bg"/>
+    <item android:drawable="@drawable/shape_corner_deep_blue_bg" android:state_selected="true"/>
+    <item android:drawable="@drawable/shape_corner_deep_blue_bg" android:state_pressed="true"/>
+    <item android:drawable="@drawable/shape_corner_deep_blue_bg" android:state_checked="true"/>
+    <item android:drawable="@drawable/shape_blue_corner_white_bg"/>
 </selector>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/me_menu_item_press" android:state_checked="true"/>
+    <item android:drawable="@color/me_menu_item_press" android:state_pressed="true"/>
+    <item android:drawable="@color/me_menu_item_press" android:state_selected="true"/>
+
+    <item android:drawable="@color/white"/>
+</selector>

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <corners android:radius="6dp"/>
+    <stroke
+        android:width="1dp"
+        android:color="@color/titleBlue"/>
+    <solid android:color="@color/white"/>
+</shape>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
-    <corners android:radius="10dp"/>
-    <solid android:color="@color/LightBlue"/>
+    <corners android:radius="6dp"/>
+    <solid android:color="#2386cb"/>
 </shape>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
-    <corners android:radius="10dp"/>
+    <corners android:radius="6dp"/>
     <solid android:color="@color/titleBlue"/>
 </shape>

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
-    <corners android:radius="10dp"/>
+    <corners android:radius="6dp"/>
     <stroke
         android:width="1dp"
-        android:color="@color/titleBlue"/>
+        android:color="#cfcfcf"/>
     <solid android:color="@color/white"/>
 </shape>

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

@@ -8,8 +8,8 @@
 
     <ImageView
         android:id="@+id/back"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
         android:layout_centerVertical="true"
         android:src="@drawable/ic_action_back"/>
 

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

@@ -9,5 +9,7 @@
     <ListView
         android:id="@+id/data_inquiry_menu_lv"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent"
+        android:divider="@color/gray_light"
+        android:dividerHeight="1dp"/>
 </LinearLayout>

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

@@ -33,6 +33,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@color/white"
+                android:clickable="true"
                 android:orientation="horizontal"
                 android:padding="16dp">
 
@@ -92,12 +93,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@color/background"
-                android:orientation="horizontal"
-                android:paddingBottom="20dp"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp"
                 android:clickable="true"
-                android:paddingTop="10dp">
+                android:orientation="horizontal"
+                android:padding="10dp">
 
                 <TextView
                     android:id="@+id/data_inquiry_list_option_cancel_tv"

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

@@ -3,6 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="#faf9f9"
     android:orientation="vertical">
 
     <LinearLayout
@@ -27,16 +28,16 @@
         android:id="@+id/report_query_criteria_lv"
         android:layout_width="match_parent"
         android:layout_height="0dp"
+        android:layout_marginTop="10dp"
         android:layout_weight="1"/>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="@color/background"
+        android:clickable="true"
         android:orientation="horizontal"
-        android:paddingBottom="20dp"
-        android:paddingLeft="10dp"
-        android:paddingRight="10dp"
-        android:paddingTop="10dp">
+        android:padding="10dp">
 
         <TextView
             android:id="@+id/report_query_criteria_cancel_btn"

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

@@ -2,15 +2,14 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="46dp">
+    android:layout_height="wrap_content">
 
     <TextView
         android:id="@+id/item_data_inquiry_exact_grid_tv"
         android:layout_width="match_parent"
-        android:layout_height="46dp"
-        android:background="@drawable/selector_me_menu_item_bg"
-        android:gravity="center"
-        android:maxLines="2"
+        android:layout_height="wrap_content"
+        android:background="@drawable/selector_datainquiry_grid_item_bg"
         android:padding="6dp"
+        android:singleLine="true"
         android:textSize="14sp"/>
 </LinearLayout>

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

@@ -21,12 +21,11 @@
     <TextView
         android:id="@+id/grid_data_inquiry_menu_content"
         android:layout_width="match_parent"
-        android:layout_height="50dp"
+        android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
+        android:ellipsize="end"
         android:gravity="center_horizontal"
-        android:maxHeight="200dp"
-        android:maxLines="3"
-        android:minHeight="20dp"
+        android:lines="2"
         android:textSize="14sp"
         tools:text="BOM"/>
 </LinearLayout>

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

@@ -16,7 +16,10 @@
         <TextView
             android:id="@+id/item_data_inquiry_child_caption_tv1"
             android:layout_width="60dp"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="2"
+            android:textColor="@color/data_inquiry_caption_textcolor"
             android:textSize="14sp"
             />
 
@@ -25,7 +28,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_marginLeft="6dp"
-            android:gravity="center_vertical"
+            android:textColor="@color/data_inquiry_value_textcolor"
             android:textSize="14sp"/>
     </LinearLayout>
 
@@ -39,7 +42,10 @@
         <TextView
             android:id="@+id/item_data_inquiry_child_caption_tv2"
             android:layout_width="60dp"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="2"
+            android:textColor="@color/data_inquiry_caption_textcolor"
             android:textSize="14sp"
             />
 
@@ -48,9 +54,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_marginLeft="6dp"
-            android:gravity="center_vertical"
+            android:textColor="@color/data_inquiry_value_textcolor"
             android:textSize="14sp"/>
     </LinearLayout>
 
-
 </LinearLayout>

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

@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               xmlns:tools="http://schemas.android.com/tools"
               android:layout_width="match_parent"
-              android:layout_height="wrap_content"
+              android:layout_height="100dp"
               android:descendantFocusability="beforeDescendants"
               android:gravity="center_vertical"
               android:orientation="horizontal"
@@ -11,10 +11,14 @@
     <TextView
         android:id="@+id/item_data_inquiry_exact_caption_tv"
         android:layout_width="80dp"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:textSize="16sp"
+        android:layout_height="36dp"
+        android:layout_gravity="left"
         android:layout_marginRight="10dp"
+        android:gravity="center_vertical"
+        android:maxLines="2"
+        android:paddingLeft="6dp"
+        android:ellipsize="end"
+        android:textSize="14sp"
         tools:text="caption"/>
 
     <EditText
@@ -22,7 +26,8 @@
         android:layout_width="match_parent"
         android:layout_height="36dp"
         android:background="@drawable/shape_corner_white_bg"
-        android:gravity="center"
+        android:gravity="center_vertical"
+        android:paddingLeft="10dp"
         android:textSize="14sp"
         android:visibility="gone"/>
 
@@ -40,9 +45,10 @@
             android:layout_height="36dp"
             android:layout_weight="1"
             android:background="@drawable/shape_corner_white_bg"
-            android:gravity="center"
-            android:textSize="14sp"
-            android:inputType="number"/>
+            android:gravity="center_vertical"
+            android:inputType="number"
+            android:paddingLeft="10dp"
+            android:textSize="14sp"/>
 
         <TextView
             android:layout_width="wrap_content"
@@ -58,10 +64,11 @@
             android:layout_width="0dp"
             android:layout_height="36dp"
             android:layout_weight="1"
-            android:textSize="14sp"
             android:background="@drawable/shape_corner_white_bg"
-            android:gravity="center"
-            android:inputType="number"/>
+            android:gravity="center_vertical"
+            android:inputType="number"
+            android:paddingLeft="10dp"
+            android:textSize="14sp"/>
     </LinearLayout>
 
     <LinearLayout
@@ -76,7 +83,7 @@
             android:layout_width="0dp"
             android:layout_height="36dp"
             android:layout_weight="1"
-            android:background="@drawable/shape_corner_white_bg"
+            android:background="@drawable/shape_blue_corner_white_bg"
             android:gravity="center_vertical">
 
             <TextView
@@ -84,8 +91,8 @@
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:textSize="14sp"
                 android:gravity="center"
+                android:textSize="14sp"
                 tools:text="2017-08-15"/>
 
             <ImageView
@@ -107,7 +114,7 @@
             android:layout_width="0dp"
             android:layout_height="36dp"
             android:layout_weight="1"
-            android:background="@drawable/shape_corner_white_bg"
+            android:background="@drawable/shape_blue_corner_white_bg"
             android:gravity="center_vertical">
 
             <TextView

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="8dp"
-            android:layout_height="16dp"
+            android:layout_width="6dp"
+            android:layout_height="12dp"
             android:layout_marginLeft="10dp" />
 
         <TextView

WeiChat/src/main/res/values/colors.xml

@@ -335,4 +335,6 @@
     <color name="data_inquiry_gird_menu_color4">#f57474</color>
     <color name="data_inquiry_gird_menu_color5">#8bd67f</color>
     <color name="data_inquiry_gird_menu_color6">#68d2c9</color>
+    <color name="data_inquiry_caption_textcolor">#999999</color>
+    <color name="data_inquiry_value_textcolor">#333333</color>
 </resources>