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

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

@@ -17,6 +17,7 @@ import android.widget.AdapterView;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.common.LogUtil;
@@ -89,6 +90,7 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
     private TextView mExactOptionResetTv;
     private TextView mExactOptionConfirmTv;
     private View mFuzzyViewBg, mExactViewBg;
+    private RelativeLayout mTotalHideRl;
     private Animation mInAnimation, mOutAnimation;
     private int mPageIndex = 1, mPagesize = 10;
     private List<HistoricalRecordBean> mHistoricalRecordBeans;
@@ -155,16 +157,21 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
         mHistoricalRecordAdapter = new HistoricalRecordAdapter(DataInquiryListActivity.this, mHistoricalRecordBeans);
         mHistoryDataLv.setAdapter(mHistoricalRecordAdapter);
 
-        List<HistoricalRecordBean> historicalRecordBeansById = HistoricalRecordDao.getInstance().getHistoricalRecordBeansById(mSchemeId);
-        if (historicalRecordBeansById.size() > 0) {
-            for (int i = 0; i < historicalRecordBeansById.size(); i++) {
-                if (i < 6) {
-                    mHistoricalRecordBeans.add(historicalRecordBeansById.get(i));
+        try {
+            List<HistoricalRecordBean> historicalRecordBeansById = HistoricalRecordDao.getInstance().getHistoricalRecordBeansById(mSchemeId);
+            if (historicalRecordBeansById.size() > 0) {
+                for (int i = 0; i < historicalRecordBeansById.size(); i++) {
+                    if (i < 6) {
+                        mHistoricalRecordBeans.add(historicalRecordBeansById.get(i));
+                    }
                 }
+                mHistoricalRecordAdapter.notifyDataSetChanged();
             }
-            mHistoricalRecordAdapter.notifyDataSetChanged();
+        }catch (Exception e){
+
         }
 
+
         if (!CommonUtil.isNetWorkConnected(this)) {
             mEmptyLayout.setErrorMessage(getString(R.string.networks_out));
             mEmptyLayout.showError();
@@ -211,6 +218,7 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
         mTotalLv = (ListView) findViewById(R.id.data_inquiry_list_total_lv);
         mFuzzyViewBg = findViewById(R.id.data_inquiry_list_fuzzy_bg);
         mExactViewBg = findViewById(R.id.data_inquiry_list_exact_bg);
+        mTotalHideRl = (RelativeLayout) findViewById(R.id.data_inquiry_list_total_hide_rl);
 
 //        mFuzzyWholeLl.setLayerType(View.LAYER_TYPE_HARDWARE, null);
 //        mExactWholeLl.setLayerType(View.LAYER_TYPE_HARDWARE, null);
@@ -393,6 +401,16 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                 }
             }
         });
+
+        mTotalHideRl.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (mTotalLl.getVisibility() == View.VISIBLE) {
+                    mTotalLl.setVisibility(View.GONE);
+                }
+                mTotalSpreadImageView.setVisibility(View.VISIBLE);
+            }
+        });
     }
 
 
@@ -449,15 +467,19 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                         historicalRecordBean.setSearchField(mSearchField);
                         HistoricalRecordDao.getInstance().saveToHistoricalRecord(historicalRecordBean);
 
