From: TrillGates Date: Fri, 18 Jun 2021 08:51:01 +0000 (+0800) Subject: completed main time. X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=d7fdf90e787b6960e155a029304ba21bcc67d9fc;p=iclooplauncher.git completed main time. --- diff --git a/app/build.gradle b/app/build.gradle index fc1b100..0160702 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -110,4 +110,5 @@ dependencies { androidTestImplementation 'androidx.test.ext:junit:1.1.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' implementation files('libs/ICLoger-release.aar') + implementation 'com.jakewharton.threetenabp:threetenabp:1.2.2' } \ No newline at end of file diff --git a/app/src/main/java/com/ic/launcher/loop/App.java b/app/src/main/java/com/ic/launcher/loop/App.java index bec1f3f..6a7e720 100644 --- a/app/src/main/java/com/ic/launcher/loop/App.java +++ b/app/src/main/java/com/ic/launcher/loop/App.java @@ -3,11 +3,13 @@ package com.ic.launcher.loop; import android.app.Application; import com.ic.iclooger.ICLogger; +import com.jakewharton.threetenabp.AndroidThreeTen; public class App extends Application { @Override public void onCreate() { super.onCreate(); + AndroidThreeTen.init(this); ICLogger.init(getApplicationContext(), "LOOP-PAGE-LAUNCHER"); } } diff --git a/app/src/main/java/com/ic/launcher/loop/LauncherActivity.java b/app/src/main/java/com/ic/launcher/loop/LauncherActivity.java index 0eabca3..e864c45 100644 --- a/app/src/main/java/com/ic/launcher/loop/LauncherActivity.java +++ b/app/src/main/java/com/ic/launcher/loop/LauncherActivity.java @@ -10,14 +10,14 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.viewpager2.widget.ViewPager2; import com.ic.launcher.loop.adapter.MainPageAdapter; -import com.ic.launcher.loop.presenter.MainPagePresenter; +import com.ic.launcher.loop.presenter.LauncherPresenter; import com.ic.launcher.loop.view.SimpleStatusBarView; import com.ic.launcher.loop.view.StatusBarView; public class LauncherActivity extends AppCompatActivity { private MainPageAdapter mainPageAdapter; - private MainPagePresenter mainPagePresenter; + private LauncherPresenter mainPagePresenter; private ViewPager2 looperPage; private StatusBarView statusBar; private SimpleStatusBarView simpleStatusBar; @@ -37,7 +37,7 @@ public class LauncherActivity extends AppCompatActivity { } private void initPresenter() { - mainPagePresenter = MainPagePresenter.getInstance(this); + mainPagePresenter = LauncherPresenter.getInstance(this); mainPagePresenter.appListValues.observe(this, newList -> { mainPageAdapter.updateAppList(newList); //数据设置的时候,把页面移动到中间 @@ -84,7 +84,7 @@ public class LauncherActivity extends AppCompatActivity { private void initView() { looperPage = findViewById(R.id.main_looper_pager); - mainPageAdapter = new MainPageAdapter(); + mainPageAdapter = new MainPageAdapter(this); looperPage.setAdapter(mainPageAdapter); statusBar = findViewById(R.id.status_bar); statusBar.initPresenter(this); diff --git a/app/src/main/java/com/ic/launcher/loop/adapter/MainPageAdapter.java b/app/src/main/java/com/ic/launcher/loop/adapter/MainPageAdapter.java index f6949bc..e6dad52 100644 --- a/app/src/main/java/com/ic/launcher/loop/adapter/MainPageAdapter.java +++ b/app/src/main/java/com/ic/launcher/loop/adapter/MainPageAdapter.java @@ -7,16 +7,25 @@ import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.NonNull; +import androidx.lifecycle.LifecycleOwner; import androidx.recyclerview.widget.RecyclerView; +import androidx.viewpager2.widget.ViewPager2; import com.ic.launcher.loop.R; import com.ic.launcher.loop.data.AppItem; +import com.ic.launcher.loop.view.MainPageView; import java.util.ArrayList; import java.util.List; public class MainPageAdapter extends RecyclerView.Adapter { + private final LifecycleOwner mLifeOwner; + + public MainPageAdapter(LifecycleOwner owner) { + this.mLifeOwner = owner; + } + private OnItemClickListener mItemClickListener = null; private List appItemList = new ArrayList<>(); @@ -44,9 +53,12 @@ public class MainPageAdapter extends RecyclerView.Adapter> appListValues = new MutableLiveData<>(); + + private final ExecutorService executorService; + private final IAppListRepository appListRepository; + + private LauncherPresenter(Context context) { + executorService = Executors.newSingleThreadExecutor(); + appListRepository = HardCodeAppListRepository.getInstance(context); + //去获取应用列表内容 + initAppList(); + } + + private void initAppList() { + executorService.execute(() -> { + //获取应用列表 + List appList = appListRepository.getAppList(); + appListValues.postValue(appList); + }); + } + + private static LauncherPresenter sInstance = null; + + public static LauncherPresenter getInstance(Context context) { + if (sInstance == null) { + sInstance = new LauncherPresenter(context); + } + return sInstance; + } +} diff --git a/app/src/main/java/com/ic/launcher/loop/presenter/MainPagePresenter.java b/app/src/main/java/com/ic/launcher/loop/presenter/MainPagePresenter.java index f53d3f3..28d77b7 100644 --- a/app/src/main/java/com/ic/launcher/loop/presenter/MainPagePresenter.java +++ b/app/src/main/java/com/ic/launcher/loop/presenter/MainPagePresenter.java @@ -1,42 +1,141 @@ package com.ic.launcher.loop.presenter; +import android.content.BroadcastReceiver; import android.content.Context; +import android.content.Intent; +import android.content.IntentFilter; +import android.os.Handler; +import android.os.HandlerThread; +import android.text.TextUtils; import androidx.lifecycle.MutableLiveData; -import com.ic.launcher.loop.data.AppItem; -import com.ic.launcher.loop.data.HardCodeAppListRepository; -import com.ic.launcher.loop.data.IAppListRepository; +import com.ic.iclooger.ICLogger; +import com.ic.launcher.loop.R; -import java.util.List; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; +import org.threeten.bp.Instant; +import org.threeten.bp.LocalDateTime; +import org.threeten.bp.ZoneId; +import org.threeten.bp.format.DateTimeFormatter; -/** - * 首页的业务类 - */ public class MainPagePresenter extends BasePresenter { - //关心的数据: - //应用列表 - public MutableLiveData> appListValues = new MutableLiveData<>(); + private static final DateTimeFormatter HH_MM = DateTimeFormatter.ofPattern("HH:mm"); + private static final DateTimeFormatter MM_DD = DateTimeFormatter.ofPattern("MM-dd"); - private final ExecutorService executorService; - private final IAppListRepository appListRepository; + //所关心的数据 + //时间 + public MutableLiveData timeValue = new MutableLiveData<>(); + //日期 + public MutableLiveData dateValue = new MutableLiveData<>(); + //星期 + public MutableLiveData weekValue = new MutableLiveData<>(); + //心率 + public MutableLiveData heartRate = new MutableLiveData<>(); + //血氧 + public MutableLiveData oxygenValue = new MutableLiveData<>(); + //体温 + public MutableLiveData bodyTempValue = new MutableLiveData<>(); + //环境温度 + public MutableLiveData envTempValue = new MutableLiveData<>(); + + private final Context mContext; + private final Handler handler; private MainPagePresenter(Context context) { - executorService = Executors.newSingleThreadExecutor(); - appListRepository = HardCodeAppListRepository.getInstance(context); - //去获取应用列表内容 - initAppList(); + this.mContext = context; + //监听数据变化 + HandlerThread handlerThread = new HandlerThread("ic:launcher.main.page"); + //开启任务执行 + handlerThread.start(); + handler = new Handler(handlerThread.getLooper()); + //handler.post(updateTimeTask); + //监听网路广播 + registerTimeDateReceiver(); + updateTime(null); + //TODO: + } + + private final BroadcastReceiver mIntentReceiver = new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + String action = intent.getAction(); + ICLogger.d("action == > " + action); + if (TextUtils.isEmpty(action)) return; + if (Intent.ACTION_TIMEZONE_CHANGED.equals(action)) { + updateTime(intent.getStringExtra("time-zone")); + } else { + updateTime(null); + } + } + }; + + public void registerTimeDateReceiver() { + IntentFilter filter = new IntentFilter(); + filter.addAction(Intent.ACTION_TIME_TICK); + filter.addAction(Intent.ACTION_TIME_CHANGED); + filter.addAction(Intent.ACTION_TIMEZONE_CHANGED); + mContext.registerReceiver(mIntentReceiver, filter); + } + + + private final Runnable updateTimeTask = new Runnable() { + @Override + public void run() { + //更新时间 + updateTime(null); + //60秒更新一次 + handler.postDelayed(this, 1000 * 60); + } + }; + + private void updateTime(String timeZoom) { + LocalDateTime currDateTime; + if (!TextUtils.isEmpty(timeZoom)) { + ZoneId zone = ZoneId.of(timeZoom).getRules().getOffset(Instant.now()); + currDateTime = LocalDateTime.now(zone); + } else { + currDateTime = LocalDateTime.now(ZoneId.systemDefault()); + } + String format = currDateTime.format(HH_MM); + timeValue.postValue(format); + dateValue.postValue(currDateTime.format(MM_DD)); + computeMainClockTime(currDateTime); + } + + + private void computeMainClockTime(LocalDateTime localDateTime) { + switch (localDateTime.getDayOfWeek()) { + case MONDAY: + weekValue.setValue(mContext.getString(R.string.monday)); + break; + case TUESDAY: + weekValue.setValue(mContext.getString(R.string.tuesday)); + break; + case WEDNESDAY: + weekValue.setValue(mContext.getString(R.string.wednesday)); + break; + case THURSDAY: + weekValue.setValue(mContext.getString(R.string.thursday)); + break; + case FRIDAY: + weekValue.setValue(mContext.getString(R.string.friday)); + break; + case SATURDAY: + weekValue.setValue(mContext.getString(R.string.saturday)); + break; + case SUNDAY: + weekValue.setValue(mContext.getString(R.string.sunday)); + break; + } } - private void initAppList() { - executorService.execute(() -> { - //获取应用列表 - List appList = appListRepository.getAppList(); - appListValues.postValue(appList); - }); + + @Override + protected void onClean() { + super.onClean(); + handler.removeCallbacks(updateTimeTask); + mContext.unregisterReceiver(mIntentReceiver); } private static MainPagePresenter sInstance = null; diff --git a/app/src/main/java/com/ic/launcher/loop/view/MainPageView.java b/app/src/main/java/com/ic/launcher/loop/view/MainPageView.java index e86bfc8..db5213c 100644 --- a/app/src/main/java/com/ic/launcher/loop/view/MainPageView.java +++ b/app/src/main/java/com/ic/launcher/loop/view/MainPageView.java @@ -2,22 +2,61 @@ package com.ic.launcher.loop.view; import android.content.Context; import android.util.AttributeSet; +import android.view.LayoutInflater; import android.widget.LinearLayout; +import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.lifecycle.LifecycleOwner; + +import com.ic.iclooger.ICLogger; +import com.ic.launcher.loop.R; +import com.ic.launcher.loop.presenter.MainPagePresenter; public class MainPageView extends LinearLayout { + private MainPagePresenter mainPagerPresenter; + private TextView dateView; + private TextView timeView; + private TextView weekView; + public MainPageView(@NonNull Context context) { - super(context); + this(context, null); } public MainPageView(@NonNull Context context, @Nullable AttributeSet attrs) { - super(context, attrs); + this(context, attrs, 0); } public MainPageView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); + LayoutInflater.from(getContext()).inflate( + R.layout.item_main_page, this + ); + initView(); + } + + public void initViewModel(LifecycleOwner lifecycleOwner) { + ICLogger.d("initViewModel..."); + mainPagerPresenter = MainPagePresenter.getInstance(getContext()); + mainPagerPresenter.dateValue.observe(lifecycleOwner, dateValue -> { + //ICLogger.d("dateValue == > " + dateValue); + dateView.setText(dateValue); + }); + mainPagerPresenter.timeValue.observe(lifecycleOwner, timeValue -> { + //ICLogger.d("timeValue == > " + timeValue); + timeView.setText(timeValue); + }); + mainPagerPresenter.weekValue.observe(lifecycleOwner, weekValue -> { + weekView.setText(weekValue); + }); + } + + private void initView() { + dateView = findViewById(R.id.date_tv); + timeView = findViewById(R.id.time_tv); + weekView = findViewById(R.id.week_date_tv); + // ICLogger.d("init view..." + getChildCount()); } } diff --git a/app/src/main/res/layout/item_main_page.xml b/app/src/main/res/layout/item_main_page.xml index c8a02ca..3b72054 100644 --- a/app/src/main/res/layout/item_main_page.xml +++ b/app/src/main/res/layout/item_main_page.xml @@ -1,17 +1,16 @@ - - @@ -28,7 +27,7 @@ android:layout_height="wrap_content" android:layout_gravity="left" android:includeFontPadding="false" - android:text="02-30" + android:text="||-||" android:textColor="@color/white" android:textSize="40sp" /> @@ -38,7 +37,7 @@ android:layout_height="wrap_content" android:layout_gravity="right" android:includeFontPadding="false" - android:text="星期天" + android:text="星期#" android:textColor="@color/white" android:textSize="40sp" /> @@ -67,7 +66,7 @@ android:id="@+id/out_temp_tv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="24.0" + android:text="00.0" android:textColor="@color/white" android:textSize="24sp" /> @@ -91,7 +90,7 @@ android:id="@+id/heart_rate_tv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="98" + android:text="00" android:textColor="@color/white" android:textSize="24sp" /> @@ -114,7 +113,7 @@ android:id="@+id/blood_oxygen_tv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="120" + android:text="000" android:textColor="@color/white" android:textSize="24sp" /> @@ -137,7 +136,7 @@ android:id="@+id/body_temp_tv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="36.5" + android:text="00.0" android:textColor="@color/white" android:textSize="24sp" /> @@ -146,4 +145,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 337ce84..52662dc 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -32,4 +32,12 @@ com.ic.sign com.eqc.setting 未找到相关应用. + + 星期一 + 星期二 + 星期三 + 星期四 + 星期五 + 星期六 + 星期日 \ No newline at end of file