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

WeiChat/src/main/AndroidManifest.xml

@@ -983,6 +983,11 @@
             android:windowSoftInputMode="adjustPan" />
         <activity android:name=".ui.account.RegisterSelectActivity"></activity>
         <activity android:name=".ui.me.TemperatureActivity"></activity>
+
+        <!--数据统计，报表查询-->
+        <activity android:name=".ui.erp.activity.datainquiry.ReportStatisticsActivity"/>
+        <activity android:name=".ui.erp.activity.datainquiry.DataInquiryActivity"/>
+        <activity android:name=".ui.erp.activity.datainquiry.DataInquiryListActivity"/>
     </application>
 
 </manifest>

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

@@ -0,0 +1,89 @@
+package com.xzjmyk.pm.activity.ui.erp.activity.datainquiry;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.RectF;
+import android.util.AttributeSet;
+import android.widget.TextView;
+
+import com.xzjmyk.pm.activity.R;
+
+/**
+ * Created by RaoMeng on 2017/8/10.
+ */
+public class CircleTextView extends TextView {
+
+    /**
+     * 画笔
+     */
+    private Paint mPaint;
+
+    /**
+     * 画笔颜色，默认白色
+     */
+    private int mBackgroundColor = 0xFFFFFF;
+
+    /**
+     * 是否填充颜色
+     */
+    private boolean isFillColor = true;
+
+    public CircleTextView(Context context) {
+        super(context);
+        init(context, null, 0);
+    }
+
+    public CircleTextView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init(context, attrs, 0);
+    }
+
+    public CircleTextView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context, attrs, defStyleAttr);
+    }
+
+    private void init(Context context, AttributeSet attrs, int defStyleAttr) {
+        TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.CircleTextView);
+        mBackgroundColor = typedArray.getColor(R.styleable.CircleTextView_backgroundColor, mBackgroundColor);
+        mPaint = new Paint();
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        mPaint.setAntiAlias(true);
+        if (isFillColor) {
+            mPaint.setColor(mBackgroundColor);
+//            mPaint.setColor(getResources().getColor(R.color.colorAccent));
+            mPaint.setStyle(Paint.Style.FILL);
+        }
+
+        RectF rectF = new RectF();
+        int radius = getMeasuredHeight() > getMeasuredWidth() ? getMeasuredHeight() : getMeasuredWidth();
+        rectF.set(getPaddingLeft(), getPaddingTop(), radius - getPaddingRight(), radius - getPaddingBottom());
+        canvas.drawArc(rectF, 0, 360, false, mPaint);
+
+        super.onDraw(canvas);
+    }
+
+    public int getBackgroundColor() {
+        return mBackgroundColor;
+    }
+
+    public void setMyBackgroundColor(int backgroundColor) {
+        mBackgroundColor = backgroundColor;
+        invalidate();
+    }
+
+    public boolean isFillColor() {
+        return isFillColor;
+    }
+
+    public void setIsFillColor(boolean isFillColor) {
+        this.isFillColor = isFillColor;
+        invalidate();
+    }
+
+}

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

@@ -1,20 +1,24 @@
-package com.xzjmyk.pm.activity.ui.erp.activity;
+package com.xzjmyk.pm.activity.ui.erp.activity.datainquiry;
 
 import android.os.Bundle;
+import android.widget.ListView;
 
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 
 /**
  * Created by RaoMeng on 2017/8/3.
- * 选择查询业务页面
+ * 选择查询业务菜单页面
  */
 public class DataInquiryActivity extends BaseActivity {
+    private ListView mMenuListView;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_data_inquiry);
         getSupportActionBar().setTitle(R.string.select_query_service);
+
+        mMenuListView = (ListView) findViewById(R.id.data_inquiry_menu_lv);
     }
 }

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

@@ -0,0 +1,25 @@
+package com.xzjmyk.pm.activity.ui.erp.activity.datainquiry;
+
+/**
+ * Created by RaoMeng on 2017/8/16.
+ */
+public class DataInquiryGirdItemBean {
+    private String mIconText;
+    private int mColor;
+
+    public String getIconText() {
+        return mIconText;
+    }
+
+    public void setIconText(String iconText) {
+        mIconText = iconText;
+    }
+
+    public int getColor() {
+        return mColor;
+    }
+
+    public void setColor(int color) {
+        mColor = color;
+    }
+}

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

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity;
+package com.xzjmyk.pm.activity.ui.erp.activity.datainquiry;
 
 import android.os.Bundle;
 import android.support.v7.app.ActionBar;

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