-                        mHistoricalRecordBeans.clear();
-                        List<HistoricalRecordBean> historicalRecordBeansById = HistoricalRecordDao.getInstance().getHistoricalRecordBeansById(mSchemeId);
-                        if (historicalRecordBeansById.size() > 0) {
-                            for (int i = 0; i < historicalRecordBeansById.size(); i++) {
-                                if (i < 6) {
-                                    mHistoricalRecordBeans.add(historicalRecordBeansById.get(i));
+                        try {
+                            mHistoricalRecordBeans.clear();
+                            List<HistoricalRecordBean> historicalRecordBeansById = HistoricalRecordDao.getInstance().getHistoricalRecordBeansById(mSchemeId);
+                            if (historicalRecordBeansById.size() > 0) {
+                                for (int i = 0; i < historicalRecordBeansById.size(); i++) {
+                                    if (i < 6) {
+                                        mHistoricalRecordBeans.add(historicalRecordBeansById.get(i));
+                                    }
                                 }
+                                mHistoricalRecordAdapter.notifyDataSetChanged();
                             }
-                            mHistoricalRecordAdapter.notifyDataSetChanged();
+                        }catch (Exception e){
+
                         }
                     }
 

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

@@ -56,15 +56,15 @@ public class PDFDownloadActivity extends BaseActivity implements View.OnClickLis
                     }
                     break;
                 case Constants.CONSTANT.DOWNLOAD_SUCCESS:
-                    mStateTextView.setText("报表文件下载成功!");
+                    mStateTextView.setText("报表文件下载成功!\n正在加载....");
                     mDownloadProgressBar.setProgress(100);
                     mRemainTextView.setText("0");
-                    mDownloadRelativeLayout.postDelayed(new Runnable() {
+                    /*mDownloadRelativeLayout.postDelayed(new Runnable() {
                         @Override
                         public void run() {
                             mDownloadRelativeLayout.setVisibility(View.GONE);
                         }
-                    }, 1000);
+                    }, 1000);*/
                     displayFromFile(new File(Constants.CONSTANT.PDF_FILE_PATH, Constants.CONSTANT.PDF_FILE_NAME));
                     break;
                 case Constants.CONSTANT.PDF_OVERLOAD:
@@ -88,28 +88,35 @@ public class PDFDownloadActivity extends BaseActivity implements View.OnClickLis
     };
 
     private void displayFromFile(File fileName) {
-        mPDFView.fromFile(fileName)
+        try {
+            mPDFView.fromFile(fileName)
 //                .pages(0, 2, 1, 3, 3, 3) // all pages are displayed by default
-                .enableSwipe(true) // allows to block changing pages using swipe
+                    .enableSwipe(true) // allows to block changing pages using swipe
 //                .swipeHorizontal(true)
-                .enableDoubletap(true)
-                .defaultPage(0)
-                        // allows to draw something on the current page, usually visible in the middle of the screen
-                .onDraw(this)
-                        // allows to draw something on all pages, separately for every page. Called only for visible pages
-                .onDrawAll(this)
-                .onLoad(this) // called after document is loaded and starts to be rendered
-                .onPageChange(this)
-                .onPageScroll(this)
-                .onError(this)
-                .onRender(this) // called after document is rendered for the first time
-                .enableAnnotationRendering(false) // render annotations (such as comments, colors or forms)
-                .password(null)
-                .scrollHandle(null)
-                .enableAntialiasing(true) // improve rendering a little bit on low-res screens
-                        // spacing between pages in dp. To define spacing color, set view background
-                .spacing(10)
-                .load();
+                    .enableDoubletap(true)
+                    .defaultPage(0)
+                            // allows to draw something on the current page, usually visible in the middle of the screen
+                    .onDraw(this)
+                            // allows to draw something on all pages, separately for every page. Called only for visible pages
+                    .onDrawAll(this)
+                    .onLoad(this) // called after document is loaded and starts to be rendered
+                    .onPageChange(this)
+                    .onPageScroll(this)
+                    .onError(this)
+                    .onRender(this) // called after document is rendered for the first time
+                    .enableAnnotationRendering(false) // render annotations (such as comments, colors or forms)
+                    .password(null)
+                    .scrollHandle(null)
+                    .enableAntialiasing(true) // improve rendering a little bit on low-res screens
+                            // spacing between pages in dp. To define spacing color, set view background
+                    .spacing(10)
+                    .load();
+        } catch (Exception e) {
+            mErrorLinearLayout.setVisibility(View.VISIBLE);
+            mStateTextView.setText("报表文件加载失败！");
+            mDownloadProgressBar.setProgress(0);
+            mRemainTextView.setText(100 + "");
+        }
     }
 
     @Override
@@ -186,7 +193,13 @@ public class PDFDownloadActivity extends BaseActivity implements View.OnClickLis
 
     @Override
     public void loadComplete(int nbPages) {
-
+        mStateTextView.setText("报表文件加载成功");
+        mDownloadRelativeLayout.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                mDownloadRelativeLayout.setVisibility(View.GONE);
+            }
+        }, 1000);
     }
 
     @Override
@@ -206,6 +219,6 @@ public class PDFDownloadActivity extends BaseActivity implements View.OnClickLis
 
     @Override
     public void onInitiallyRendered(int nbPages, float pageWidth, float pageHeight) {
-//        mPDFView.fitToWidth();
+        mPDFView.fitToWidth();
     }
 }

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

