合并查询统计代码

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

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

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

@@ -1,32 +0,0 @@
-package com.xzjmyk.pm.activity.ui.erp.activity;
-
-import android.os.Bundle;
-import android.support.v7.app.ActionBar;
-import android.view.LayoutInflater;
-import android.view.View;
-
-import com.xzjmyk.pm.activity.R;
-import com.core.base.BaseActivity;
-import com.core.widget.VoiceSearchView;
-
-/**
- * Created by RaoMeng on 2017/8/3.
- * 数据查询列表页面
- */
-public class DataInquiryListActivity extends BaseActivity {
-    private VoiceSearchView mVoiceSearchView;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_data_inquiry_list);
-
-        View view = LayoutInflater.from(ct).inflate(R.layout.action_data_inquiry_list, null);
-        ActionBar bar = this.getSupportActionBar();
-        bar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
-        mVoiceSearchView = (VoiceSearchView) view.findViewById(R.id.data_inquiry_searchview);
-        bar.setCustomView(view);
-    }
-
-
-}

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

@@ -17,18 +17,19 @@ import android.widget.ProgressBar;
 
 import com.alibaba.fastjson.JSON;
 import com.common.data.StringUtil;
-import com.handmark.pulltorefresh.library.PullToRefreshWebView;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.MainActivity;
+import com.core.app.Constants;
 import com.core.base.BaseActivity;
 import com.core.model.LoginEntity;
 import com.core.net.http.ViewUtil;
+import com.core.utils.FlexJsonUtil;
+import com.handmark.pulltorefresh.library.PullToRefreshWebView;
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.util.im.Blowfish;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.app.Constants;
-import com.core.utils.FlexJsonUtil;
 
 import org.apache.http.util.EncodingUtils;
+import org.jivesoftware.smack.util.StringUtils;
 
 import java.util.Date;
 import java.util.HashMap;

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

@@ -21,6 +21,7 @@ import android.widget.TextView;
 
 import com.common.LogUtil;
 import com.core.app.Constants;
+import com.core.utils.CommonUtil;
 import com.core.widget.ClearEditText;
 import com.core.widget.EmptyLayout;
 import com.core.widget.MyListView;
@@ -45,7 +46,6 @@ import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.bean.SchemeConditionBe
 import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.database.HistoricalRecordBean;
 import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.database.HistoricalRecordDao;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -266,7 +266,7 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 int reallyPosition = (int) parent.getItemIdAtPosition(position);
