数据查询接口对接

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

@@ -1,17 +1,36 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.datainquiry;
 
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
 import android.widget.ListView;
 
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.Constants;
+import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Created by RaoMeng on 2017/8/3.
  * 选择查询业务菜单页面
  */
 public class DataInquiryActivity extends BaseActivity {
+    private final int GET_MENU_DATA = 0x08;
     private ListView mMenuListView;
+    private List<GridMenuDataInquiryBean> mGridMenuDataInquiryBeans;
+    private DataInquiryMenuListAdapter mDataInquiryMenuListAdapter;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -20,5 +39,96 @@ public class DataInquiryActivity extends BaseActivity {
         getSupportActionBar().setTitle(R.string.select_query_service);
 
         mMenuListView = (ListView) findViewById(R.id.data_inquiry_menu_lv);
+        mGridMenuDataInquiryBeans = new ArrayList<>();
+        mDataInquiryMenuListAdapter = new DataInquiryMenuListAdapter(this, mGridMenuDataInquiryBeans);
+        mMenuListView.setAdapter(mDataInquiryMenuListAdapter);
+
+        getMenuData();
+    }
+
+    private void getMenuData() {
+        progressDialog.show();
+        String url = Constants.getAppBaseUrl(this) + "/mobile/qry/queryJsp.action";
+        Map<String, Object> params = new HashMap<>();
+        params.put("emcode", CommonUtil.getSharedPreferences(ct, "erp_username"));
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(this, url, params, mHandler, headers, GET_MENU_DATA, null, null, "get");
+    }
+
+    private Handler mHandler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+                case GET_MENU_DATA:
+                    progressDialog.dismiss();
+                    String result = msg.getData().getString("result");
+                    if (result != null) {
+                        LogUtil.prinlnLongMsg("menudata", result);
+                        try {
+                            JSONObject resultObject = new JSONObject(result);
+                            JSONArray dataArray = resultObject.optJSONArray("data");
+                            if (dataArray != null) {
+                                for (int i = 0; i < dataArray.length(); i++) {
+                                    JSONObject dataObject = dataArray.optJSONObject(i);
+                                    if (dataObject != null) {
+                                        GridMenuDataInquiryBean gridMenuDataInquiryBean = new GridMenuDataInquiryBean();
+                                        String modelName = optStringNotNull(dataObject, "modelName");
+                                        gridMenuDataInquiryBean.setModelName(modelName);
+                                        JSONArray listArray = dataObject.optJSONArray("list");
+                                        if (listArray != null) {
+                                            List<GridMenuDataInquiryBean.QueryScheme> querySchemes = new ArrayList<>();
+                                            for (int j = 0; j < listArray.length(); j++) {
+                                                JSONObject listObject = listArray.optJSONObject(j);
+                                                if (listObject != null) {
+                                                    String title = optStringNotNull(listObject, "title");
+                                                    String caller = optStringNotNull(listObject, "caller");
+                                                    JSONArray schemeArray = listObject.optJSONArray("schemes");
+                                                    if (schemeArray != null) {
+                                                        for (int k = 0; k < schemeArray.length(); k++) {
+                                                            JSONObject schemeObject = schemeArray.optJSONObject(k);
+                                                            if (schemeObject != null) {
+                                                                String scheme = optStringNotNull(schemeObject, "scheme");
+                                                                String schemeId = optStringNotNull(schemeObject, "schemeId");
+
+                                                                GridMenuDataInquiryBean.QueryScheme queryScheme = new GridMenuDataInquiryBean.QueryScheme();
+                                                                queryScheme.setTitle(title);
+                                                                queryScheme.setCaller(caller);
+                                                                queryScheme.setScheme(scheme);
+                                                                queryScheme.setSchemeId(schemeId);
+
+                                                                querySchemes.add(queryScheme);
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                            gridMenuDataInquiryBean.setQuerySchemes(querySchemes);
+                                        }
+                                        mGridMenuDataInquiryBeans.add(gridMenuDataInquiryBean);
+                                    }
+                                }
+                                mDataInquiryMenuListAdapter.notifyDataSetChanged();
+                            }
+                        } catch (JSONException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                    break;
+                case Constants.APP_SOCKETIMEOUTEXCEPTION:
+                    progressDialog.dismiss();
+                    ToastMessage(msg.getData().getString("result"));
+                    break;
+            }
+        }
+    };
+
+
+    public String optStringNotNull(JSONObject json, String key) {
+        if (json.isNull(key)) {
+            return "";
+        } else {
+            return json.optString(key, "");
+        }
     }
 }

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

@@ -1,28 +1,36 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.datainquiry;
 
 import android.content.Context;
+import android.content.Intent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
 
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.view.MyGridView;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
 public class DataInquiryMenuListAdapter extends BaseAdapter {
 
-    private List<Object> objects = new ArrayList<Object>();
+    private List<GridMenuDataInquiryBean> objects = new ArrayList<GridMenuDataInquiryBean>();
 
     private Context context;
     private LayoutInflater layoutInflater;
 
-    public DataInquiryMenuListAdapter(Context context) {
+    private int[] mGridColors = new int[]{R.color.data_inquiry_gird_menu_color1, R.color.data_inquiry_gird_menu_color2
+            , R.color.data_inquiry_gird_menu_color3, R.color.data_inquiry_gird_menu_color4, R.color.data_inquiry_gird_menu_color5,
+            R.color.data_inquiry_gird_menu_color6};
+
+    public DataInquiryMenuListAdapter(Context context, List<GridMenuDataInquiryBean> objects) {
         this.context = context;
         this.layoutInflater = LayoutInflater.from(context);
+        this.objects = objects;
     }
 
     @Override
@@ -31,7 +39,7 @@ public class DataInquiryMenuListAdapter extends BaseAdapter {
     }
 
     @Override
-    public Object getItem(int position) {
+    public GridMenuDataInquiryBean getItem(int position) {
         return objects.get(position);
     }
 
@@ -46,12 +54,62 @@ public class DataInquiryMenuListAdapter extends BaseAdapter {
             convertView = layoutInflater.inflate(R.layout.item_list_data_inquiry_menu, null);
             convertView.setTag(new ViewHolder(convertView));
         }
-        initializeViews((Object) getItem(position), (ViewHolder) convertView.getTag());
+        initializeViews((GridMenuDataInquiryBean) getItem(position), (ViewHolder) convertView.getTag(), position);
         return convertView;
     }
 
-    private void initializeViews(Object object, ViewHolder holder) {
-        //TODO implement
+    private void initializeViews(final GridMenuDataInquiryBean object, final ViewHolder holder, int position) {
+        final int gridColor = mGridColors[(position + 1) % mGridColors.length];
+        holder.dataInquiryModulView.setBackgroundColor(context.getResources().getColor(gridColor));
+        holder.dataInquiryModulTitleTv.setText(object.getModelName());
+
+        final List<GridMenuDataInquiryBean.QueryScheme> querySchemes = object.getQuerySchemes();
+        List<DataInquiryGirdItemBean> dataInquiryGirdItemBeans = new ArrayList<>();
+        if (querySchemes != null) {
+            if (querySchemes.size() > 9) {
+                for (int i = 0; i < 8; i++) {
+                    DataInquiryGirdItemBean dataInquiryGirdItemBean = new DataInquiryGirdItemBean();
+                    dataInquiryGirdItemBean.setIconText(querySchemes.get(i).getScheme());
+                    dataInquiryGirdItemBean.setColor(gridColor);
+                    dataInquiryGirdItemBeans.add(dataInquiryGirdItemBean);
+                }
+                DataInquiryGirdItemBean girdItemBean = new DataInquiryGirdItemBean();
+                girdItemBean.setColor(R.color.gray);
+                girdItemBean.setIconText("更多");
+                dataInquiryGirdItemBeans.add(girdItemBean);
+            } else {
+                for (int i = 0; i < querySchemes.size(); i++) {
+                    DataInquiryGirdItemBean dataInquiryGirdItemBean = new DataInquiryGirdItemBean();
+                    dataInquiryGirdItemBean.setIconText(querySchemes.get(i).getScheme());
+                    dataInquiryGirdItemBean.setColor(gridColor);
+                    dataInquiryGirdItemBeans.add(dataInquiryGirdItemBean);
+                }
+            }
+            DataInquiryMenuGridAdapter dataInquiryMenuGridAdapter = new DataInquiryMenuGridAdapter(context, dataInquiryGirdItemBeans);
+            holder.dataInquiryModulGv.setAdapter(dataInquiryMenuGridAdapter);
+        }
+
+        holder.dataInquiryModulGv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                Intent intent = null;
+                if (position == 8 && querySchemes.size() > 9) {
+                    intent = new Intent();
+                    intent.setClass(context, DataInquiryMoreMenuActivity.class);
+                    intent.putExtra("model_name", object.getModelName());
+                    intent.putExtra("menu_color", gridColor);
+                    intent.putExtra("all_report", (Serializable) querySchemes);
+
+                    context.startActivity(intent);
+                } else {
+                    intent = new Intent();
+                    intent.setClass(context, DataInquiryListActivity.class);
+
+                    context.startActivity(intent);
+                }
+            }
+        });
+
     }
 
     protected class ViewHolder {

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

@@ -1,21 +1,51 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.datainquiry;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.widget.ListView;
 
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Created by RaoMeng on 2017/8/14.
  */
 public class DataInquiryMoreMenuActivity extends BaseActivity {
     private ListView mMenuListView;
+    private List<String> mMenuStrings;
+    private DataInquiryMoreMenuAdapter mDataInquiryMoreMenuAdapter;
+    private int mColor;
+    private String mModelName;
+    private List<GridMenuDataInquiryBean.QueryScheme> mQuerySchemes;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_data_inquiry_more_menu);
 
         mMenuListView = (ListView) findViewById(R.id.data_inquiry_more_menu_lv);
+        mMenuStrings = new ArrayList<>();
+
+        Intent intent = getIntent();
+        if (intent != null) {
+            mColor = intent.getIntExtra("menu_color", -1);
+            mModelName = intent.getStringExtra("model_name");
+            mQuerySchemes = (List<GridMenuDataInquiryBean.QueryScheme>) intent.getSerializableExtra("all_report");
+
+            getSupportActionBar().setTitle(mModelName);
+
+            if (mQuerySchemes != null) {
+                for (int i = 0; i < mQuerySchemes.size(); i++) {
+                    mMenuStrings.add(mQuerySchemes.get(i).getScheme());
+                }
+                mDataInquiryMoreMenuAdapter = new DataInquiryMoreMenuAdapter(this, mMenuStrings);
+                mDataInquiryMoreMenuAdapter.setColor(mColor);
+
+                mMenuListView.setAdapter(mDataInquiryMoreMenuAdapter);
+            }
+        }
     }
 }

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

@@ -13,15 +13,25 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class DataInquiryMoreMenuAdapter extends BaseAdapter {
+    private List<String> objects = new ArrayList<String>();
 
-    private List<Object> objects = new ArrayList<Object>();
+    private int mColor = -1;
 
     private Context context;
     private LayoutInflater layoutInflater;
 
-    public DataInquiryMoreMenuAdapter(Context context) {
+    public DataInquiryMoreMenuAdapter(Context context, List<String> objects) {
         this.context = context;
         this.layoutInflater = LayoutInflater.from(context);
+        this.objects = objects;
+    }
+
+    public int getColor() {
+        return mColor;
+    }
+
+    public void setColor(int color) {
+        mColor = color;
     }
 
     @Override
@@ -30,7 +40,7 @@ public class DataInquiryMoreMenuAdapter extends BaseAdapter {
     }
 
     @Override
-    public Object getItem(int position) {
+    public String getItem(int position) {
         return objects.get(position);
     }
 
@@ -45,12 +55,16 @@ public class DataInquiryMoreMenuAdapter extends BaseAdapter {
             convertView = layoutInflater.inflate(R.layout.item_list_data_inquiry_more_menu, null);
             convertView.setTag(new ViewHolder(convertView));
         }
-        initializeViews((Object) getItem(position), (ViewHolder) convertView.getTag());
+        initializeViews((String) getItem(position), (ViewHolder) convertView.getTag());
         return convertView;
     }
 
-    private void initializeViews(Object object, ViewHolder holder) {
-        //TODO implement
+    private void initializeViews(String object, ViewHolder holder) {
+        holder.itemDataInquiryMoreMenuTitle.setText(object);
+        holder.itemDataInquiryMoreMenuIcon.setText(object.substring(0, 1));
+        if (mColor != -1) {
+            holder.itemDataInquiryMoreMenuIcon.setMyBackgroundColor(context.getResources().getColor(mColor));
+        }
     }
 
     protected class ViewHolder {

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

@@ -0,0 +1,67 @@
+package com.xzjmyk.pm.activity.ui.erp.activity.datainquiry;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * Created by RaoMeng on 2017/8/16.
+ */
+public class GridMenuDataInquiryBean implements Serializable {
+    private String modelName;
+    private List<QueryScheme> mQuerySchemes;
+
+    public String getModelName() {
+        return modelName;
+    }
+
+    public void setModelName(String modelName) {
+        this.modelName = modelName;
+    }
+
+    public List<QueryScheme> getQuerySchemes() {
+        return mQuerySchemes;
+    }
+
+    public void setQuerySchemes(List<QueryScheme> querySchemes) {
+        mQuerySchemes = querySchemes;
+    }
+
+    public static class QueryScheme implements Serializable {
+        private String title;
+        private String caller;
+        private String scheme;
+        private String schemeId;
+
+        public String getTitle() {
+            return title;
+        }
+
+        public void setTitle(String title) {
+            this.title = title;
+        }
+
+        public String getCaller() {
+            return caller;
+        }
+
+        public void setCaller(String caller) {
+            this.caller = caller;
+        }
+
+        public String getScheme() {
+            return scheme;
+        }
+
+        public void setScheme(String scheme) {
+            this.scheme = scheme;
+        }
+
+        public String getSchemeId() {
+            return schemeId;
+        }
+
+        public void setSchemeId(String schemeId) {
+            this.schemeId = schemeId;
+        }
+    }
+}

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

@@ -1,11 +1,12 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.datainquiry;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
  * Created by RaoMeng on 2017/8/14.
  */
-public class GridMenuReportStatisticsBean {
+public class GridMenuReportStatisticsBean implements Serializable {
 
     /**
      * modelName : A
@@ -31,7 +32,7 @@ public class GridMenuReportStatisticsBean {
         this.list = list;
     }
 
-    public static class ListBean {
+    public static class ListBean implements Serializable{
         /**
          * title : XXX
          * caller : XXX

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

@@ -0,0 +1,20 @@
+package com.xzjmyk.pm.activity.ui.erp.activity.datainquiry;
+
+import android.os.Bundle;
+
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+
+/**
+ * Created by RaoMeng on 2017/8/16.
+ */
+public class ReportQueryCriteriaActivity extends BaseActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_report_query_criteria);
+
+        getSupportActionBar().setTitle("报表查询");
+    }
+}

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

@@ -106,6 +106,10 @@ public class ReportStatisticsActivity extends BaseActivity {
                         }
                     }
                     break;
+                case Constants.APP_SOCKETIMEOUTEXCEPTION:
+                    progressDialog.dismiss();
+                    ToastMessage(msg.getData().getString("result"));
+                    break;
             }
         }
     };

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

@@ -1,15 +1,18 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.datainquiry;
 
 import android.content.Context;
+import android.content.Intent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
 
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.view.MyGridView;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -53,11 +56,12 @@ public class ReportStatisticsMenuListAdapter extends BaseAdapter {
         return convertView;
     }
 
-    private void initializeViews(GridMenuReportStatisticsBean object, ViewHolder holder, int position) {
-        int gridColor = mGridColors[(position + 1) % mGridColors.length];
+    private void initializeViews(final GridMenuReportStatisticsBean object, ViewHolder holder, int position) {
+        final int gridColor = mGridColors[(position + 1) % mGridColors.length];
         holder.dataInquiryModulView.setBackgroundColor(context.getResources().getColor(gridColor));
         holder.dataInquiryModulTitleTv.setText(object.getModelName());
-        List<GridMenuReportStatisticsBean.ListBean> listBeans = object.getList();
+
+        final List<GridMenuReportStatisticsBean.ListBean> listBeans = object.getList();
         List<DataInquiryGirdItemBean> dataInquiryGirdItemBeans = new ArrayList<>();
         if (listBeans != null) {
             if (listBeans.size() > 9) {
@@ -81,8 +85,29 @@ public class ReportStatisticsMenuListAdapter extends BaseAdapter {
             }
             DataInquiryMenuGridAdapter dataInquiryMenuGridAdapter = new DataInquiryMenuGridAdapter(context, dataInquiryGirdItemBeans);
             holder.dataInquiryModulGv.setAdapter(dataInquiryMenuGridAdapter);
-
         }
+
+
+        holder.dataInquiryModulGv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                Intent intent = null;
+                if (position == 8 && listBeans.size() > 9) {
+                    intent = new Intent();
+                    intent.setClass(context, ReportStatisticsMoreMenuActivity.class);
+                    intent.putExtra("model_name", object.getModelName());
+                    intent.putExtra("menu_color", gridColor);
+                    intent.putExtra("all_report", (Serializable) listBeans);
+
+                    context.startActivity(intent);
+                } else {
+                    intent = new Intent();
+                    intent.setClass(context, ReportQueryCriteriaActivity.class);
+
+                    context.startActivity(intent);
+                }
+            }
+        });
     }
 
     protected class ViewHolder {

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

@@ -0,0 +1,52 @@
+package com.xzjmyk.pm.activity.ui.erp.activity.datainquiry;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.widget.ListView;
+
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by RaoMeng on 2017/8/14.
+ */
+public class ReportStatisticsMoreMenuActivity extends BaseActivity {
+    private ListView mMenuListView;
+    private List<String> mMenuStrings;
+    private DataInquiryMoreMenuAdapter mDataInquiryMoreMenuAdapter;
+    private int mColor;
+    private String mModelName;
+    private List<GridMenuReportStatisticsBean.ListBean> mListBeans;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_data_inquiry_more_menu);
+
+        mMenuListView = (ListView) findViewById(R.id.data_inquiry_more_menu_lv);
+        mMenuStrings = new ArrayList<>();
+
+        Intent intent = getIntent();
+        if (intent != null) {
+            mColor = intent.getIntExtra("menu_color", -1);
+            mModelName = intent.getStringExtra("model_name");
+            mListBeans = (List<GridMenuReportStatisticsBean.ListBean>) intent.getSerializableExtra("all_report");
+
+            getSupportActionBar().setTitle(mModelName);
+
+            if (mListBeans != null) {
+                for (int i = 0; i < mListBeans.size(); i++) {
+                    mMenuStrings.add(mListBeans.get(i).getTitle());
+                }
+                mDataInquiryMoreMenuAdapter = new DataInquiryMoreMenuAdapter(this, mMenuStrings);
+                mDataInquiryMoreMenuAdapter.setColor(mColor);
+
+                mMenuListView.setAdapter(mDataInquiryMoreMenuAdapter);
+            }
+        }
+
+    }
+}

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

