fix(settings): 重构SN上报并清理失效启动页

- SettingsViewModel改用SnRepository进行设备注册
- 移除RxLifecycle手动绑定基类，改用AndroidX Lifecycle
- 新增系统、硬件、网络、安全、定位等SN信息上报接口
- 修复ContactInfo equals逻辑错误
- 应用列表变化后自动清理失效启动页

app/src/main/java/com/ttstd/dialer/base/BaseDataBindingActivity.java

@@ -6,16 +6,16 @@ import android.view.View;
 
 import androidx.annotation.CallSuper;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.graphics.Insets;
 import androidx.core.view.OnApplyWindowInsetsListener;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
 
 import com.ttstd.dialer.R;
-import com.ttstd.dialer.base.rx.BaseRxActivity;
 import com.zackratos.ultimatebarx.ultimatebarx.java.UltimateBarX;
 
-public abstract class BaseDataBindingActivity extends BaseRxActivity {
+public abstract class BaseDataBindingActivity extends AppCompatActivity {
 
     public BaseDataBindingActivity() {
         super();

app/src/main/java/com/ttstd/dialer/base/BaseDialogFragment.java

@@ -2,9 +2,9 @@ package com.ttstd.dialer.base;
 
 import android.os.Bundle;
 
-import com.ttstd.dialer.base.rx.BaseRxDialogFragment;
+import androidx.fragment.app.DialogFragment;
 
-public abstract class BaseDialogFragment extends BaseRxDialogFragment {
+public abstract class BaseDialogFragment extends DialogFragment {
 
     protected boolean isViewInitiated;
     protected boolean isVisibleToUser;

app/src/main/java/com/ttstd/dialer/base/BaseFragment.java

@@ -4,8 +4,7 @@ import android.os.Bundle;
 import android.util.Log;
 
 import androidx.annotation.Nullable;
-
-import com.ttstd.dialer.base.rx.BaseRxFragment;
+import androidx.fragment.app.Fragment;
 
 /**
  * Fragment 基类，提供标准的懒加载框架
@@ -20,7 +19,7 @@ import com.ttstd.dialer.base.rx.BaseRxFragment;
  * 2. {@link #fetchData()} 每次可见都会回调，用于需要刷新的场景。
  * 3. View 销毁重建后自动重置懒加载状态，保证重建后的页面能重新渲染。
  */
-public abstract class BaseFragment extends BaseRxFragment {
+public abstract class BaseFragment extends Fragment {
 
     private static final String TAG = "BaseFragment";
 

app/src/main/java/com/ttstd/dialer/base/BaseService.java

@@ -1,43 +1,18 @@
 package com.ttstd.dialer.base;
 
-import android.content.Intent;
+import androidx.lifecycle.LifecycleService;
 
-import androidx.lifecycle.Lifecycle;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.lifecycle.LifecycleRegistry;
+/**
+ * Service 基类（基于 AndroidX {@link LifecycleService}）。
+ * <p>
+ * 通过继承 {@link LifecycleService} 自动获得：
+ *   - {@link androidx.lifecycle.LifecycleOwner} 能力
+ *   - 生命周期事件自动派发：onCreate → ON_CREATE，onStartCommand → ON_START / ON_RESUME，onDestroy → ON_DESTROY
+ *     （其中 ON_START / ON_RESUME 满足 Service 中 LiveData 的触发条件，无需再手动修补）
+ *   - 不再需要手动维护 {@link androidx.lifecycle.LifecycleRegistry} 或覆写生命周期方法派发事件
+ * <p>
+ * 子类如需在生命周期回调中做处理，可直接覆写 onStartCommand / onDestroy 并调用 super。
+ */
+public abstract class BaseService extends LifecycleService {
 
-import com.ttstd.dialer.base.rx.BaseRxService;
-
-import org.jetbrains.annotations.NotNull;
-
-public abstract class BaseService extends BaseRxService implements LifecycleOwner {
-
-    private final LifecycleRegistry lifecycleRegistry = new LifecycleRegistry(this);
-
-    @NotNull
-    @Override
-    public Lifecycle getLifecycle() {
-        return lifecycleRegistry;
-    }
-
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE);
-        //修补在Service中LiveData不能触发
-        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START);
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_RESUME);
-        return super.onStartCommand(intent, flags, startId);
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY);
-    }
 }

app/src/main/java/com/ttstd/dialer/base/BaseTransparentActivity.java

@@ -6,16 +6,16 @@ import android.view.View;
 
 import androidx.annotation.CallSuper;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.graphics.Insets;
 import androidx.core.view.OnApplyWindowInsetsListener;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
 
 import com.ttstd.dialer.R;
-import com.ttstd.dialer.base.rx.BaseRxActivity;
 import com.zackratos.ultimatebarx.ultimatebarx.java.UltimateBarX;
 
-public abstract class BaseTransparentActivity extends BaseRxActivity {
+public abstract class BaseTransparentActivity extends AppCompatActivity {
 
     public BaseTransparentActivity() {
         super();

app/src/main/java/com/ttstd/dialer/base/rx/BaseRxActivity.java

@@ -1,94 +0,0 @@
-package com.ttstd.dialer.base.rx;
-
-import android.os.Bundle;
-
-import androidx.annotation.CallSuper;
-import androidx.annotation.CheckResult;
-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;
-
-/**
- * {@link com.trello.rxlifecycle4.components.RxActivity}
- * copied form RxActivity}
- */
-public abstract class BaseRxActivity extends AppCompatActivity implements LifecycleProvider<ActivityEvent> {
-    private final BehaviorSubject<ActivityEvent> lifecycleSubject = BehaviorSubject.create();
-
-    public BehaviorSubject<ActivityEvent> getLifecycleSubject() {
-        return lifecycleSubject;
-    }
-
-    @Override
-    @NonNull
-    @CheckResult
-    public final Observable<ActivityEvent> lifecycle() {
-        return lifecycleSubject.hide();
-    }
-
-    @Override
-    @NonNull
-    @CheckResult
-    public final <T> LifecycleTransformer<T> bindUntilEvent(@NonNull ActivityEvent event) {
-        return RxLifecycle.bindUntilEvent(lifecycleSubject, event);
-    }
-
-    @Override
-    @NonNull
-    @CheckResult
-    public final <T> LifecycleTransformer<T> bindToLifecycle() {
-        return RxLifecycleAndroid.bindActivity(lifecycleSubject);
-    }
-
-    @Override
-    @CallSuper
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        lifecycleSubject.onNext(ActivityEvent.CREATE);
-    }
-
-    @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();
-    }
-}
-

app/src/main/java/com/ttstd/dialer/base/rx/BaseRxDialogFragment.java

@@ -1,123 +0,0 @@
-package com.ttstd.dialer.base.rx;
-
-import android.os.Bundle;
-import android.view.View;
-
-import androidx.annotation.CallSuper;
-import androidx.annotation.CheckResult;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.DialogFragment;
-
-import com.trello.rxlifecycle4.LifecycleProvider;
-import com.trello.rxlifecycle4.LifecycleTransformer;
-import com.trello.rxlifecycle4.RxLifecycle;
-import com.trello.rxlifecycle4.android.FragmentEvent;
-import com.trello.rxlifecycle4.android.RxLifecycleAndroid;
-
-import io.reactivex.rxjava3.core.Observable;
-import io.reactivex.rxjava3.subjects.BehaviorSubject;
-
-/**
- * {@link com.trello.rxlifecycle4.components.RxFragment}
- * copied form RxFragment}
- */
-public class BaseRxDialogFragment extends DialogFragment implements LifecycleProvider<FragmentEvent> {
-    private final BehaviorSubject<FragmentEvent> lifecycleSubject = BehaviorSubject.create();
-
-    public BehaviorSubject<FragmentEvent> getLifecycleSubject() {
-        return lifecycleSubject;
-    }
-
-    @Override
-    @NonNull
-    @CheckResult
-    public final Observable<FragmentEvent> lifecycle() {
-        return lifecycleSubject.hide();
-    }
-
-    @Override
-    @NonNull
-    @CheckResult
-    public final <T> LifecycleTransformer<T> bindUntilEvent(@NonNull FragmentEvent event) {
-        return RxLifecycle.bindUntilEvent(lifecycleSubject, event);
-    }
-
-    @Override
-    @NonNull
-    @CheckResult
-    public final <T> LifecycleTransformer<T> bindToLifecycle() {
-        return RxLifecycleAndroid.bindFragment(lifecycleSubject);
-    }
-
-    @Override
-    @CallSuper
-    public void onAttach(android.app.Activity activity) {
-        super.onAttach(activity);
-        lifecycleSubject.onNext(FragmentEvent.ATTACH);
-    }
-
-    @Override
-    @CallSuper
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        lifecycleSubject.onNext(FragmentEvent.CREATE);
-    }
-
-    @Override
-    @CallSuper
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        lifecycleSubject.onNext(FragmentEvent.CREATE_VIEW);
-    }
-
-    @Override
-    @CallSuper
-    public void onStart() {
-        super.onStart();
-        lifecycleSubject.onNext(FragmentEvent.START);
-    }
-
-    @Override
-    @CallSuper
-    public void onResume() {
-        super.onResume();
-        lifecycleSubject.onNext(FragmentEvent.RESUME);
-    }
-
-    @Override
-    @CallSuper
-    public void onPause() {
-        lifecycleSubject.onNext(FragmentEvent.PAUSE);
-        super.onPause();
-    }
-
-    @Override
-    @CallSuper
-    public void onStop() {
-        lifecycleSubject.onNext(FragmentEvent.STOP);
-        super.onStop();
-    }
-
-    @Override
-    @CallSuper
-    public void onDestroyView() {
-        lifecycleSubject.onNext(FragmentEvent.DESTROY_VIEW);
-        super.onDestroyView();
-    }
-
-    @Override
-    @CallSuper
-    public void onDestroy() {
-        lifecycleSubject.onNext(FragmentEvent.DESTROY);
-        super.onDestroy();
-    }
-
-    @Override
-    @CallSuper
-    public void onDetach() {
-        lifecycleSubject.onNext(FragmentEvent.DETACH);
-        super.onDetach();
-    }
-}
-

app/src/main/java/com/ttstd/dialer/base/rx/BaseRxFragment.java

@@ -1,123 +0,0 @@
-package com.ttstd.dialer.base.rx;
-
-import android.os.Bundle;
-import android.view.View;
-
-import androidx.annotation.CallSuper;
-import androidx.annotation.CheckResult;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-
-import com.trello.rxlifecycle4.LifecycleProvider;
-import com.trello.rxlifecycle4.LifecycleTransformer;
-import com.trello.rxlifecycle4.RxLifecycle;
-import com.trello.rxlifecycle4.android.FragmentEvent;
-import com.trello.rxlifecycle4.android.RxLifecycleAndroid;
-
-import io.reactivex.rxjava3.core.Observable;
-import io.reactivex.rxjava3.subjects.BehaviorSubject;
-
-/**
- * {@link com.trello.rxlifecycle4.components.RxFragment}
- * copied form RxFragment}
- */
-public class BaseRxFragment extends Fragment implements LifecycleProvider<FragmentEvent> {
-    private final BehaviorSubject<FragmentEvent> lifecycleSubject = BehaviorSubject.create();
-
-    public BehaviorSubject<FragmentEvent> getLifecycleSubject() {
-        return lifecycleSubject;
-    }
-
-    @Override
-    @NonNull
-    @CheckResult
-    public final Observable<FragmentEvent> lifecycle() {
-        return lifecycleSubject.hide();
-    }
-
-    @Override
-    @NonNull
-    @CheckResult
-    public final <T> LifecycleTransformer<T> bindUntilEvent(@NonNull FragmentEvent event) {
-        return RxLifecycle.bindUntilEvent(lifecycleSubject, event);
-    }
-
-    @Override
-    @NonNull
-    @CheckResult
-    public final <T> LifecycleTransformer<T> bindToLifecycle() {
-        return RxLifecycleAndroid.bindFragment(lifecycleSubject);
-    }
-
-    @Override
-    @CallSuper
-    public void onAttach(android.app.Activity activity) {
-        super.onAttach(activity);
-        lifecycleSubject.onNext(FragmentEvent.ATTACH);
-    }
-
-    @Override
-    @CallSuper
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        lifecycleSubject.onNext(FragmentEvent.CREATE);
-    }
-
-    @Override
-    @CallSuper
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        lifecycleSubject.onNext(FragmentEvent.CREATE_VIEW);
-    }
-
-    @Override
-    @CallSuper
-    public void onStart() {
-        super.onStart();
-        lifecycleSubject.onNext(FragmentEvent.START);
-    }
-
-    @Override
-    @CallSuper
-    public void onResume() {
-        super.onResume();
-        lifecycleSubject.onNext(FragmentEvent.RESUME);
-    }
-
-    @Override
-    @CallSuper
-    public void onPause() {
-        lifecycleSubject.onNext(FragmentEvent.PAUSE);
-        super.onPause();
-    }
-
-    @Override
-    @CallSuper
-    public void onStop() {
-        lifecycleSubject.onNext(FragmentEvent.STOP);
-        super.onStop();
-    }
-
-    @Override
-    @CallSuper
-    public void onDestroyView() {
-        lifecycleSubject.onNext(FragmentEvent.DESTROY_VIEW);
-        super.onDestroyView();
-    }
-
-    @Override
-    @CallSuper
-    public void onDestroy() {
-        lifecycleSubject.onNext(FragmentEvent.DESTROY);
-        super.onDestroy();
-    }
-
-    @Override
-    @CallSuper
-    public void onDetach() {
-        lifecycleSubject.onNext(FragmentEvent.DETACH);
-        super.onDetach();
-    }
-}
-