@@ -0,0 +1,73 @@
+package com.xzjmyk.pm.activity.ui.erp.activity.datainquiry;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import com.xzjmyk.pm.activity.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DataInquiryMenuGridAdapter extends BaseAdapter {
+
+    private List<DataInquiryGirdItemBean> objects = new ArrayList<DataInquiryGirdItemBean>();
+
+    private Context context;
+    private LayoutInflater layoutInflater;
+
+    public DataInquiryMenuGridAdapter(Context context, List<DataInquiryGirdItemBean> objects) {
+        this.context = context;
+        this.layoutInflater = LayoutInflater.from(context);
+        this.objects = objects;
+    }
+
+    @Override
+    public int getCount() {
+        return objects.size();
+    }
+
+    @Override
+    public DataInquiryGirdItemBean getItem(int position) {
+        return objects.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        if (convertView == null) {
+            convertView = layoutInflater.inflate(R.layout.item_grid_data_inquiry_menu, parent, false);
+            convertView.setTag(new ViewHolder(convertView));
+        }
+        initializeViews((DataInquiryGirdItemBean) getItem(position), (ViewHolder) convertView.getTag());
+        return convertView;
+    }
+
+    private void initializeViews(DataInquiryGirdItemBean object, ViewHolder holder) {
+        holder.gridDataInquiryMenuContent.setText(object.getIconText());
+        if ("更多".equals(object.getIconText())) {
+            holder.gridDataInquiryMenuIcon.setText("···");
+        } else {
+            holder.gridDataInquiryMenuIcon.setText(object.getIconText().substring(0, 1));
+        }
+        holder.gridDataInquiryMenuIcon.setMyBackgroundColor(context.getResources().getColor(object.getColor()));
+
+    }
+
+    protected class ViewHolder {
+        private CircleTextView gridDataInquiryMenuIcon;
+        private TextView gridDataInquiryMenuContent;
+
+        public ViewHolder(View view) {
+            gridDataInquiryMenuIcon = (CircleTextView) view.findViewById(R.id.grid_data_inquiry_menu_icon);
+            gridDataInquiryMenuContent = (TextView) view.findViewById(R.id.grid_data_inquiry_menu_content);
+        }
+    }
+}

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

@@ -0,0 +1,68 @@
+package com.xzjmyk.pm.activity.ui.erp.activity.datainquiry;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.view.MyGridView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DataInquiryMenuListAdapter extends BaseAdapter {
+
+    private List<Object> objects = new ArrayList<Object>();
+
+    private Context context;
+    private LayoutInflater layoutInflater;
+
+    public DataInquiryMenuListAdapter(Context context) {
+        this.context = context;
+        this.layoutInflater = LayoutInflater.from(context);
+    }
+
+    @Override
+    public int getCount() {
+        return objects.size();
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return objects.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        if (convertView == null) {
+            convertView = layoutInflater.inflate(R.layout.item_list_data_inquiry_menu, null);
+            convertView.setTag(new ViewHolder(convertView));
+        }
+        initializeViews((Object) getItem(position), (ViewHolder) convertView.getTag());
+        return convertView;
+    }
+
+    private void initializeViews(Object object, ViewHolder holder) {
+        //TODO implement
+    }
+
+    protected class ViewHolder {
+        private View dataInquiryModulView;
+        private TextView dataInquiryModulTitleTv;
+        private MyGridView dataInquiryModulGv;
+
+        public ViewHolder(View view) {
+            dataInquiryModulView = (View) view.findViewById(R.id.data_inquiry_modul_view);
+            dataInquiryModulTitleTv = (TextView) view.findViewById(R.id.data_inquiry_modul_title_tv);
+            dataInquiryModulGv = (MyGridView) view.findViewById(R.id.data_inquiry_modul_gv);
+        }
+    }
+}

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

@@ -0,0 +1,21 @@
+package com.xzjmyk.pm.activity.ui.erp.activity.datainquiry;
+
+import android.os.Bundle;
+import android.widget.ListView;
+
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+
+/**
+ * Created by RaoMeng on 2017/8/14.
+ */
+public class DataInquiryMoreMenuActivity extends BaseActivity {
+    private ListView mMenuListView;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mMenuListView = (ListView) findViewById(R.id.data_inquiry_more_menu_lv);
+    }
+}

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

@@ -0,0 +1,65 @@
+package com.xzjmyk.pm.activity.ui.erp.activity.datainquiry;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import com.xzjmyk.pm.activity.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DataInquiryMoreMenuAdapter extends BaseAdapter {
+
+    private List<Object> objects = new ArrayList<Object>();
+
+    private Context context;
+    private LayoutInflater layoutInflater;
+
+    public DataInquiryMoreMenuAdapter(Context context) {
+        this.context = context;
+        this.layoutInflater = LayoutInflater.from(context);
+    }
+
+    @Override
+    public int getCount() {
+        return objects.size();
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return objects.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        if (convertView == null) {
+            convertView = layoutInflater.inflate(R.layout.item_list_data_inquiry_more_menu, null);
+            convertView.setTag(new ViewHolder(convertView));
+        }
+        initializeViews((Object) getItem(position), (ViewHolder) convertView.getTag());
+        return convertView;
+    }
+
+    private void initializeViews(Object object, ViewHolder holder) {
+        //TODO implement
+    }
+
+    protected class ViewHolder {
+        private CircleTextView itemDataInquiryMoreMenuIcon;
+        private TextView itemDataInquiryMoreMenuTitle;
+
+        public ViewHolder(View view) {
+            itemDataInquiryMoreMenuIcon = (CircleTextView) view.findViewById(R.id.item_data_inquiry_more_menu_icon);
+            itemDataInquiryMoreMenuTitle = (TextView) view.findViewById(R.id.item_data_inquiry_more_menu_title);
+        }
+    }
+}

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