-                if (CommonUtil.isRepeatClick()) {
+                if (com.xzjmyk.pm.activity.util.oa.CommonUtil.isRepeatClick()) {
                     if (mOldPosition == reallyPosition) {
                         mDataInquiryFlexAdapter.getObjects().get(reallyPosition).setIsFlex(!mDataInquiryFlexAdapter.getObjects().get(reallyPosition).isFlex());
                         mDataInquiryFlexAdapter.notifyDataSetChanged();

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

@@ -12,6 +12,7 @@ import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.core.utils.CommonUtil;
 import com.github.barteksc.pdfviewer.PDFView;
 import com.github.barteksc.pdfviewer.listener.OnDrawListener;
 import com.github.barteksc.pdfviewer.listener.OnErrorListener;
@@ -23,7 +24,6 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.Constants;
 import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.PDFUtils;
-import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 
 import java.io.File;
 

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

@@ -15,16 +15,16 @@ import android.view.View;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import com.common.LogUtil;
+import com.common.system.PermissionUtil;
+import com.core.app.Constants;
+import com.core.utils.CommonUtil;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.adapter.ReportQueryConditionAdapter;
 import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.bean.GridMenuReportStatisticsBean;
 import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.bean.ReportConditionBean;
 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 com.xzjmyk.pm.activity.util.PermissionUtil;
 
 import org.json.JSONArray;
 import org.json.JSONException;

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

@@ -8,9 +8,9 @@ import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 
+import com.core.widget.MyListView;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.bean.DataInquiryFlexBean;
-import com.xzjmyk.pm.activity.view.MyListView;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -14,10 +14,10 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.common.data.CalendarUtil;
+import com.core.widget.view.MyGridView;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.bean.SchemeConditionBean;
-import com.xzjmyk.pm.activity.util.CalendarUtils;
-import com.xzjmyk.pm.activity.view.MyGridView;
 import com.xzjmyk.pm.activity.view.wheel.OASigninPicker;
 
 import java.util.ArrayList;
@@ -375,7 +375,7 @@ public class DataInquirySchemeConditionAdapter extends BaseAdapter {
         try {
             picker.setSelectedItem(Integer.parseInt(year), Integer.parseInt(month), Integer.parseInt(day));
         } catch (Exception e) {
-            picker.setSelectedItem(CalendarUtils.getCurrentYear(), CalendarUtils.getCurrentMonth(), CalendarUtils.getCurrentDate());
+            picker.setSelectedItem(CalendarUtil.getYear(), CalendarUtil.getMonth(), CalendarUtil.getDay());
         }
         picker.setOnDateTimePickListener(new OASigninPicker.OnDateTimePickListener() {
             @Override

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

@@ -14,10 +14,10 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.common.data.CalendarUtil;
+import com.core.widget.view.MyGridView;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.bean.ReportConditionBean;
-import com.xzjmyk.pm.activity.util.CalendarUtils;
-import com.xzjmyk.pm.activity.view.MyGridView;
 import com.xzjmyk.pm.activity.view.wheel.OASigninPicker;
 
 import java.text.SimpleDateFormat;
@@ -396,7 +396,7 @@ public class ReportQueryConditionAdapter extends BaseAdapter {
         try {
             picker.setSelectedItem(Integer.parseInt(year), Integer.parseInt(month), Integer.parseInt(day));
         } catch (Exception e) {
-            picker.setSelectedItem(CalendarUtils.getCurrentYear(), CalendarUtils.getCurrentMonth(), CalendarUtils.getCurrentDate());
+            picker.setSelectedItem(CalendarUtil.getYear(), CalendarUtil.getMonth(), CalendarUtil.getDay());
         }
         picker.setOnDateTimePickListener(new OASigninPicker.OnDateTimePickListener() {
             @Override

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

@@ -9,12 +9,12 @@ import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
 
+import com.core.widget.view.MyGridView;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.activity.ReportQueryCriteriaActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.activity.ReportStatisticsMoreMenuActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.bean.DataInquiryGirdItemBean;
 import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.bean.GridMenuReportStatisticsBean;
-import com.xzjmyk.pm.activity.view.MyGridView;
 
 import java.io.Serializable;
 import java.util.ArrayList;

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

@@ -4,7 +4,7 @@ import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 
-import com.xzjmyk.pm.activity.db.DatabaseManager;
+import com.core.db.DatabaseManager;
 
 import java.util.ArrayList;
 import java.util.List;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/message/ProcessMsgActivity.java

@@ -32,6 +32,7 @@ import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
+import com.core.utils.TimeUtils;
 import com.core.utils.helper.AvatarHelper;
 import com.core.widget.EmptyLayout;
 import com.core.widget.VoiceSearchView;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/ApprovaNodeUtil.java

@@ -12,6 +12,8 @@ import com.core.model.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.Approval;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
+import org.jivesoftware.smack.util.StringUtils;
+
 import java.util.ArrayList;
 import java.util.List;
 

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

@@ -104,7 +104,7 @@
                     android:textSize="16sp"/>
             </LinearLayout>
 
-            <com.xzjmyk.pm.activity.view.MyListView
+            <com.core.widget.MyListView
                 android:id="@+id/data_inquiry_list_history_data_lv"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"

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

@@ -19,7 +19,7 @@
         android:src="@drawable/ic_menu_retract"/>
 
 
-    <com.xzjmyk.pm.activity.view.MyListView
+    <com.core.widget.MyListView
         android:id="@+id/item_data_inquiry_flex_lv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

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

@@ -136,7 +136,7 @@
 
     </LinearLayout>
 
-    <com.xzjmyk.pm.activity.view.MyGridView
+    <com.core.widget.view.MyGridView
         android:id="@+id/item_data_inquiry_exact_gridview"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

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

@@ -28,7 +28,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <com.xzjmyk.pm.activity.view.MyGridView
+        <com.core.widget.view.MyGridView
             android:id="@+id/data_inquiry_modul_gv"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

app_core/common/src/main/AndroidManifest.xml

@@ -4,6 +4,7 @@
     android:versionName="5.8.9">
 
 
+    <uses-permission android:name="android.permission.CALL_PHONE"/>
     <application
         android:allowBackup="true"
         android:label="@string/app_name"

app_core/common/src/main/java/com/core/utils/CommonUtil.java

@@ -11,18 +11,21 @@ import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.Uri;
 import android.os.Environment;
+import android.os.Handler;
 import android.os.Looper;
 import android.provider.MediaStore;
 import android.text.TextUtils;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.EditText;
 import android.widget.Toast;
 
 import com.afollestad.materialdialogs.MaterialDialog;
-import com.core.app.R;
+import com.andreabaccega.formedittext.BuildConfig;
 import com.common.data.StringUtil;
-import com.common.file.PropertiesUtil;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
 import com.core.app.MyApplication;
+import com.core.app.R;
 import com.umeng.socialize.UMShareListener;
 import com.umeng.socialize.bean.SHARE_MEDIA;
 
@@ -47,21 +50,17 @@ public class CommonUtil {
      * @author：Administrator on 2016/2/18 15:12
      */
     public static String getAppBaseUrl(Context ct) {
-        if (ct==null)return "";
-        String baseUrl =getSharedPreferences(ct, "erp_baseurl");
+        if (ct == null) return "";
+        String baseUrl = getSharedPreferences(ct, "erp_baseurl");
         return baseUrl;
     }
-    
+
     /**
      * Created by FANGlh on 2017/5/5.
      * function:判断是不是发布版本，true：发布版本
      */
     public static Boolean isReleaseVersion() {
-        if (!StringUtil.isEmpty(PropertiesUtil.readData(MyApplication.getInstance(), "release_version", R.raw.versionconfiguration)) &&
-                "true".equals(PropertiesUtil.readData(MyApplication.getInstance(), "release_version", R.raw.versionconfiguration)))
-            return true;
-        else
-            return false;
+        return !BuildConfig.DEBUG;
     }
 
 
@@ -212,6 +211,7 @@ public class CommonUtil {
         double value = sPreferences.getFloat(key, defValues);
         return value;
     }
+
     // 转换dip为px
     public static int convertDip2Px(Context context, int dip) {
         float scale = context.getResources().getDisplayMetrics().density;
@@ -328,9 +328,10 @@ public class CommonUtil {
     public static String getEmcode() {
         boolean isB2b = ApiUtils.getApiModel() instanceof ApiPlatform;
         String emcode = isB2b ? CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "b2b_uu") : CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_username");
-        if (emcode==null)emcode="";
+        if (emcode == null) emcode = "";
         return emcode;
     }
+
     /**
      * @param ：取String[]中首个字符串中的数字 number
      * @author: FANGlh 2016-12-6
@@ -413,8 +414,8 @@ public class CommonUtil {
         dialog.show();
     }
 
-    public static String getUserRole(){
-        String userRole= getSharedPreferences(MyApplication.getInstance(),"userRole");
+    public static String getUserRole() {
+        String userRole = getSharedPreferences(MyApplication.getInstance(), "userRole");
         return userRole;
     }
 
@@ -471,6 +472,7 @@ public class CommonUtil {
         }
         return sb.toString();
     }
+
     /**
      * @return 返回double保留两位小数
      * @author: FANGlh 2017-3-30
@@ -493,6 +495,7 @@ public class CommonUtil {
         final float scale = context.getResources().getDisplayMetrics().density;
         return (int) (dpValue * scale + 0.5f);
     }
+
     public static boolean isMainThread() {
         return Looper.getMainLooper().getThread() == Thread.currentThread();
     }
@@ -515,4 +518,60 @@ public class CommonUtil {
         }
         return 0;
     }
+
+
+    /**
+     * 打开软键盘
+     *
+     * @param mEditText 输入框
+     * @param mContext  上下文
+     */
+    public static void openKeybord(final EditText mEditText, final Context mContext) {
+        if (mContext != null) {
+            new Handler().postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    InputMethodManager imm = (InputMethodManager) mContext
+                            .getSystemService(Context.INPUT_METHOD_SERVICE);
+                    imm.showSoftInput(mEditText, 0);
+//            imm.toggleSoftInput(InputMethodManager.SHOW_FORCED,
+//                    InputMethodManager.HIDE_IMPLICIT_ONLY);
+                }
+            }, 100);
+        }
+    }
+
+    /**
+     * 关闭软键盘
+     *
+     * @param mEditText 输入框
+     * @param mContext  上下文
+     */
+    public static void closeKeybord(final EditText mEditText, final Context mContext) {
+        if (mContext != null) {
+            mEditText.postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    InputMethodManager imm = (InputMethodManager) mContext
+                            .getSystemService(Context.INPUT_METHOD_SERVICE);
+//                    if (imm.isActive(mEditText)){
+                    imm.hideSoftInputFromWindow(mEditText.getWindowToken(), 0);
+//                    }
+                }
+            }, 100);
+
+//            final Activity activity = (Activity) mContext;
+//            activity.runOnUiThread(new Runnable() {
+//                @Override
+//                public void run() {
+//                    InputMethodManager mInputKeyBoard = (InputMethodManager) mContext.getSystemService(Context.INPUT_METHOD_SERVICE);
+//                    if (activity.getCurrentFocus() != null) {
+//                        mInputKeyBoard.hideSoftInputFromWindow(activity.getCurrentFocus().getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
+////                        activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
+//                    }
+//                }
+//            });
+        }
+
+    }
 }

app_core/common/src/main/res/layout/action_data_inquiry_list.xml

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

app_core/common/src/main/res/layout/activity_data_inquiry.xml

@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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="match_parent"
-              android:background="@color/bg_underlying"
-              android:orientation="vertical"
-              android:padding="@dimen/activity_vertical_margin">
-
-    <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/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.core.widget.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>
-
-</LinearLayout>

app_core/common/src/main/res/layout/activity_data_inquiry_list.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical">
-
-    <ListView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <com.core.widget.view.MyGridView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
-            android:numColumns="2"/>
-
-        <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"
-            />
-    </LinearLayout>
-</RelativeLayout>

app_core/common/src/main/res/layout/item_list_data_inquiry.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:orientation="vertical">
-
-    <TextView
-        android:layout_width="60dp"
-        android:layout_height="60dp"
-        android:background="@drawable/shape_item_data_inquiry_blue"
-        android:gravity="center"
-        android:textColor="@color/white"
-        android:textSize="18sp"
-        tools:text="物"
-        />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="6dp"
-        android:gravity="center"
-        android:textSize="14sp"
-        tools:text="物料资料"
-        />
-</LinearLayout>