1

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

@@ -7,7 +7,6 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.database.ContentObserver;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
@@ -21,11 +20,10 @@ import com.xplora.xplauncher.R;
 import com.xplora.xplauncher.adapter.ContactsRecyclerAdapter;
 import com.xplora.xplauncher.adapter.RecyclerAdapter;
 import com.xplora.xplauncher.adapter.ViewPagerAdapter;
-import com.xplora.xplauncher.data.MetaData;
+import com.xplora.xplauncher.utils.MetaData;
 import com.xplora.xplauncher.observer.ContactContentObserver;
 import com.xplora.xplauncher.observer.NetworkChangeReceiver;
 import com.xplora.xplauncher.observer.RecentContentObserver;
-import com.xplora.xplauncher.observer.SettingContentObserver;
 import com.xplora.xplauncher.observer.SimStateReceiver;
 import com.xplora.xplauncher.observer.TimeBroadcastReceiver;
 import com.xplora.xplauncher.data.DataManager;

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

@@ -19,12 +19,12 @@ import com.xplora.xplauncher.model.ContactBean;
 import com.xplora.xplauncher.model.RecentBean;
 import com.xplora.xplauncher.utils.Constant;
 import com.xplora.xplauncher.utils.Macros;
+import com.xplora.xplauncher.utils.MetaData;
 import com.xplora.xplauncher.utils.NetworkUtil;
 import com.xplora.xplauncher.utils.ResUtils;
 import com.xplora.xplauncher.utils.ToolsUtils;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 

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

@@ -9,8 +9,8 @@ import android.net.Uri;
 
 import com.xplora.xplauncher.model.ContactBean;
 import com.xplora.xplauncher.model.RecentBean;
-import com.xplora.xplauncher.utils.Constant;
 import com.xplora.xplauncher.utils.Macros;
+import com.xplora.xplauncher.utils.MetaData;
 import com.xplora.xplauncher.utils.ToolsUtils;
 
 import java.util.ArrayList;
@@ -24,9 +24,12 @@ public class DatabaseHelper {
             return testContactList();
         } else {
             ArrayList<ContactBean> arrayList = new ArrayList<>();
-            Uri uri = Uri.parse(Constant.DB_CONTACTS);
-            Cursor cursor = context.getContentResolver().query(uri, null, null, null, null);
-            while (cursor.moveToNext()) {
+            ContentResolver resolver = context.getContentResolver();
+            Uri uri = Uri.parse(MetaData.DB_CONTACTS);
+            Cursor cursor = resolver.query(uri, null, null, null, null);
+            if (cursor == null || !cursor.moveToFirst())
+                return arrayList;
+            do {
                 ContactBean bean = new ContactBean();
                 bean.id = cursor.getString(cursor.getColumnIndex("id"));
                 bean.userId = cursor.getString(cursor.getColumnIndex("userId"));
@@ -39,7 +42,7 @@ public class DatabaseHelper {
                 bean.rate = cursor.getInt(cursor.getColumnIndex("rate"));
                 bean.unRead = cursor.getInt(cursor.getColumnIndex("unRead"));
                 arrayList.add(bean);
-            }
+            } while (cursor.moveToNext());
             cursor.close();
             return arrayList;
         }
@@ -52,7 +55,8 @@ public class DatabaseHelper {
         } else {
             List<RecentBean> dataList = new ArrayList<>();
             ContentResolver resolver = context.getContentResolver();
-            Cursor cursor = resolver.query(MetaData.TABLE_URI_RECENT, null, null, null, null);
+            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"));
@@ -69,30 +73,6 @@ public class DatabaseHelper {
         }
     }
 
-    @SuppressLint("Range")
-    public static List querySetting(Context context) {
-        List dataList = new ArrayList<>();
-        ContentResolver resolver = context.getContentResolver();
-        Cursor cursor = resolver.query(MetaData.TABLE_URI_SETTING, null, null, null, null);
-        if (cursor.moveToNext()) {
-            int watch_face = cursor.getInt(cursor.getColumnIndex(MetaData.KEY_SETTING_WATCHFACE));
-            int app_name = cursor.getInt(cursor.getColumnIndex(MetaData.KEY_SETTING_APPNAME));
-            int quick_app = cursor.getInt(cursor.getColumnIndex(MetaData.KEY_SETTING_QUICKAPP));
-            dataList.add(watch_face);
-            dataList.add(app_name);
-            dataList.add(quick_app);
-        }
-        cursor.close();
-        return dataList;
-    }
-
-    public static void update(Context context, String key, String value) {
-        ContentResolver resolver = context.getContentResolver();
-        ContentValues cv = new ContentValues();
-        cv.put(key, value);
-        resolver.update(MetaData.TABLE_URI_SETTING, cv, null, null);
-    }
-
     public static ArrayList<ContactBean> testContactList() {
         ArrayList<ContactBean> arrayList = new ArrayList<>();
         for (int i = 0; i < 3; i++) {

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

@@ -31,9 +31,6 @@ public class Constant {
     public final static int MSG_DB_OBSERVER_RECENT = 1002;//数据库监控
     public final static int MSG_DB_OBSERVER_SETTING = 3000;//数据库监控
 
-    public final static String DB_CONTENT_URI = "content://com.xplora .WatchCommonProvider/";
-    public final static String DB_CONTACTS = DB_CONTENT_URI + "contact";
-
     public enum E_PAGER_TYPE {
         RECENT,
         CONTACTS,

app/src/main/java/com/xplora/xplauncher/data/MetaData.java → app/src/main/java/com/xplora/xplauncher/utils/MetaData.java

@@ -1,19 +1,10 @@
-package com.xplora.xplauncher.data;
-
-import android.net.Uri;
+package com.xplora.xplauncher.utils;
 
 public class MetaData {
-    private static final String AUTHORITIES = "com.xplora.WatchContactProvider";
-    private static final String CONTENT_URI = "content://" + AUTHORITIES + "/";
-
-    private static final String TABLE_NAME_RECENT = "recent";
-    private static final String TABLE_NAME_CONTACT = "contact";
-    private static final String TABLE_NAME_SETTING = "setting";
-    public static final Uri TABLE_URI_RECENT = Uri.parse(CONTENT_URI + TABLE_NAME_RECENT);
-    public static final Uri TABLE_URI_CONTACT = Uri.parse(CONTENT_URI + TABLE_NAME_CONTACT);
-    public static final Uri TABLE_URI_SETTING = Uri.parse(CONTENT_URI + TABLE_NAME_SETTING);
+    public final static String AUTHORITIES_CONTACTS = "content://com.xplora.WatchContactProvider";
+    public final static String DB_RECENT = AUTHORITIES_CONTACTS + "/recent";
+    public final static String DB_CONTACTS = AUTHORITIES_CONTACTS + "/contact";
 
-    //KEY
     public static final String KEY_CONTACT_USERID = "userId";
     public static final String KEY_CONTACT_PHOTO = "photo";
     public static final String KEY_CONTACT_NAME = "name";
@@ -25,7 +16,6 @@ public class MetaData {
     public static final String KEY_SETTING_APPNAME = "app_name";
     public static final String KEY_SETTING_QUICKAPP = "quick_app";
 
-    //KEY
     public static final String KEY_APP_NAME = "app_name";
     public static final String KEY_WATCH_FACE = "watch_face";
     public static final String KEY_QUICK_APP = "quick_app";