@@ -102,6 +102,9 @@ public class WorksFragment extends EasyFragment implements View.OnClickListener
         if (CommonUtil.isReleaseVersion()) {
             mDataInquiryRl.setVisibility(View.GONE);
             mReportStatisticsRl.setVisibility(View.GONE);
+        } else {
+            mDataInquiryRl.setVisibility(View.VISIBLE);
+            mReportStatisticsRl.setVisibility(View.VISIBLE);
         }
 
         if (CommonUtil.getSharedPreferencesBoolean(MyApplication.getInstance(), Constants.new_oa)) {

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

@@ -8,5 +8,6 @@
     <ListView
         android:id="@+id/data_inquiry_more_menu_lv"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent"
+        android:divider="@color/gray_light"/>
 </LinearLayout>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
+
+</LinearLayout>

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

@@ -1,29 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:padding="6dp"
     android:background="@color/white"
-    android:gravity="center_vertical">
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    android:padding="6dp">
 
     <com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.CircleTextView
         android:id="@+id/item_data_inquiry_more_menu_icon"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
-        app:backgroundColor="@color/data_inquiry_gird_menu_color3"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
         android:gravity="center"
+        android:textColor="@color/white"
         android:textSize="18sp"
+        android:layout_marginLeft="10dp"
+        app:backgroundColor="@color/data_inquiry_gird_menu_color3"
         tools:text="B"/>
+
     <TextView
         android:id="@+id/item_data_inquiry_more_menu_title"
         android:layout_width="match_parent"
         android:layout_height="50dp"
-        android:gravity="center_vertical"
-        android:textSize="18sp"
         android:layout_marginLeft="10dp"
+        android:gravity="center_vertical"
+        android:textSize="16sp"
         tools:text="BOM"/>
 </LinearLayout>

WeiChat/src/main/res/values-en/strings.xml

@@ -1428,4 +1428,6 @@
     <string name="common_service_query">常用业务查询</string>
     <string name="more_queries">更多查询</string>
     <string name="select_query_service">选择查询业务</string>
+    <string name="report_query">报表查询</string>
+
 </resources>

WeiChat/src/main/res/values-zh-rCN/strings.xml

@@ -1540,4 +1540,6 @@
     <string name="common_service_query">常用业务查询</string>
     <string name="more_queries">更多查询</string>
     <string name="select_query_service">选择查询业务</string>
+    <string name="report_query">报表查询</string>
+
 </resources>

WeiChat/src/main/res/values-zh-rTW/strings.xml

@@ -1529,4 +1529,6 @@
     <string name="common_service_query">常用业务查询</string>
     <string name="more_queries">更多查询</string>
     <string name="select_query_service">选择查询业务</string>
+    <string name="report_query">报表查询</string>
+
 </resources>

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

@@ -1871,4 +1871,5 @@
     <string name="common_service_query">常用业务查询</string>
     <string name="more_queries">更多查询</string>
     <string name="select_query_service">选择查询业务</string>
+    <string name="report_query">报表查询</string>
 </resources>