From ed31995cd014fefb20ed7e7c774a12b05ca8d736 Mon Sep 17 00:00:00 2001
From: ZCShou <72115@163.com>
Date: Fri, 18 Jun 2021 13:12:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=90=9C=E7=B4=A2=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E7=AC=AC=E4=B8=80=E6=AC=A1=E4=B8=8D=E8=83=BD=E6=AD=A3?=
 =?UTF-8?q?=E5=B8=B8=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zcshou/gogogo/HistoryActivity.java | 15 +++++++--------
 .../java/com/zcshou/gogogo/MainActivity.java    | 17 ++++-------------
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/com/zcshou/gogogo/HistoryActivity.java b/app/src/main/java/com/zcshou/gogogo/HistoryActivity.java
index 3ab4a9b..699f72d 100644
--- a/app/src/main/java/com/zcshou/gogogo/HistoryActivity.java
+++ b/app/src/main/java/com/zcshou/gogogo/HistoryActivity.java
@@ -39,7 +39,7 @@ public class HistoryActivity extends BaseActivity {
     private static final String KEY_LNG_LAT_CUSTOM = "KEY_LNG_LAT_CUSTOM";
 
     private ListView mRecordListView;
-    private SQLiteDatabase mSqliteDB;
+    private SQLiteDatabase mHistoryLocationDB;
     private List<Map<String, Object>> mAllRecord;
     
     @Override
@@ -62,7 +62,7 @@ public class HistoryActivity extends BaseActivity {
 
     @Override
     protected void onDestroy() {
-        mSqliteDB.close();
+        mHistoryLocationDB.close();
         super.onDestroy();
     }
 
@@ -106,7 +106,7 @@ public class HistoryActivity extends BaseActivity {
     private void initDataBaseHistoryLocation() {
         try {
             DataBaseHistoryLocation hisLocDBHelper = new DataBaseHistoryLocation(getApplicationContext());
-            mSqliteDB = hisLocDBHelper.getWritableDatabase();
+            mHistoryLocationDB = hisLocDBHelper.getWritableDatabase();
         } catch (Exception e) {
             Log.e("HistoryActivity", "SQLiteDatabase init error");
             e.printStackTrace();
@@ -115,7 +115,6 @@ public class HistoryActivity extends BaseActivity {
         recordArchive();
 
         mAllRecord = fetchAllRecord();
-
     }
 
     //sqlite 操作 查询所有记录
@@ -123,7 +122,7 @@ public class HistoryActivity extends BaseActivity {
         List<Map<String, Object>> data = new ArrayList<>();
 
         try {
-            Cursor cursor = mSqliteDB.query(DataBaseHistoryLocation.TABLE_NAME, null,
+            Cursor cursor = mHistoryLocationDB.query(DataBaseHistoryLocation.TABLE_NAME, null,
                     DataBaseHistoryLocation.DB_COLUMN_ID + " > ?", new String[] {"0"},
                     null, null, DataBaseHistoryLocation.DB_COLUMN_TIMESTAMP + " DESC", null);
 
@@ -180,7 +179,7 @@ public class HistoryActivity extends BaseActivity {
         final long weekSecond = 7 * 24 * 60 * 60;
 
         try {
-            mSqliteDB.delete(DataBaseHistoryLocation.TABLE_NAME,
+            mHistoryLocationDB.delete(DataBaseHistoryLocation.TABLE_NAME,
                     DataBaseHistoryLocation.DB_COLUMN_TIMESTAMP + " < ?", new String[] {Long.toString(System.currentTimeMillis() / 1000 - weekSecond)});
         } catch (Exception e) {
             Log.e("SQLITE", "archive error");
@@ -193,9 +192,9 @@ public class HistoryActivity extends BaseActivity {
 
         try {
             if (ID <= -1) {
-                mSqliteDB.delete(DataBaseHistoryLocation.TABLE_NAME,null, null);
+                mHistoryLocationDB.delete(DataBaseHistoryLocation.TABLE_NAME,null, null);
             } else {
-                mSqliteDB.delete(DataBaseHistoryLocation.TABLE_NAME,
+                mHistoryLocationDB.delete(DataBaseHistoryLocation.TABLE_NAME,
                         DataBaseHistoryLocation.DB_COLUMN_ID + " = ?", new String[] {Integer.toString(ID)});
             }
         } catch (Exception e) {
diff --git a/app/src/main/java/com/zcshou/gogogo/MainActivity.java b/app/src/main/java/com/zcshou/gogogo/MainActivity.java
index eaae366..9cf42f1 100644
--- a/app/src/main/java/com/zcshou/gogogo/MainActivity.java
+++ b/app/src/main/java/com/zcshou/gogogo/MainActivity.java
@@ -241,27 +241,19 @@ public class MainActivity extends BaseActivity
         //找到searchView
         searchItem = menu.findItem(R.id.action_search);
         searchView = (SearchView) searchItem.getActionView();
-        //searchView.setIconified(false);// 设置searchView处于展开状态
-//        searchView.onActionViewExpanded();// 当展开无输入内容的时候，没有关闭的图标
-        // searchView.setIconifiedByDefault(true);//默认为true在框内，设置false则在框外
-        //searchView.setSubmitButtonEnabled(false);//显示提交按钮
+        searchView.setIconified(false);// 设置searchView处于展开状态
+        searchView.onActionViewExpanded();// 当展开无输入内容的时候，没有关闭的图标
+        searchView.setIconifiedByDefault(true);//默认为true在框内，设置false则在框外
+        searchView.setSubmitButtonEnabled(false);//显示提交按钮
         searchItem.setOnActionExpandListener(new  MenuItem.OnActionExpandListener() {
             @Override
             public boolean onMenuItemActionCollapse(MenuItem item) {
-                // Do something when collapsed
-                menu.setGroupVisible(0, true);
-                menu.setGroupVisible(1, true);
-                // searchView.setIconified(false);// 设置searchView处于展开状态
-                // mSearchList.setVisibility(View.GONE);
                 mSearchLayout.setVisibility(View.INVISIBLE);
                 mHistoryLayout.setVisibility(View.INVISIBLE);
                 return true;  // Return true to collapse action view
             }
             @Override
             public boolean onMenuItemActionExpand(MenuItem item) {
-                // Do something when expanded
-                menu.setGroupVisible(0, false);
-                menu.setGroupVisible(1, false);
                 mSearchLayout.setVisibility(View.INVISIBLE);
                 //展示搜索历史
                 List<Map<String, Object>> data = getSearchHistory();
@@ -823,7 +815,6 @@ public class MainActivity extends BaseActivity
 
 
     private void initSearchView() {
-        // 搜索相关
         searchView = findViewById(R.id.action_search);
         mSearchList = findViewById(R.id.search_list_view);
         mSearchLayout = findViewById(R.id.search_linear);