app/src/main/java/com/ttstd/dialer/base/rx/BaseRxService.java

@@ -1,56 +0,0 @@
-package com.ttstd.dialer.base.rx;
-
-import android.app.Service;
-
-import androidx.annotation.CheckResult;
-import androidx.annotation.NonNull;
-
-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 BaseRxService extends Service implements LifecycleProvider<ActivityEvent> {
-    private final BehaviorSubject<ActivityEvent> lifecycleSubject = BehaviorSubject.create();
-
-    public BehaviorSubject<ActivityEvent> getLifecycleSubject() {
-        return lifecycleSubject;
-    }
-
-    @Override
-    @NonNull
-    @CheckResult
-    public final Observable<ActivityEvent> lifecycle() {
-        return lifecycleSubject.hide();
-    }
-
-    @Override
-    @NonNull
-    @CheckResult
-    public final <T> LifecycleTransformer<T> bindUntilEvent(@NonNull ActivityEvent event) {
-        return RxLifecycle.bindUntilEvent(lifecycleSubject, event);
-    }
-
-    @Override
-    @NonNull
-    @CheckResult
-    public final <T> LifecycleTransformer<T> bindToLifecycle() {
-        return RxLifecycleAndroid.bindActivity(lifecycleSubject);
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        lifecycleSubject.onNext(ActivityEvent.CREATE);
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        lifecycleSubject.onNext(ActivityEvent.DESTROY);
-    }
-}