From: TrillGates Date: Mon, 19 Jul 2021 06:10:38 +0000 (+0800) Subject: add notification page. X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=fa2e98420d685f1676516a157542fa8cf38821f9;p=iclooplauncher.git add notification page. --- diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 037be04..19b88ed 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -47,6 +47,13 @@ + + + + + diff --git a/app/src/main/java/com/ic/launcher/NotificationActivity.java b/app/src/main/java/com/ic/launcher/NotificationActivity.java new file mode 100644 index 0000000..4406bac --- /dev/null +++ b/app/src/main/java/com/ic/launcher/NotificationActivity.java @@ -0,0 +1,35 @@ +package com.ic.launcher; + +import android.os.Bundle; + +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; + +import com.ic.launcher.presenter.NotificationPresenter; + +public class NotificationActivity extends AppCompatActivity { + + private NotificationPresenter notificationPresenter; + + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_notification); + notificationPresenter = NotificationPresenter.getsInstance(this); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (notificationPresenter != null) { + notificationPresenter.onClean(); + } + } + + @Override + protected void onResume() { + super.onResume(); + //更新数据 + notificationPresenter.updateData(); + } +} diff --git a/app/src/main/java/com/ic/launcher/data/NotificationItem.java b/app/src/main/java/com/ic/launcher/data/NotificationItem.java new file mode 100644 index 0000000..762673c --- /dev/null +++ b/app/src/main/java/com/ic/launcher/data/NotificationItem.java @@ -0,0 +1,70 @@ +package com.ic.launcher.data; + +public class NotificationItem { + private int id; + private String title; + private long date; + private String category; + private String type; + private int order; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public long getDate() { + return date; + } + + public void setDate(long date) { + this.date = date; + } + + public String getCategory() { + return category; + } + + public void setCategory(String category) { + this.category = category; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public int getOrder() { + return order; + } + + public void setOrder(int order) { + this.order = order; + } + + @Override + public String toString() { + return "NotificationItem{" + + "id=" + id + + ", title='" + title + '\'' + + ", date=" + date + + ", category='" + category + '\'' + + ", type='" + type + '\'' + + ", order=" + order + + '}'; + } +} diff --git a/app/src/main/java/com/ic/launcher/presenter/BasePresenter.java b/app/src/main/java/com/ic/launcher/presenter/BasePresenter.java index 3126eff..756e4de 100644 --- a/app/src/main/java/com/ic/launcher/presenter/BasePresenter.java +++ b/app/src/main/java/com/ic/launcher/presenter/BasePresenter.java @@ -2,7 +2,7 @@ package com.ic.launcher.presenter; public class BasePresenter { - protected void onClean() { + public void onClean() { } } diff --git a/app/src/main/java/com/ic/launcher/presenter/MainPagePresenter.java b/app/src/main/java/com/ic/launcher/presenter/MainPagePresenter.java index 345b1cd..59b4048 100644 --- a/app/src/main/java/com/ic/launcher/presenter/MainPagePresenter.java +++ b/app/src/main/java/com/ic/launcher/presenter/MainPagePresenter.java @@ -7,8 +7,6 @@ import android.content.IntentFilter; import android.database.ContentObserver; import android.database.Cursor; import android.net.Uri; -import android.os.Handler; -import android.os.HandlerThread; import android.text.TextUtils; import androidx.annotation.NonNull; @@ -25,6 +23,8 @@ import org.threeten.bp.format.DateTimeFormatter; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import static com.ic.launcher.utils.Constants.NOTIFICATIONS; + public class MainPagePresenter extends BasePresenter { public static final String PATH = "settings"; @@ -52,26 +52,21 @@ public class MainPagePresenter extends BasePresenter { public MutableLiveData envTempValue = new MutableLiveData<>(); private final Context mContext; - private final Handler handler; private MainPagePresenter(Context context) { this.mContext = context; //监听数据变化 executor = Executors.newSingleThreadExecutor(); - - HandlerThread handlerThread = new HandlerThread("ic:launcher.main.page"); - //开启任务执行 - handlerThread.start(); - handler = new Handler(handlerThread.getLooper()); - //handler.post(updateTimeTask); - //监听网路广播 - registerTimeDateReceiver(); - updateTime(null); - observerContent(context); - updateTemperature(); - updateOxygen(); - updateEnvTemp(); - updateHeartRate(); + executor.execute(() -> { + //监听网路广播 + registerTimeDateReceiver(); + updateTime(null); + updateTemperature(); + updateOxygen(); + updateEnvTemp(); + updateHeartRate(); + observerContent(context); + }); } private final BroadcastReceiver mIntentReceiver = new BroadcastReceiver() { @@ -138,7 +133,7 @@ public class MainPagePresenter extends BasePresenter { } @Override - protected void onClean() { + public void onClean() { super.onClean(); mContext.unregisterReceiver(mIntentReceiver); } @@ -188,6 +183,15 @@ public class MainPagePresenter extends BasePresenter { updateEnvTemp(); } }); + //监听警告地方 + context.getContentResolver().registerContentObserver(Uri.parse(NOTIFICATIONS), + true, new ContentObserver(null) { + @Override + public void onChange(boolean selfChange) { + //打开通知列表 + + } + }); } private void getValueByKey(String key) { diff --git a/app/src/main/java/com/ic/launcher/presenter/NotificationPresenter.java b/app/src/main/java/com/ic/launcher/presenter/NotificationPresenter.java new file mode 100644 index 0000000..da3e416 --- /dev/null +++ b/app/src/main/java/com/ic/launcher/presenter/NotificationPresenter.java @@ -0,0 +1,84 @@ +package com.ic.launcher.presenter; + +import android.content.ContentResolver; +import android.content.Context; +import android.database.Cursor; +import android.net.Uri; + +import androidx.lifecycle.MutableLiveData; + +import com.ic.iclooger.ICLogger; +import com.ic.launcher.data.NotificationItem; +import com.ic.launcher.utils.Constants; + +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + +public class NotificationPresenter extends BasePresenter { + private final Context mContext; + private final ExecutorService executorService; + private final ContentResolver contentResolver; + + private NotificationPresenter(Context context) { + this.mContext = context; + executorService = Executors.newSingleThreadExecutor(); + contentResolver = mContext.getContentResolver(); + } + + private static NotificationPresenter sInstance = null; + + public static NotificationPresenter getsInstance(Context context) { + if (sInstance == null) { + sInstance = new NotificationPresenter(context); + } + return sInstance; + } + + @Override + public void onClean() { + super.onClean(); + sInstance = null; + executorService.shutdown(); + } + + //关心的数据 + public MutableLiveData> notificationListValue = new MutableLiveData<>(); + + /** + * 更新通知列表 + */ + public void updateData() { + executorService.execute(() -> { + //获取通知列表 + Cursor query = contentResolver.query(Uri.parse(Constants.NOTIFICATIONS), + null, null, null, null); + if (query != null) { + List notificationItems = new ArrayList<>(); + while (query.moveToNext()) { + //创建Item + NotificationItem notificationItem = new NotificationItem(); + //读取数据 + int id = query.getInt(0); + notificationItem.setId(id); + String title = query.getString(1); + notificationItem.setTitle(title); + String type = query.getString(2); + notificationItem.setType(type); + String category = query.getString(3); + notificationItem.setCategory(category); + int order = query.getInt(4); + notificationItem.setOrder(order); + long date = query.getLong(5); + notificationItem.setDate(date); + ICLogger.d("notificationItem == > " + notificationItem.toString()); + //设置数据 + notificationItems.add(notificationItem); + } + notificationListValue.postValue(notificationItems); + query.close(); + } + }); + } +} diff --git a/app/src/main/java/com/ic/launcher/utils/Constants.java b/app/src/main/java/com/ic/launcher/utils/Constants.java index e4c35be..84676ab 100644 --- a/app/src/main/java/com/ic/launcher/utils/Constants.java +++ b/app/src/main/java/com/ic/launcher/utils/Constants.java @@ -12,4 +12,9 @@ public class Constants { public static final String AUTHORITY_ALARM = "com.ic.provider.alarm"; public static final String ALARMS = "content://" + AUTHORITY_ALARM + "/" + PATH_ALARM; + + public static final String PATH_NOTIFICATION = "notification"; + public static final String AUTHORITY_NOTIFICATION = "com.ic.notification"; + public static final String NOTIFICATIONS = "content://" + AUTHORITY_NOTIFICATION + "/" + PATH_NOTIFICATION; + } diff --git a/app/src/main/res/layout/activity_notification.xml b/app/src/main/res/layout/activity_notification.xml new file mode 100644 index 0000000..61a4490 --- /dev/null +++ b/app/src/main/res/layout/activity_notification.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file