@@ -340,7 +340,11 @@ public class ReportQueryCriteriaActivity extends BaseActivity implements View.On
         Intent intent = new Intent();
         intent.setClass(this, PDFDownloadActivity.class);
         if (mCondition.length() != 0) {
-            intent.putExtra("condition", mCondition);
+            if (!TextUtils.isEmpty(mDefaultCondition)) {
+                intent.putExtra("condition", mCondition + " and " + mDefaultCondition);
+            } else {
+                intent.putExtra("condition", mCondition);
+            }
         } else if (!TextUtils.isEmpty(mDefaultCondition)) {
             intent.putExtra("condition", mDefaultCondition);
         } else {

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

@@ -66,7 +66,7 @@ public class DataInquiryTotalAdapter extends BaseAdapter {
     }
 
     private void initializeViews(DataInquiryTotalBean object, ViewHolder holder, int position) {
-        holder.dataInquiryItemTotalCaption.setText("当前合计" + object.getCaption() + ":");
+        holder.dataInquiryItemTotalCaption.setText(object.getCaption() + ":");
         holder.dataInquiryItemTotalValue.setText(mNumberFormat.format(object.getTotal()));
 
         holder.dataInquiryItemTotalDeleteIv.setOnClickListener(new View.OnClickListener() {

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

@@ -3,6 +3,8 @@ package com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.database;
 import android.database.Cursor;
 import android.database.CursorWrapper;
 
+import com.core.db.DatabaseTables;
+
 /**
  * Created by RaoMeng on 2017/8/18.
  * 历史记录的CursorWrapper封装类
@@ -20,9 +22,9 @@ public class HistoricalRecordCursorWrapper extends CursorWrapper {
 
     public HistoricalRecordBean getHistoricalRecord() {
         int id = getInt(getColumnIndex("_id"));
-        String schemeId = getString(getColumnIndex(HistoricalRecordSchema.HistoricalRecordTable.Cols.SCHEME_ID));
-        String schemeName = getString(getColumnIndex(HistoricalRecordSchema.HistoricalRecordTable.Cols.SCHEME_NAME));
-        String searchField = getString(getColumnIndex(HistoricalRecordSchema.HistoricalRecordTable.Cols.SEARCH_FIELD));
+        String schemeId = getString(getColumnIndex(DatabaseTables.HistoricalRecordTable.Cols.SCHEME_ID));
+        String schemeName = getString(getColumnIndex(DatabaseTables.HistoricalRecordTable.Cols.SCHEME_NAME));
+        String searchField = getString(getColumnIndex(DatabaseTables.HistoricalRecordTable.Cols.SEARCH_FIELD));
 
         HistoricalRecordBean historicalRecordBean = new HistoricalRecordBean();
         historicalRecordBean.setId(id);

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

@@ -5,6 +5,7 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 
 import com.core.db.DatabaseManager;
+import com.core.db.DatabaseTables;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -39,9 +40,9 @@ public class HistoricalRecordDao {
     private ContentValues getContentValues(HistoricalRecordBean historicalRecordBean) {
         ContentValues values = new ContentValues();
 
-        values.put(HistoricalRecordSchema.HistoricalRecordTable.Cols.SCHEME_ID, historicalRecordBean.getSchemeId());
-        values.put(HistoricalRecordSchema.HistoricalRecordTable.Cols.SCHEME_NAME, historicalRecordBean.getSchemeName());
-        values.put(HistoricalRecordSchema.HistoricalRecordTable.Cols.SEARCH_FIELD, historicalRecordBean.getSearchField());
+        values.put(DatabaseTables.HistoricalRecordTable.Cols.SCHEME_ID, historicalRecordBean.getSchemeId());
+        values.put(DatabaseTables.HistoricalRecordTable.Cols.SCHEME_NAME, historicalRecordBean.getSchemeName());
+        values.put(DatabaseTables.HistoricalRecordTable.Cols.SEARCH_FIELD, historicalRecordBean.getSearchField());
 
         return values;
     }
@@ -53,7 +54,7 @@ public class HistoricalRecordDao {
      * @return
      */
     public List<HistoricalRecordBean> getHistoricalRecordBeansById(String schemeId) {
-        HistoricalRecordCursorWrapper cursor = queryHistoricalRecord(HistoricalRecordSchema.HistoricalRecordTable.Cols.SCHEME_ID + " = ?",
+        HistoricalRecordCursorWrapper cursor = queryHistoricalRecord(DatabaseTables.HistoricalRecordTable.Cols.SCHEME_ID + " = ?",
                 new String[]{schemeId});
 
         List<HistoricalRecordBean> historicalRecordBeans = new ArrayList<>();
@@ -78,7 +79,7 @@ public class HistoricalRecordDao {
         deleteFromHistoricalRecordByField(historicalRecordBean.getSchemeId(), historicalRecordBean.getSearchField());
 
         ContentValues values = getContentValues(historicalRecordBean);
-        sqLiteDatabase.insert(HistoricalRecordSchema.HistoricalRecordTable.NAME, null, values);
+        sqLiteDatabase.insert(DatabaseTables.HistoricalRecordTable.NAME, null, values);
 
         DatabaseManager.getInstance().closeDatabase();
     }
@@ -86,8 +87,8 @@ public class HistoricalRecordDao {
     public void deleteFromHistoricalRecordById(String schemeId) {
         SQLiteDatabase sqLiteDatabase = DatabaseManager.getInstance().openDatabase();
 
-        sqLiteDatabase.delete(HistoricalRecordSchema.HistoricalRecordTable.NAME,
-                HistoricalRecordSchema.HistoricalRecordTable.Cols.SCHEME_ID + " = ?",
+        sqLiteDatabase.delete(DatabaseTables.HistoricalRecordTable.NAME,
+                DatabaseTables.HistoricalRecordTable.Cols.SCHEME_ID + " = ?",
                 new String[]{schemeId});
 
         DatabaseManager.getInstance().closeDatabase();
@@ -96,9 +97,9 @@ public class HistoricalRecordDao {
     public void deleteFromHistoricalRecordByField(String schemeId, String searchField) {
         SQLiteDatabase sqLiteDatabase = DatabaseManager.getInstance().openDatabase();
 
-        sqLiteDatabase.delete(HistoricalRecordSchema.HistoricalRecordTable.NAME,
-                HistoricalRecordSchema.HistoricalRecordTable.Cols.SEARCH_FIELD + " = ? and "
-                        + HistoricalRecordSchema.HistoricalRecordTable.Cols.SCHEME_ID + " = ?",
+        sqLiteDatabase.delete(DatabaseTables.HistoricalRecordTable.NAME,
+                DatabaseTables.HistoricalRecordTable.Cols.SEARCH_FIELD + " = ? and "
+                        + DatabaseTables.HistoricalRecordTable.Cols.SCHEME_ID + " = ?",
                 new String[]{searchField, schemeId});
 
         DatabaseManager.getInstance().closeDatabase();
@@ -108,8 +109,8 @@ public class HistoricalRecordDao {
         SQLiteDatabase sqLiteDatabase = DatabaseManager.getInstance().openDatabase();
 
         ContentValues values = getContentValues(historicalRecordBean);
-        sqLiteDatabase.update(HistoricalRecordSchema.HistoricalRecordTable.NAME, values,
-                HistoricalRecordSchema.HistoricalRecordTable.Cols.SCHEME_ID + " = ?",
+        sqLiteDatabase.update(DatabaseTables.HistoricalRecordTable.NAME, values,
+                DatabaseTables.HistoricalRecordTable.Cols.SCHEME_ID + " = ?",
                 new String[]{historicalRecordBean.getSchemeId()});
 
         DatabaseManager.getInstance().closeDatabase();
@@ -125,7 +126,7 @@ public class HistoricalRecordDao {
     public HistoricalRecordCursorWrapper queryHistoricalRecord(String whereCause, String[] whereArgs) {
         SQLiteDatabase sqLiteDatabase = DatabaseManager.getInstance().openDatabase();
 
-        Cursor cursor = sqLiteDatabase.query(HistoricalRecordSchema.HistoricalRecordTable.NAME, null,
+        Cursor cursor = sqLiteDatabase.query(DatabaseTables.HistoricalRecordTable.NAME, null,
                 whereCause,
                 whereArgs,
                 null, null, "_id DESC");

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/dialog/QSearchPpwindowUtils.java

@@ -110,6 +110,7 @@ public class QSearchPpwindowUtils{
     private static void handlerQSearch(Activity activity, String text) {
         Log.i("handlerQSearch",text+"");
         String url=null;
+        int request_code = -1;
         Map<String,Object> params = new HashMap<>();
 
         if (text.contains("预约")){
@@ -118,16 +119,17 @@ public class QSearchPpwindowUtils{
             params.put("userid", MyApplication.getInstance().mLoginUser.getUserId());
             params.put("telephone",MyApplication.getInstance().mLoginUser.getTelephone());
             params.put("yearmonth", DateFormatUtil.getStrDate4Date(new Date(System.currentTimeMillis()), "yyyyMM"));
+            request_code = 0x01;
         }else {
             Toast.makeText(MyActivityManager.getCurrentActivity(),"导航"+text+"功能未实现",Toast.LENGTH_LONG).show();
         }
-        CommonHttp(activity,url,params);
+        CommonHttp(activity,url,params,request_code);
 
     }
-    private static void CommonHttp(Activity activity, String comurl, Map<String, Object> params) {
+    private static void CommonHttp(Activity activity, String comurl, Map<String, Object> params,int request_code) {
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(activity, "sessionId"));
-        ViewUtil.httpSendRequest(activity, comurl, params, cHandler, headers, 0x01, null, null, "get");
+        ViewUtil.httpSendRequest(activity, comurl, params, cHandler, headers, request_code, null, null, "get");
     }
 
 

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

@@ -47,20 +47,38 @@
             android:layout_height="0.5dp"
             android:background="@color/gray_light"/>
 
-        <ImageView
-            android:id="@+id/data_inquiry_list_total_hide_iv"
+        <RelativeLayout
+            android:id="@+id/data_inquiry_list_total_hide_rl"
             android:layout_width="match_parent"
             android:layout_height="26dp"
             android:background="@color/background"
-            android:scaleType="centerInside"
-            android:src="@drawable/ic_expansion_retract"/>
+            >
+
+            <ImageView
+                android:id="@+id/data_inquiry_list_total_hide_iv"
+                android:layout_width="wrap_content"
+                android:layout_height="26dp"
+                android:layout_centerInParent="true"
+                android:scaleType="centerInside"
+                android:src="@drawable/ic_expansion_retract"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginRight="10dp"
+                android:layout_toLeftOf="@id/data_inquiry_list_total_hide_iv"
+                android:gravity="center_vertical"
+                android:text="合计"
+                android:textSize="14sp"/>
+
+        </RelativeLayout>
 
         <ListView
             android:id="@+id/data_inquiry_list_total_lv"
             android:layout_width="match_parent"
             android:layout_height="120dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginBottom="10dp"/>
+            android:layout_marginBottom="10dp"
+            android:layout_marginTop="10dp"/>
     </LinearLayout>
 
     <LinearLayout
@@ -83,10 +101,10 @@
                 android:background="#eeeeee"
                 android:clickable="true"
                 android:orientation="horizontal"
+                android:paddingBottom="8dp"
                 android:paddingLeft="16dp"
                 android:paddingRight="16dp"
-                android:paddingTop="8dp"
-                android:paddingBottom="8dp">
+                android:paddingTop="8dp">
 
                 <TextView
                     android:layout_width="0dp"

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

@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:gravity="center_vertical"
     android:orientation="horizontal"
-    android:padding="4dp">
+    android:padding="6dp">
 
     <TextView
         android:id="@+id/data_inquiry_item_total_caption"

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

@@ -1430,7 +1430,7 @@
     <string name="select_query_service">选择查询业务</string>
     <string name="report_query">报表查询</string>
     <string name="report_query_prompt">报表查询结果是PDF文件，\n需要耗费您一些流量....</string>
-    <string name="str_loading">正在加载...</string>
+    <string name="str_loading">正在下载...</string>
     <string name="re_download">重新下载</string>
     <string name="search_history">搜索历史</string>
     <string name="str_clear">清空</string>

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

@@ -1542,7 +1542,7 @@
     <string name="select_query_service">选择查询业务</string>
     <string name="report_query">报表查询</string>
     <string name="report_query_prompt">报表查询结果是PDF文件，\n需要耗费您一些流量....</string>
-    <string name="str_loading">正在加载...</string>
+    <string name="str_loading">正在下载...</string>
     <string name="re_download">重新下载</string>
     <string name="search_history">搜索历史</string>
     <string name="str_clear">清空</string>

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

@@ -1531,7 +1531,7 @@
     <string name="select_query_service">选择查询业务</string>
     <string name="report_query">报表查询</string>
     <string name="report_query_prompt">报表查询结果是PDF文件，\n需要耗费您一些流量....</string>
-    <string name="str_loading">正在加载...</string>
+    <string name="str_loading">正在下载...</string>
     <string name="re_download">重新下载</string>
     <string name="search_history">搜索历史</string>
     <string name="str_clear">清空</string>

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

@@ -1874,7 +1874,7 @@
     <string name="select_query_service">选择查询业务</string>
     <string name="report_query">报表查询</string>
     <string name="report_query_prompt">报表查询结果是PDF文件，\n需要耗费您一些流量....</string>
-    <string name="str_loading">正在加载...</string>
+    <string name="str_loading">正在下载...</string>
     <string name="re_download">重新下载</string>
     <string name="search_history">搜索历史</string>
     <string name="str_clear">清空</string>

app_core/common/src/main/java/com/core/app/Constants.java

@@ -1,5 +1,7 @@
 package com.core.app;
 
+import com.core.db.DatabaseTables;
+
 /**
  * Created by Administrator on 2016/1/30.
  */
@@ -261,6 +263,14 @@ public class Constants {
             + "recorddate varchar(50)"//录入时间yyyy-MM-dd HH:mm:ss
             + ")";
 
+    //数据查询历史记录表
+    public static final String TABLE_HISTORICAL_RECORD = "create table "
+            + DatabaseTables.HistoricalRecordTable.NAME + "("
+            + "_id integer primary key autoincrement, "
+            + DatabaseTables.HistoricalRecordTable.Cols.SCHEME_ID + ", "
+            + DatabaseTables.HistoricalRecordTable.Cols.SCHEME_NAME + ", "
+            + DatabaseTables.HistoricalRecordTable.Cols.SEARCH_FIELD + ")";
+
 
     /**
      * @desc:常量

app_core/common/src/main/java/com/core/db/DBOpenHelper.java

@@ -13,8 +13,8 @@ import com.core.app.Constants;
  * @注释:建立数据库
  */
 public class DBOpenHelper extends SQLiteOpenHelper {
-    //TODO  上一个发布版本是79
-    private static final int DATABASE_VERSION = 81;
+    //TODO  上一个发布版本是81
+    private static final int DATABASE_VERSION = 83;
     public static String dataBaseName = "erp.db";
     public Context context;
 
@@ -54,6 +54,8 @@ public class DBOpenHelper extends SQLiteOpenHelper {
             db.execSQL(Constants.EM_ERPNEWS);//
             db.execSQL(Constants.CREATE_BANNER);//
             db.execSQL(Constants.AUTO_LOG);   //监控日志表
+
+            db.execSQL(Constants.TABLE_HISTORICAL_RECORD);//数据查询历史记录表
         } catch (Exception e) {
 
         }
@@ -94,6 +96,7 @@ public class DBOpenHelper extends SQLiteOpenHelper {
         db.execSQL("DROP TABLE IF EXISTS step");
         db.execSQL("DROP TABLE IF EXISTS SignAutoLog");
         db.execSQL("DROP TABLE IF EXISTS tbl_contacts");
+        db.execSQL("DROP TABLE IF EXISTS " + DatabaseTables.HistoricalRecordTable.NAME);
     }
 
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/datainquiry/database/HistoricalRecordSchema.java → app_core/common/src/main/java/com/core/db/DatabaseTables.java

@@ -1,10 +1,10 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.database;
+package com.core.db;
 
 /**
  * Created by RaoMeng on 2017/8/14.
- * 数据查询历史记录表
+ * 数据库表
  */
-public class HistoricalRecordSchema {
+public class DatabaseTables {
     public static final class HistoricalRecordTable {
         public static final String NAME = "historical_record";
 

app_core/common/src/main/res/raw/versionconfiguration.properties

@@ -1,3 +1,3 @@
 #发布版本状态改为true,测试版本状态为false
-release_version=false
-#release_version=true
+#release_version=false
+release_version=true