@@ -0,0 +1,69 @@
+package com.xzjmyk.pm.activity.ui.erp.activity.datainquiry;
+
+import java.util.List;
+
+/**
+ * Created by RaoMeng on 2017/8/14.
+ */
+public class GridMenuReportStatisticsBean {
+
+    /**
+     * modelName : A
+     * list : [{"title":"XXX","caller":"XXX","reportName":"XXX"}]
+     */
+
+    private String modelName;
+    private List<ListBean> list;
+
+    public String getModelName() {
+        return modelName;
+    }
+
+    public void setModelName(String modelName) {
+        this.modelName = modelName;
+    }
+
+    public List<ListBean> getList() {
+        return list;
+    }
+
+    public void setList(List<ListBean> list) {
+        this.list = list;
+    }
+
+    public static class ListBean {
+        /**
+         * title : XXX
+         * caller : XXX
+         * reportName : XXX
+         */
+
+        private String title;
+        private String caller;
+        private String reportName;
+
+        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 getReportName() {
+            return reportName;
+        }
+
+        public void setReportName(String reportName) {
+            this.reportName = reportName;
+        }
+    }
+}

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

@@ -0,0 +1,15 @@
+package com.xzjmyk.pm.activity.ui.erp.activity.datainquiry;
+
+/**
+ * Created by RaoMeng on 2017/8/14.
+ * 历史记录表
+ */
+public class HistoricalRecordSchema {
+    public static final class HistoricalRecordTable {
+        public static final String NAME = "historical_record";
+
+        public static final class Cols {
+
+        }
+    }
+}

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

