1

app/src/main/java/com/xplora/xplauncher/activity/MainActivity.java

@@ -467,20 +467,23 @@ public class MainActivity extends BaseActivity implements Listener.ButtonListene
     }
 
     private void registerContentObserver() {
-        if (Macros.DEBUG_DATABASE)
-            return;
-        mRecentObserver = new RecentContentObserver(mHandler);
-        mContactObserver = new ContactContentObserver(mHandler);
-
-        getContentResolver().registerContentObserver(Uri.parse(MetaData.DB_RECENT), true, mRecentObserver);
-        getContentResolver().registerContentObserver(Uri.parse(MetaData.DB_CONTACTS), true, mContactObserver);
+        if (!Macros.DEBUG_DATABASE_RECENT) {
+            mRecentObserver = new RecentContentObserver(mHandler);
+            getContentResolver().registerContentObserver(Uri.parse(MetaData.DB_RECENT), true, mRecentObserver);
+        }
+        if (!Macros.DEBUG_DATABASE_CONTACT) {
+            mContactObserver = new ContactContentObserver(mHandler);
+            getContentResolver().registerContentObserver(Uri.parse(MetaData.DB_CONTACTS), true, mContactObserver);
+        }
     }
 
     private void unRegisterContentObserver() {
-        if (Macros.DEBUG_DATABASE)
-            return;
-        getContentResolver().unregisterContentObserver(mContactObserver);
-        getContentResolver().unregisterContentObserver(mRecentObserver);
+        if (!Macros.DEBUG_DATABASE_RECENT) {
+            getContentResolver().unregisterContentObserver(mRecentObserver);
+        }
+        if (!Macros.DEBUG_DATABASE_CONTACT) {
+            getContentResolver().unregisterContentObserver(mContactObserver);
+        }
     }
 
     @Override

app/src/main/java/com/xplora/xplauncher/data/DatabaseHelper.java

@@ -18,9 +18,34 @@ import java.util.List;
 
 public class DatabaseHelper {
 
+    @SuppressLint("Range")
+    public static List<RecentBean> queryRecent(Context context) {
+        if (Macros.DEBUG_DATABASE_RECENT) {
+            return testRecentList();
+        } else {
+            List<RecentBean> dataList = new ArrayList<>();
+            ContentResolver resolver = context.getContentResolver();
+            Uri uri = Uri.parse(MetaData.DB_RECENT);
+            Cursor cursor = resolver.query(uri, null, null, null, null);
+            while (cursor.moveToNext()) {
+                RecentBean bean = new RecentBean();
+                bean._id = cursor.getInt(cursor.getColumnIndex("_id"));
+                bean.caller = cursor.getString(cursor.getColumnIndex("caller"));
+                bean.callee = cursor.getString(cursor.getColumnIndex("callee"));
+                bean.userId = cursor.getString(cursor.getColumnIndex("userId"));
+                bean.start = cursor.getInt(cursor.getColumnIndex("start"));
+                bean.end = cursor.getInt(cursor.getColumnIndex("end"));
+                bean.type = cursor.getInt(cursor.getColumnIndex("type"));
+                dataList.add(bean);
+            }
+            cursor.close();
+            return dataList;
+        }
+    }
+
     @SuppressLint("Range")
     public static ArrayList<ContactBean> queryContacts(Context context) {
-        if (Macros.DEBUG_DATABASE) {
+        if (Macros.DEBUG_DATABASE_CONTACT) {
             return testContactList();
         } else {
             ArrayList<ContactBean> arrayList = new ArrayList<>();
@@ -48,29 +73,16 @@ public class DatabaseHelper {
         }
     }
 
-    @SuppressLint("Range")
-    public static List<RecentBean> queryRecent(Context context) {
-        if (Macros.DEBUG_DATABASE) {
-            return testRecentList();
-        } else {
-            List<RecentBean> dataList = new ArrayList<>();
-            ContentResolver resolver = context.getContentResolver();
-            Uri uri = Uri.parse(MetaData.DB_RECENT);
-            Cursor cursor = resolver.query(uri, null, null, null, null);
-            while (cursor.moveToNext()) {
-                RecentBean bean = new RecentBean();
-                bean._id = cursor.getInt(cursor.getColumnIndex("_id"));
-                bean.caller = cursor.getString(cursor.getColumnIndex("caller"));
-                bean.callee = cursor.getString(cursor.getColumnIndex("callee"));
-                bean.userId = cursor.getString(cursor.getColumnIndex("userId"));
-                bean.start = cursor.getInt(cursor.getColumnIndex("start"));
-                bean.end = cursor.getInt(cursor.getColumnIndex("end"));
-                bean.type = cursor.getInt(cursor.getColumnIndex("type"));
-                dataList.add(bean);
-            }
-            cursor.close();
-            return dataList;
+    public static ArrayList<RecentBean> testRecentList() {
+        ArrayList<RecentBean> recentList = new ArrayList<>();
+        for (int i = 0; i < 4; i++) {
+            RecentBean model = new RecentBean();
+            model.caller = "Grandma";
+            model.type = i;
+            model.start = ToolsUtils.getCurrentTimeSecond();
+            recentList.add(model);
         }
+        return recentList;
     }
 
     public static ArrayList<ContactBean> testContactList() {
@@ -83,16 +95,4 @@ public class DatabaseHelper {
         }
         return arrayList;
     }
-
-    public static ArrayList<RecentBean> testRecentList() {
-        ArrayList<RecentBean> recentList = new ArrayList<>();
-        for (int i = 0; i < 4; i++) {
-            RecentBean model = new RecentBean();
-            model.caller = "Grandma";
-            model.type = i;
-            model.start = ToolsUtils.getCurrentTimeSecond();
-            recentList.add(model);
-        }
-        return recentList;
-    }
 }

app/src/main/java/com/xplora/xplauncher/utils/Macros.java

@@ -5,7 +5,8 @@ public class Macros {
     //TODO:测试使用,正式版本需要关闭false
     public static boolean DEBUG = true;
 
-    public static boolean DEBUG_DATABASE = false; //模拟数据库中数据
+    public static boolean DEBUG_DATABASE_RECENT = false; //模拟数据库中数据
+    public static boolean DEBUG_DATABASE_CONTACT = false; //模拟数据库中数据
     public static boolean DEBUG_SYSTEMPROVIDER = false; //模拟数据库中数据
 
     public static boolean DEBUG_ALL_APPS = true; //安装的应用不筛选app