From 66171ac7e56751cc4bd6a4fd15232739ded54bd3 Mon Sep 17 00:00:00 2001 From: Fanhuitong <981964879@qq.com> Date: Sat, 17 Jun 2023 18:04:37 +0800 Subject: [PATCH] =?UTF-8?q?version:=20fix:=20update:=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=94=A4=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/alarm/AlarmClockActivity.java | 4 +- .../aios/base/BaseLightLifecycleActivity.java | 115 ------------------ .../uiuios/aios/receiver/BootReceiver.java | 22 ++-- 3 files changed, 13 insertions(+), 128 deletions(-) delete mode 100644 app/src/main/java/com/uiuios/aios/base/BaseLightLifecycleActivity.java diff --git a/app/src/main/java/com/uiuios/aios/activity/alarm/AlarmClockActivity.java b/app/src/main/java/com/uiuios/aios/activity/alarm/AlarmClockActivity.java index 813fe6d..5f3b1b9 100644 --- a/app/src/main/java/com/uiuios/aios/activity/alarm/AlarmClockActivity.java +++ b/app/src/main/java/com/uiuios/aios/activity/alarm/AlarmClockActivity.java @@ -20,8 +20,8 @@ import com.trello.rxlifecycle4.android.ActivityEvent; import com.uiuios.aios.R; import com.uiuios.aios.alarm.AlarmAdapter; import com.uiuios.aios.alarm.AlarmUtils; -import com.uiuios.aios.base.BaseLightLifecycleActivity; import com.uiuios.aios.alarm.AlarmClockData; +import com.uiuios.aios.base.BaseLifecycleActivity; import com.uiuios.aios.bean.BaseResponse; import com.uiuios.aios.dialog.DeleteDialog; import com.uiuios.aios.network.NetInterfaceManager; @@ -37,7 +37,7 @@ import cn.jzvd.Jzvd; import io.reactivex.rxjava3.core.Observer; import io.reactivex.rxjava3.disposables.Disposable; -public class AlarmClockActivity extends BaseLightLifecycleActivity implements AlarmClockContact.ClockView { +public class AlarmClockActivity extends BaseLifecycleActivity implements AlarmClockContact.ClockView { private static final String TAG = AlarmClockActivity.class.getSimpleName(); @BindView(R.id.recyclerView) diff --git a/app/src/main/java/com/uiuios/aios/base/BaseLightLifecycleActivity.java b/app/src/main/java/com/uiuios/aios/base/BaseLightLifecycleActivity.java deleted file mode 100644 index 2a33559..0000000 --- a/app/src/main/java/com/uiuios/aios/base/BaseLightLifecycleActivity.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.uiuios.aios.base; - -import android.os.Bundle; - -import androidx.annotation.CallSuper; -import androidx.annotation.CheckResult; -import androidx.annotation.ContentView; -import androidx.annotation.LayoutRes; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.appcompat.app.AppCompatActivity; - -import com.trello.rxlifecycle4.LifecycleProvider; -import com.trello.rxlifecycle4.LifecycleTransformer; -import com.trello.rxlifecycle4.RxLifecycle; -import com.trello.rxlifecycle4.android.ActivityEvent; -import com.trello.rxlifecycle4.android.RxLifecycleAndroid; - -import io.reactivex.rxjava3.core.Observable; -import io.reactivex.rxjava3.subjects.BehaviorSubject; - -public abstract class BaseLightLifecycleActivity extends AppCompatActivity implements LifecycleProvider { - public final BehaviorSubject lifecycleSubject = BehaviorSubject.create(); - - public BaseLightLifecycleActivity() { - super(); - } - - @ContentView - public BaseLightLifecycleActivity(@LayoutRes int contentLayoutId) { - super(contentLayoutId); - } - - @Override - @NonNull - @CheckResult - public final Observable lifecycle() { - return lifecycleSubject.hide(); - } - - @Override - @NonNull - @CheckResult - public final LifecycleTransformer bindUntilEvent(@NonNull ActivityEvent event) { - return RxLifecycle.bindUntilEvent(lifecycleSubject, event); - } - - @Override - @NonNull - @CheckResult - public final LifecycleTransformer bindToLifecycle() { - return RxLifecycleAndroid.bindActivity(lifecycleSubject); - } - - @Override - @CallSuper - protected void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - lifecycleSubject.onNext(ActivityEvent.CREATE); - setContentView(this.getLayoutId()); - initView(); - initData(); - } - - /** - * 设置布局 - */ - public abstract int getLayoutId(); - - /** - * 初始化视图 - */ - public abstract void initView(); - - - /** - * 初始化数据 - */ - public abstract void initData(); - - @Override - @CallSuper - protected void onStart() { - super.onStart(); - lifecycleSubject.onNext(ActivityEvent.START); - } - - @Override - @CallSuper - protected void onResume() { - super.onResume(); - lifecycleSubject.onNext(ActivityEvent.RESUME); - } - - @Override - @CallSuper - protected void onPause() { - lifecycleSubject.onNext(ActivityEvent.PAUSE); - super.onPause(); - } - - @Override - @CallSuper - protected void onStop() { - lifecycleSubject.onNext(ActivityEvent.STOP); - super.onStop(); - } - - @Override - @CallSuper - protected void onDestroy() { - lifecycleSubject.onNext(ActivityEvent.DESTROY); - super.onDestroy(); - } -} diff --git a/app/src/main/java/com/uiuios/aios/receiver/BootReceiver.java b/app/src/main/java/com/uiuios/aios/receiver/BootReceiver.java index 13a36a2..30ffd39 100644 --- a/app/src/main/java/com/uiuios/aios/receiver/BootReceiver.java +++ b/app/src/main/java/com/uiuios/aios/receiver/BootReceiver.java @@ -72,17 +72,17 @@ public class BootReceiver extends BroadcastReceiver { case Intent.ACTION_BOOT_COMPLETED: break; - case Intent.ACTION_BATTERY_CHANGED: - case Intent.ACTION_BATTERY_LOW: - case Intent.ACTION_BATTERY_OKAY: - case Intent.ACTION_POWER_CONNECTED: - case Intent.ACTION_POWER_DISCONNECTED: - case Intent.ACTION_DATE_CHANGED: - case Intent.ACTION_TIME_TICK: - case Intent.ACTION_USER_PRESENT: - case Intent.ACTION_SCREEN_OFF: - case Intent.ACTION_SCREEN_ON: - break; +// case Intent.ACTION_BATTERY_CHANGED: +// case Intent.ACTION_BATTERY_LOW: +// case Intent.ACTION_BATTERY_OKAY: +// case Intent.ACTION_POWER_CONNECTED: +// case Intent.ACTION_POWER_DISCONNECTED: +// case Intent.ACTION_DATE_CHANGED: +// case Intent.ACTION_TIME_TICK: +// case Intent.ACTION_USER_PRESENT: +// case Intent.ACTION_SCREEN_OFF: +// case Intent.ACTION_SCREEN_ON: +// break; } } }