@@ -0,0 +1,120 @@
+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 ReportStatisticsActivity extends BaseActivity {
+    private final int GET_MENU_DATA = 0x16;
+    private ListView mMenuListView;
+    private List<GridMenuReportStatisticsBean> mGridMenuReportStatisticsBeans;
+    private ReportStatisticsMenuListAdapter mReportStatisticsMenuListAdapter;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_data_inquiry);
+        getSupportActionBar().setTitle(R.string.select_query_service);
+
+        mMenuListView = (ListView) findViewById(R.id.data_inquiry_menu_lv);
+        mGridMenuReportStatisticsBeans = new ArrayList<>();
+        mReportStatisticsMenuListAdapter = new ReportStatisticsMenuListAdapter(this, mGridMenuReportStatisticsBeans);
+        mMenuListView.setAdapter(mReportStatisticsMenuListAdapter);
+
+        getMenuData();
+    }
+
+    private void getMenuData() {
+        progressDialog.show();
+        String url = Constants.getAppBaseUrl(this) + "/mobile/qry/getReport.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) {
+                                        GridMenuReportStatisticsBean gridMenuReportStatisticsBean
+                                                = new GridMenuReportStatisticsBean();
+                                        String modelName = optStringNotNull(dataObject, "modelName");
+                                        gridMenuReportStatisticsBean.setModelName(modelName);
+                                        JSONArray listArray = dataObject.optJSONArray("list");
+                                        List<GridMenuReportStatisticsBean.ListBean> listBeans = new ArrayList<>();
+                                        if (listArray != null) {
+                                            for (int j = 0; j < listArray.length(); j++) {
+                                                JSONObject listObject = listArray.optJSONObject(j);
+                                                if (listObject != null) {
+                                                    GridMenuReportStatisticsBean.ListBean listBean = new GridMenuReportStatisticsBean.ListBean();
+                                                    String caller = optStringNotNull(listObject, "caller");
+                                                    String title = optStringNotNull(listObject, "title");
+                                                    String reportName = optStringNotNull(listObject, "reportName");
+
+                                                    listBean.setCaller(caller);
+                                                    listBean.setReportName(reportName);
+                                                    listBean.setTitle(title);
+
+                                                    listBeans.add(listBean);
+                                                }
+                                            }
+                                            gridMenuReportStatisticsBean.setList(listBeans);
+                                        }
+                                        mGridMenuReportStatisticsBeans.add(gridMenuReportStatisticsBean);
+                                    }
+                                }
+                                mReportStatisticsMenuListAdapter.notifyDataSetChanged();
+                            }
+                        } catch (JSONException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                    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/ReportStatisticsMenuListAdapter.java

@@ -0,0 +1,99 @@
+package com.xzjmyk.pm.activity.ui.erp.activity.datainquiry;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.view.MyGridView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ReportStatisticsMenuListAdapter extends BaseAdapter {
+    private List<GridMenuReportStatisticsBean> objects = new ArrayList<GridMenuReportStatisticsBean>();
+
+    private Context context;
+    private LayoutInflater layoutInflater;
+    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 ReportStatisticsMenuListAdapter(Context context, List<GridMenuReportStatisticsBean> objects) {
+        this.context = context;
+        this.layoutInflater = LayoutInflater.from(context);
+        this.objects = objects;
+    }
+
+    @Override
+    public int getCount() {
+        return objects.size();
+    }
+
+    @Override
+    public GridMenuReportStatisticsBean getItem(int position) {
+        return objects.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        if (convertView == null) {
+            convertView = layoutInflater.inflate(R.layout.item_list_data_inquiry_menu, null);
+            convertView.setTag(new ViewHolder(convertView));
+        }
+        initializeViews((GridMenuReportStatisticsBean) getItem(position), (ViewHolder) convertView.getTag(), position);
+        return convertView;
+    }
+
+    private void initializeViews(GridMenuReportStatisticsBean object, ViewHolder holder, int position) {
+        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();
+        List<DataInquiryGirdItemBean> dataInquiryGirdItemBeans = new ArrayList<>();
+        if (listBeans != null) {
+            if (listBeans.size() > 9) {
+                for (int i = 0; i < 8; i++) {
+                    DataInquiryGirdItemBean dataInquiryGirdItemBean = new DataInquiryGirdItemBean();
+                    dataInquiryGirdItemBean.setIconText(listBeans.get(i).getTitle());
+                    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 < listBeans.size(); i++) {
+                    DataInquiryGirdItemBean dataInquiryGirdItemBean = new DataInquiryGirdItemBean();
+                    dataInquiryGirdItemBean.setIconText(listBeans.get(i).getTitle());
+                    dataInquiryGirdItemBean.setColor(gridColor);
+                    dataInquiryGirdItemBeans.add(dataInquiryGirdItemBean);
+                }
+            }
+            DataInquiryMenuGridAdapter dataInquiryMenuGridAdapter = new DataInquiryMenuGridAdapter(context, dataInquiryGirdItemBeans);
+            holder.dataInquiryModulGv.setAdapter(dataInquiryMenuGridAdapter);
+
+        }
+    }
+
+    protected class ViewHolder {
+        private View dataInquiryModulView;
+        private TextView dataInquiryModulTitleTv;
+        private MyGridView dataInquiryModulGv;
+
+        public ViewHolder(View view) {
+            dataInquiryModulView = (View) view.findViewById(R.id.data_inquiry_modul_view);
+            dataInquiryModulTitleTv = (TextView) view.findViewById(R.id.data_inquiry_modul_title_tv);
+            dataInquiryModulGv = (MyGridView) view.findViewById(R.id.data_inquiry_modul_gv);
+        }
+    }
+}

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/oa/ApprovalAdapter.java

@@ -91,16 +91,20 @@ public class ApprovalAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
 
     @Override
     public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
-        if (holder instanceof TitleViewHolder) {
-            bindTitleView((TitleViewHolder) holder, position);
-        } else if (holder instanceof BaseRVViewHodler) {
-            bindBaseRVView((BaseRVViewHodler) holder, position);
-        } else if (holder instanceof TagViewHolder) {
-            bindTAGView((TagViewHolder) holder, position);
-        } else if (holder instanceof PointsViewHolder) {
-            bindPointsView((PointsViewHolder) holder, position);
-        } else if (holder instanceof NodeViewHolder) {
-            bindNodeView((NodeViewHolder) holder, position);
+        try {
+            if (holder instanceof TitleViewHolder) {
+                bindTitleView((TitleViewHolder) holder, position);
+            } else if (holder instanceof BaseRVViewHodler) {
+                bindBaseRVView((BaseRVViewHodler) holder, position);
+            } else if (holder instanceof TagViewHolder) {
+                bindTAGView((TagViewHolder) holder, position);
+            } else if (holder instanceof PointsViewHolder) {
+                bindPointsView((PointsViewHolder) holder, position);
+            } else if (holder instanceof NodeViewHolder) {
+                bindNodeView((NodeViewHolder) holder, position);
+            }
+        } catch (Exception e) {
+
         }
     }
 
@@ -379,7 +383,8 @@ public class ApprovalAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
         AvatarHelper.getInstance().display(approval.getIdKey(), holder.handIv, true, false);
         if (approval.getId() > 0) {
             holder.statusIv.setVisibility(View.VISIBLE);
-            holder.statusIv.setImageResource(approval.getId());
+            if (approval.getId() > 0)
+                holder.statusIv.setImageResource(approval.getId());
         } else {
             holder.statusIv.setVisibility(View.GONE);
         }

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

@@ -49,6 +49,7 @@ public class DBManager {
 
     ;
 
+    @Deprecated
     public DBManager() {
         db = DatabaseManager.getInstance().openDatabase();
     }

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

@@ -15,6 +15,8 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.erp.activity.ErpMenActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.crm.ClientActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.DataInquiryActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.ReportStatisticsActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OAActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.StatisticsActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
@@ -39,18 +41,18 @@ public class WorksFragment extends EasyFragment implements View.OnClickListener
     @ViewInject(R.id.tv_business_num)
     private TextView tv_business_num;
     @ViewInject(R.id.tv_menu_oa)
-    private TextView  tv_menu_oa;
+    private TextView tv_menu_oa;
 
     @ViewInject(R.id.tv_oa_desc)
     private TextView tv_oa_desc;
     @ViewInject(R.id.tv_desc_business)
-    private TextView  tv_desc_business;
+    private TextView tv_desc_business;
 
     @ViewInject(R.id.iv_business_desc)
     private ImageView iv_business_desc;
     @ViewInject(R.id.iv_desc_oa)
     private ImageView iv_desc_oa;
-    
+
     @ViewInject(R.id.setting_rl)
     private RelativeLayout setting_rl;
     @ViewInject(R.id.rl_uas_sys)
@@ -59,6 +61,10 @@ public class WorksFragment extends EasyFragment implements View.OnClickListener
     private RelativeLayout my_data_rl;
     @ViewInject(R.id.goods_find)
     private RelativeLayout goods_find;
+    @ViewInject(R.id.work_data_inquiry_rl)
+    private RelativeLayout mDataInquiryRl;
+    @ViewInject(R.id.work_report_statistics_rl)
+    private RelativeLayout mReportStatisticsRl;
     @ViewInject(R.id.my_client_rl)
     private RelativeLayout my_client_rl;
     @ViewInject(R.id.tv_crm)
@@ -90,21 +96,29 @@ public class WorksFragment extends EasyFragment implements View.OnClickListener
         my_data_rl.setOnClickListener(this);
         my_client_rl.setOnClickListener(this);
         goods_find.setOnClickListener(this);
-        if(CommonUtil.getSharedPreferencesBoolean(MyApplication.getInstance(), Constants.new_oa)){
+        mDataInquiryRl.setOnClickListener(this);
+        mReportStatisticsRl.setOnClickListener(this);
+
+        if (CommonUtil.isReleaseVersion()) {
+            mDataInquiryRl.setVisibility(View.GONE);
+            mReportStatisticsRl.setVisibility(View.GONE);
+        }
+
+        if (CommonUtil.getSharedPreferencesBoolean(MyApplication.getInstance(), Constants.new_oa)) {
             tv_menu_oa.setVisibility(View.GONE);
             tv_oa_desc.setVisibility(View.GONE);
             iv_desc_oa.setVisibility(View.GONE);
         }
-        if(CommonUtil.getSharedPreferencesBoolean(MyApplication.getInstance(), Constants.new_business)){
+        if (CommonUtil.getSharedPreferencesBoolean(MyApplication.getInstance(), Constants.new_business)) {
             tv_business_num.setVisibility(View.GONE);
             tv_desc_business.setVisibility(View.GONE);
             iv_business_desc.setVisibility(View.GONE);
         }
         show_new_function_ll.setOnClickListener(this);
-        if (platform){
+        if (platform) {
             my_client_rl.setVisibility(View.GONE);
         }
-        UserRoleUtils.checkUserRole(this,getmRootView());
+        UserRoleUtils.checkUserRole(this, getmRootView());
     }
 
     @Override
@@ -133,8 +147,8 @@ public class WorksFragment extends EasyFragment implements View.OnClickListener
                 } else {
                     url = "http://uas.ubtob.com/authen?b_username=" + phone + "&b_password=" + password + "&b_enuu=" + b_enuu;
                 }
-                CommonUtil.setSharedPreferences(MyApplication.getInstance(),Constants.new_business,true);
-                
+                CommonUtil.setSharedPreferences(MyApplication.getInstance(), Constants.new_business, true);
+
                 tv_business_num.setVisibility(View.GONE);
                 tv_desc_business.setVisibility(View.GONE);
                 iv_business_desc.setVisibility(View.GONE);
@@ -167,7 +181,12 @@ public class WorksFragment extends EasyFragment implements View.OnClickListener
             case R.id.show_new_function_ll:
                 startActivity(new Intent(getActivity(), StatisticsActivity.class));
                 break;
-
+            case R.id.work_data_inquiry_rl:
+                startActivity(new Intent(ct, DataInquiryActivity.class));
+                break;
+            case R.id.work_report_statistics_rl:
+                startActivity(new Intent(ct, ReportStatisticsActivity.class));
+                break;
         }
     }
 

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

@@ -65,7 +65,6 @@ public class ApprovaPresenter implements OnHttpResultListener {
 
     private IApproval iApproval;
     private ApprovalRecord record;
-    private DBManager manager;
     public String chchePoints = "";//审批要点缓存
     private String title;
     private String master;
@@ -140,10 +139,10 @@ public class ApprovaPresenter implements OnHttpResultListener {
     }
 
     public void closeDB() {
-        if (manager != null) {
-            manager.closeDB();
-            manager = null;
-        }
+//        if (manager != null) {
+//            manager.closeDB();
+//            manager = null;
+//        }
     }
 
     public String getUrl(String baseUrl, String title) {
@@ -982,7 +981,7 @@ public class ApprovaPresenter implements OnHttpResultListener {
                     }
                 }
                 int reId = -1;
-                if ("未通过".equals(record.status)||"已结束".equals(record.status)) {
+                if ("未通过".equals(record.status) || "已结束".equals(record.status)) {
                     reId = R.drawable.unapproved;
                 } else if (!hanNotApproval) {
                     reId = R.drawable.approved;
@@ -1225,7 +1224,7 @@ public class ApprovaPresenter implements OnHttpResultListener {
     }
 
     private int getImByCode(String emCode) {
-        if (manager == null) manager = new DBManager();
+        DBManager manager = DBManager.getInstance();
         String whichsys = CommonUtil.getMaster();
         if (StringUtils.isEmpty(emCode) || StringUtils.isEmpty(whichsys)) return 0;
         String[] selectionArgs = {emCode, whichsys};

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="oval">
+
+    <size
+        android:width="80dp"
+        android:height="80dp"/>
+</shape>

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

@@ -4,86 +4,10 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:background="@color/bg_underlying"
-              android:orientation="vertical"
-              android:padding="@dimen/activity_vertical_margin">
+              android:orientation="vertical">
 
-    <LinearLayout
+    <ListView
+        android:id="@+id/data_inquiry_menu_lv"
         android:layout_width="match_parent"
-        android:layout_height="30dp"
-        android:orientation="horizontal">
-
-        <TextView
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:maxLines="1"
-            android:text="------------------------------------------"
-            android:textColor="@color/titleBlue"/>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
-            android:gravity="center"
-            android:singleLine="true"
-            android:text="@string/common_service_query"
-            android:textColor="@color/titleBlue"
-            android:textSize="16sp"/>
-
-        <TextView
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:maxLines="1"
-            android:text="------------------------------------------"
-            android:textColor="@color/titleBlue"/>
-    </LinearLayout>
-
-    <com.xzjmyk.pm.activity.view.MyGridView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:numColumns="3"
-        android:scrollbars="none"
-        />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="30dp"
-        android:orientation="horizontal">
-
-        <TextView
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:maxLines="1"
-            android:text="------------------------------------------"
-            android:textColor="@color/titleBlue"/>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
-            android:gravity="center"
-            android:singleLine="true"
-            android:text="@string/more_queries"
-            android:textColor="@color/titleBlue"
-            android:textSize="16sp"/>
-
-        <TextView
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:maxLines="1"
-            android:text="------------------------------------------"
-            android:textColor="@color/titleBlue"/>
-    </LinearLayout>
-
+        android:layout_height="match_parent"/>
 </LinearLayout>

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

@@ -13,25 +13,45 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <com.xzjmyk.pm.activity.view.MyGridView
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/white"
-            android:numColumns="2"/>
+            android:orientation="vertical"
+            android:padding="16dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="搜索历史"
+                    android:textSize="16sp"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="清空"
+                    android:textColor="@color/LightBlue"
+                    android:textSize="16sp"/>
+            </LinearLayout>
+
+            <com.xzjmyk.pm.activity.view.MyListView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white"/>
+
+        </LinearLayout>
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
-            android:gravity="center"
-            android:text="清空历史记录"
-            android:textColor="@color/LightBlue"
-            android:padding="10dp"
-            android:textSize="16sp"/>
         <View
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="#40000000"
+            android:background="#20000000"
             />
     </LinearLayout>
 </RelativeLayout>

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

@@ -0,0 +1,12 @@
+<?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">
+
+    <ListView
+        android:id="@+id/data_inquiry_more_menu_lv"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+</LinearLayout>

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

@@ -1,7 +1,7 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/bg_main">
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@drawable/bg_main">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -23,7 +23,7 @@
                 android:gravity="center"
                 android:text="我的关注"
                 android:textColor="@color/text_main"
-                android:textSize="14sp" />
+                android:textSize="14sp"/>
 
             <ImageView
                 android:layout_width="@dimen/next_width"
@@ -32,16 +32,15 @@
                 android:layout_centerVertical="true"
 
                 android:background="@drawable/oa_next"
-                android:contentDescription="@string/app_name" />
+                android:contentDescription="@string/app_name"/>
+
             <View
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/line"
-                android:background="@color/item_line" />
+                android:background="@color/item_line"/>
         </RelativeLayout>
 
 
-
-
         <RelativeLayout
             android:id="@+id/my_client_rl"
             style="@style/IMTbleLine_UP_Me"
@@ -57,7 +56,7 @@
                 android:gravity="center"
                 android:text="@string/work_customer"
                 android:textColor="@color/text_main"
-                android:textSize="16sp" />
+                android:textSize="16sp"/>
 
             <ImageView
                 android:layout_width="@dimen/next_width"
@@ -66,48 +65,52 @@
                 android:layout_centerVertical="true"
 
                 android:background="@drawable/oa_next"
-                android:contentDescription="@string/app_name" />
+                android:contentDescription="@string/app_name"/>
         </RelativeLayout>
 
 
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/line"
-            android:background="@color/item_line" />
+            android:background="@color/item_line"/>
 
         <RelativeLayout
             android:id="@+id/rl_uas_sys"
             style="@style/IMTbleLine_UP_Me"
             android:background="@drawable/selector_me_menu_item_bg">
+
             <TextView
                 android:id="@+id/tv_oa_desc"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/Expense_reimbursement"
                 android:layout_below="@+id/tv_menu_oa"
                 android:layout_toLeftOf="@+id/iv_desc_oa"
-                android:layout_toStartOf="@+id/iv_desc_oa" />
+                android:layout_toStartOf="@+id/iv_desc_oa"
+                android:text="@string/Expense_reimbursement"/>
+
             <ImageView
+                android:id="@+id/iv_desc_oa"
                 android:layout_width="20dp"
                 android:layout_height="20dp"
-                android:src="@drawable/kaoqintongji"
                 android:layout_alignBottom="@+id/oa_next"
                 android:layout_toLeftOf="@+id/tv_menu_oa"
                 android:layout_toStartOf="@+id/tv_menu_oa"
-                android:id="@+id/iv_desc_oa" />
+                android:src="@drawable/kaoqintongji"/>
+
             <TextView
                 android:id="@+id/tv_menu_oa"
                 android:layout_width="10dp"
                 android:layout_height="10dp"
+                android:layout_alignTop="@+id/tv_oa"
                 android:layout_gravity="top|right"
+                android:layout_toLeftOf="@+id/oa_next"
+                android:layout_toStartOf="@+id/oa_next"
                 android:background="@drawable/hongdian"
                 android:gravity="center"
                 android:text=""
                 android:textColor="@android:color/white"
-                android:textSize="10.0dip"
-                android:layout_toLeftOf="@+id/oa_next"
-                android:layout_toStartOf="@+id/oa_next"
-                android:layout_alignTop="@+id/tv_oa" />
+                android:textSize="10.0dip"/>
+
             <TextView
                 android:id="@+id/tv_oa"
                 android:layout_width="wrap_content"
@@ -118,7 +121,7 @@
                 android:gravity="center"
                 android:text="@string/work_oa"
                 android:textColor="@color/text_main"
-                android:textSize="16sp" />
+                android:textSize="16sp"/>
 
             <ImageView
                 android:id="@+id/oa_next"
@@ -127,22 +130,24 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:background="@drawable/oa_next"
-                android:contentDescription="@string/app_name" />
+                android:contentDescription="@string/app_name"/>
+
             <LinearLayout
                 android:id="@+id/show_new_function_ll"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:layout_toLeftOf="@+id/oa_next"
                 android:layout_centerVertical="true"
+                android:layout_toLeftOf="@+id/oa_next"
+                android:orientation="horizontal"
                 android:visibility="gone">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="考勤统计"
                     android:layout_gravity="center_vertical"
+                    android:text="考勤统计"
                     android:textSize="12sp"/>
+
                 <FrameLayout
                     android:id="@+id/notice_head_area"
                     android:layout_width="40dp"
@@ -157,20 +162,20 @@
                         android:background="@color/transparent"
                         android:contentDescription="@string/app_name"
                         android:padding="1dp"
-                        android:src="@drawable/kaoqintongji" />
+                        android:src="@drawable/kaoqintongji"/>
 
                     <TextView
                         android:id="@+id/notice_num_tv"
                         android:layout_width="7dp"
                         android:layout_height="7dp"
                         android:layout_gravity="top|right"
+                        android:layout_marginRight="12dp"
+                        android:layout_marginTop="5dp"
                         android:background="@drawable/hongdian"
                         android:gravity="center"
                         android:textColor="@android:color/white"
                         android:textSize="10.0dip"
-                        android:visibility="visible"
-                        android:layout_marginRight="12dp"
-                        android:layout_marginTop="5dp"/>
+                        android:visibility="visible"/>
                 </FrameLayout>
 
             </LinearLayout>
@@ -181,43 +186,48 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/line"
-            android:background="@color/item_line" />
+            android:background="@color/item_line"/>
 
         <RelativeLayout
             android:id="@+id/setting_rl"
             style="@style/IMTbleLine_UP_Me"
             android:background="@drawable/selector_me_menu_item_bg">
+
             <TextView
                 android:id="@+id/tv_desc_business"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/work_oa_order"
                 android:layout_below="@+id/tv_business_num"
                 android:layout_toLeftOf="@+id/iv_business_desc"
-                android:layout_toStartOf="@+id/iv_business_desc" />
+                android:layout_toStartOf="@+id/iv_business_desc"
+                android:text="@string/work_oa_order"/>
+
             <ImageView
                 android:id="@+id/iv_business_desc"
                 android:layout_width="20dp"
                 android:layout_height="20dp"
-                android:src="@drawable/kaoqintongji"
                 android:layout_below="@+id/tv_business_num"
                 android:layout_toLeftOf="@+id/tv_business_num"
                 android:layout_toStartOf="@+id/tv_business_num"
+                android:src="@drawable/kaoqintongji"
                 />
+
             <TextView
                 android:id="@+id/tv_business_num"
                 android:layout_width="10dp"
                 android:layout_height="10dp"
+                android:layout_alignTop="@+id/textView2"
                 android:layout_gravity="top|right"
+                android:layout_toLeftOf="@+id/imageView2"
+                android:layout_toStartOf="@+id/imageView2"
                 android:background="@drawable/hongdian"
+
                 android:gravity="center"
                 android:text=""
-                android:textColor="@android:color/white"
+                android:textColor="@android:color/white"/>
 
-                android:layout_toLeftOf="@+id/imageView2"
-                android:layout_toStartOf="@+id/imageView2"
-                android:layout_alignTop="@+id/textView2" />
             <TextView
+                android:id="@+id/textView2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
@@ -226,24 +236,23 @@
                 android:gravity="center"
                 android:text="@string/work_business_manage"
                 android:textColor="@color/text_main"
-                android:textSize="16sp"
-                android:id="@+id/textView2" />
+                android:textSize="16sp"/>
 
             <ImageView
+                android:id="@+id/imageView2"
                 android:layout_width="@dimen/next_width"
                 android:layout_height="@dimen/next_height"
                 android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
 
+                android:layout_centerVertical="true"
                 android:background="@drawable/oa_next"
-                android:contentDescription="@string/app_name"
-                android:id="@+id/imageView2" />
+                android:contentDescription="@string/app_name"/>
         </RelativeLayout>
 
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/line"
-            android:background="@color/item_line" />
+            android:background="@color/item_line"/>
 
         <RelativeLayout
             android:id="@+id/goods_find"
@@ -259,7 +268,69 @@
                 android:gravity="center"
                 android:text="@string/work_business_mall"
                 android:textColor="@color/text_main"
-                android:textSize="16sp" />
+                android:textSize="16sp"/>
+
+            <ImageView
+                android:layout_width="@dimen/next_width"
+                android:layout_height="@dimen/next_height"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+
+                android:background="@drawable/oa_next"
+                android:contentDescription="@string/app_name"/>
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/line"
+            android:background="@color/item_line"/>
+
+        <RelativeLayout
+            android:id="@+id/work_data_inquiry_rl"
+            style="@style/IMTbleLine_UP_Me"
+            android:background="@drawable/selector_me_menu_item_bg">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:drawableLeft="@drawable/ic_data_inquiry"
+                android:drawablePadding="10dp"
+                android:gravity="center"
+                android:text="@string/work_data_inquiry"
+                android:textColor="@color/text_main"
+                android:textSize="16sp"/>
+
+            <ImageView
+                android:layout_width="@dimen/next_width"
+                android:layout_height="@dimen/next_height"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+
+                android:background="@drawable/oa_next"
+                android:contentDescription="@string/app_name"/>
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/line"
+            android:background="@color/item_line"/>
+
+        <RelativeLayout
+            android:id="@+id/work_report_statistics_rl"
+            style="@style/IMTbleLine_UP_Me"
+            android:background="@drawable/selector_me_menu_item_bg">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:drawableLeft="@drawable/ic_report_statistics"
+                android:drawablePadding="10dp"
+                android:gravity="center"
+                android:text="@string/work_report_statistics"
+                android:textColor="@color/text_main"
+                android:textSize="16sp"/>
 
             <ImageView
                 android:layout_width="@dimen/next_width"
@@ -268,13 +339,13 @@
                 android:layout_centerVertical="true"
 
                 android:background="@drawable/oa_next"
-                android:contentDescription="@string/app_name" />
+                android:contentDescription="@string/app_name"/>
         </RelativeLayout>
 
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/line"
-            android:background="@color/item_line" />
+            android:background="@color/item_line"/>
     </LinearLayout>
 
 </ScrollView>

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

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              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:gravity="center"
+              android:orientation="vertical"
+              android:padding="10dp">
+
+    <com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.CircleTextView
+        android:id="@+id/grid_data_inquiry_menu_icon"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:gravity="center"
+        android:textSize="20sp"
+        android:textColor="@color/white"
+        app:backgroundColor="#4d70a6"
+        tools:text="B"/>
+
+    <TextView
+        android:id="@+id/grid_data_inquiry_menu_content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:gravity="center"
+        android:textSize="16sp"
+        tools:text="BOM"/>
+</LinearLayout>

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

@@ -0,0 +1,42 @@
+<?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="wrap_content"
+              android:orientation="vertical"
+              android:padding="6dp">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <View
+            android:id="@+id/data_inquiry_modul_view"
+            android:layout_width="10dp"
+            android:layout_height="20dp"
+            android:layout_marginLeft="10dp"/>
+
+        <TextView
+            android:id="@+id/data_inquiry_modul_title_tv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="10dp"
+            />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="5dp">
+
+        <com.xzjmyk.pm.activity.view.MyGridView
+            android:id="@+id/data_inquiry_modul_gv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:numColumns="3"
+            android:scrollbars="none"/>
+    </LinearLayout>
+
+</LinearLayout>

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

@@ -0,0 +1,29 @@
+<?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"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:padding="6dp"
+    android:background="@color/white"
+    android:gravity="center_vertical">
+
+    <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:gravity="center"
+        android:textSize="18sp"
+        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"
+        tools:text="BOM"/>
+</LinearLayout>

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

@@ -603,6 +603,8 @@
         <string name = "work_oa"> OA </string>
         <string name = "work_business_manage"> B2B</string>
         <string name = "work_business_mall"> UsoftMall </string>
+        <string name = "work_data_inquiry"> DataInquiry </string>
+        <string name = "work_report_statistics"> ReportStatistics </string>
         
         <string name = "user_title"> Me </string>
         <string name = "user_firend_cirle"> My moments </string>

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

@@ -864,6 +864,8 @@
     <string name="work_business_me">我的商务</string>
     <string name="work_oa_sigin">自动考勤</string>
     <string name="work_oa_order">查看订单询价单</string>
+    <string name="work_data_inquiry">数据查询</string>
+    <string name="work_report_statistics">报表统计</string>
     <!--我-->
     <string name="user_title">我</string>
     <string name="user_firend_cirle">我的工作圈</string>

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

@@ -836,6 +836,8 @@
     <string name="work_business_me">我的商務</string>
     <string name="work_oa_sigin">自動考勤</string>
     <string name="work_oa_order">查看訂單詢價單</string>
+    <string name="work_data_inquiry">數據查詢</string>
+    <string name="work_report_statistics">報表統計</string>
     <!--我-->
     <!-- <string name="user_title">我</string>-->
     <string name="user_firend_cirle">我的工作圈</string>

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

@@ -251,4 +251,9 @@
         </attr>
     </declare-styleable>
 
+    <declare-styleable name="CircleTextView">
+        <attr name="backgroundColor" format="reference|color"/>
+        <attr name="isFillColor" format="boolean"/>
+    </declare-styleable>
+
 </resources>

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

@@ -326,4 +326,12 @@
     <color name="selected_day_background">#E75F49</color>
     <color name="selected_day_text">#fff2f2f2</color>
     <color name="new_waitting_approvel">#F4A460</color>
+
+    <!--数据查询，报表统计菜单项颜色-->
+    <color name="data_inquiry_gird_menu_color1">#2f95dd</color>
+    <color name="data_inquiry_gird_menu_color2">#9b7dc9</color>
+    <color name="data_inquiry_gird_menu_color3">#de935b</color>
+    <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>
 </resources>

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

@@ -1210,6 +1210,8 @@
     <string name="work_oa">行政办公</string>
     <string name="work_business_manage">商务管理</string>
     <string name="work_business_mall">优软商城</string>
+    <string name="work_data_inquiry">数据查询</string>
+    <string name="work_report_statistics">报表统计</string>
     <!--我-->
     <string name="user_title">我</string>
     <string name="user_firend_cirle">我的工作圈</string>