From 5cddcd0f8e8b49bf10441f7e9595c14d839f878d Mon Sep 17 00:00:00 2001 From: Fanhuitong <981964879@qq.com> Date: Fri, 13 Jan 2023 18:05:17 +0800 Subject: [PATCH] =?UTF-8?q?version:2.2=20fix:=20update:=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- .../aios/activity/main/MainActivity.java | 6 +- .../aios/activity/main/MainPresenter.java | 45 +++++----- .../com/uiuios/aios/base/BaseFragment.java | 35 +++++++- .../uiuios/aios/fragment/AppListFragment.java | 5 ++ .../aios/fragment/custom/CustomFragment.java | 83 +++++++++++-------- .../aios/fragment/custom/CustomPresenter.java | 12 +-- .../aios/fragment/second/SecondFragment.java | 5 ++ .../uiuios/aios/receiver/BootReceiver.java | 2 +- .../aios/service/main/MainSPresenter.java | 1 + 10 files changed, 128 insertions(+), 68 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3bed771..3898b7c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -177,7 +177,7 @@ dependencies { // implementation 'io.reactivex.rxjava2:rxjava:2.2.12' // implementation 'io.reactivex.rxjava2:rxandroid:2.1.1' // - implementation 'com.squareup.okhttp3:okhttp:4.9.3' + implementation 'com.squareup.okhttp3:okhttp:4.9.1' implementation 'com.squareup.retrofit2:retrofit:2.9.0' implementation 'com.squareup.retrofit2:converter-gson:2.9.0' // implementation 'com.squareup.retrofit2:adapter-rxjava2:2.4.0' diff --git a/app/src/main/java/com/uiuios/aios/activity/main/MainActivity.java b/app/src/main/java/com/uiuios/aios/activity/main/MainActivity.java index 16457b7..dc75f1c 100644 --- a/app/src/main/java/com/uiuios/aios/activity/main/MainActivity.java +++ b/app/src/main/java/com/uiuios/aios/activity/main/MainActivity.java @@ -110,7 +110,7 @@ public class MainActivity extends BaseActivity implements MainContact.MainView { mFragments.add(mCustomFragment); mMainPresenter.getSystemSettings(); - mMainPresenter.getAdminSnSetting(); +// mMainPresenter.getAdminSnSetting(); ArrayList desktopIcons = ApkUtils.queryFilterAppInfo(this); int x = 0; for (int i = 0; i <= desktopIcons.size(); i++) { @@ -317,7 +317,6 @@ public class MainActivity extends BaseActivity implements MainContact.MainView { gotoNotificationAccessSetting(this); } addData(); - mMainPresenter.sendRunningInfo(); } private static final String ENABLED_NOTIFICATION_LISTENERS = "enabled_notification_listeners"; @@ -369,6 +368,7 @@ public class MainActivity extends BaseActivity implements MainContact.MainView { protected void onRestart() { super.onRestart(); mMainPresenter.sendAPPUsage(); + mMainPresenter.sendRunningInfo(); } @Override @@ -445,7 +445,7 @@ public class MainActivity extends BaseActivity implements MainContact.MainView { @Override public void setSystemSettings() { - mMainPresenter.getDesktopLayout(); +// mMainPresenter.getDesktopLayout(); } @Override diff --git a/app/src/main/java/com/uiuios/aios/activity/main/MainPresenter.java b/app/src/main/java/com/uiuios/aios/activity/main/MainPresenter.java index 49aa452..181ff77 100644 --- a/app/src/main/java/com/uiuios/aios/activity/main/MainPresenter.java +++ b/app/src/main/java/com/uiuios/aios/activity/main/MainPresenter.java @@ -56,29 +56,28 @@ public class MainPresenter implements MainContact.Presenter { @Override public void getSystemSettings() { - NetInterfaceManager.getInstance().getSystemSettings(true, getLifecycle(), new NetInterfaceManager.ContactCallback() { - @Override - public void setContact(List contactList) { - Intent intent = new Intent("setting_sos"); - mContext.sendBroadcast(intent); - } - - @Override - public void setEmergencyContact(List emergencyContact) { - - } - - @Override - public void setEmpty() { - - } - - @Override - public void onComplete() { - mView.setSystemSettings(); - } - }); - +// NetInterfaceManager.getInstance().getSystemSettings(true, getLifecycle(), new NetInterfaceManager.ContactCallback() { +// @Override +// public void setContact(List contactList) { +// Intent intent = new Intent("setting_sos"); +// mContext.sendBroadcast(intent); +// } +// +// @Override +// public void setEmergencyContact(List emergencyContact) { +// +// } +// +// @Override +// public void setEmpty() { +// +// } +// +// @Override +// public void onComplete() { +// } +// }); + mView.setSystemSettings(); } @Override diff --git a/app/src/main/java/com/uiuios/aios/base/BaseFragment.java b/app/src/main/java/com/uiuios/aios/base/BaseFragment.java index 13313b2..502b33f 100644 --- a/app/src/main/java/com/uiuios/aios/base/BaseFragment.java +++ b/app/src/main/java/com/uiuios/aios/base/BaseFragment.java @@ -18,9 +18,13 @@ import com.trello.rxlifecycle4.android.RxLifecycleAndroid; import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.subjects.BehaviorSubject; -public class BaseFragment extends Fragment implements LifecycleProvider { +public abstract class BaseFragment extends Fragment implements LifecycleProvider { public final BehaviorSubject lifecycleSubject = BehaviorSubject.create(); + protected boolean isViewInitiated; + protected boolean isVisibleToUser; + protected boolean isDataInitiated; + @Override @NonNull @CheckResult @@ -56,6 +60,35 @@ public class BaseFragment extends Fragment implements LifecycleProvider>() { - @Override - public void onSubscribe(@NonNull Disposable d) { - Log.e("getUserAvatarInfoControl", "onSubscribe: "); - } - - @Override - public void onNext(@NonNull BaseResponse userAvatarInfoBaseResponse) { - Log.e("getUserAvatarInfoControl", "onNext: " + userAvatarInfoBaseResponse); - if (userAvatarInfoBaseResponse.code == 200) { - if (!mContext.isDestroyed()) { -// Glide.with(iv_head).load(userAvatarInfoBaseResponse.data.getAvatar()).into(iv_head); - } - } - } - - @Override - public void onError(@NonNull Throwable e) { - Log.e("getUserAvatarInfoControl", "onError: " + e.getMessage()); - } - - @Override - public void onComplete() { - Log.e("getUserAvatarInfoControl", "onComplete: "); - } - }); +// NetInterfaceManager.getInstance().getUserAvatarInfoControl() +// .subscribe(new Observer>() { +// @Override +// public void onSubscribe(@NonNull Disposable d) { +// Log.e("getUserAvatarInfoControl", "onSubscribe: "); +// } +// +// @Override +// public void onNext(@NonNull BaseResponse userAvatarInfoBaseResponse) { +// Log.e("getUserAvatarInfoControl", "onNext: " + userAvatarInfoBaseResponse); +// if (userAvatarInfoBaseResponse.code == 200) { +// if (!mContext.isDestroyed()) { +//// Glide.with(iv_head).load(userAvatarInfoBaseResponse.data.getAvatar()).into(iv_head); +// } +// } +// } +// +// @Override +// public void onError(@NonNull Throwable e) { +// Log.e("getUserAvatarInfoControl", "onError: " + e.getMessage()); +// } +// +// @Override +// public void onComplete() { +// Log.e("getUserAvatarInfoControl", "onComplete: "); +// } +// }); +// mCustomPresenter.getSnInfo(); initAmap(); - getAlarmClock(); + getAlarmCache(); } @Override @@ -824,6 +825,22 @@ public class CustomFragment extends BaseFragment implements CustomContact.Custom }); } + private void getAlarmCache(){ + String jsonString = mCacheHelper.getAsString(URLAddress.GET_ALARM_CLOCK); + Gson gson = new Gson(); + Type type = new TypeToken>() { + }.getType(); + List list = gson.fromJson(jsonString, type); + if (list == null || list.size() == 0) { + notificationAdapter.setDataList(list); + rv_noti.setVisibility(View.VISIBLE); + iv_note_nodata.setVisibility(View.GONE); + } else { + rv_noti.setVisibility(View.GONE); + iv_note_nodata.setVisibility(View.VISIBLE); + } + } + private void getAlarmClock() { NetInterfaceManager.getInstance().getAlarmClock(new NetInterfaceManager.AlarmClockCallback() { @Override diff --git a/app/src/main/java/com/uiuios/aios/fragment/custom/CustomPresenter.java b/app/src/main/java/com/uiuios/aios/fragment/custom/CustomPresenter.java index 308d4ef..a56ed00 100644 --- a/app/src/main/java/com/uiuios/aios/fragment/custom/CustomPresenter.java +++ b/app/src/main/java/com/uiuios/aios/fragment/custom/CustomPresenter.java @@ -43,11 +43,11 @@ public class CustomPresenter implements CustomContact.Presenter { @Override public void getSnInfo() { - NetInterfaceManager.getInstance().getSnInfo(new NetInterfaceManager.SnInfoCallback() { - @Override - public void setSnInfo(SnInfo snInfo) { - mView.setSnInfo(snInfo); - } - }); +// NetInterfaceManager.getInstance().getSnInfo(new NetInterfaceManager.SnInfoCallback() { +// @Override +// public void setSnInfo(SnInfo snInfo) { +// mView.setSnInfo(snInfo); +// } +// }); } } diff --git a/app/src/main/java/com/uiuios/aios/fragment/second/SecondFragment.java b/app/src/main/java/com/uiuios/aios/fragment/second/SecondFragment.java index af48c85..36abaf7 100644 --- a/app/src/main/java/com/uiuios/aios/fragment/second/SecondFragment.java +++ b/app/src/main/java/com/uiuios/aios/fragment/second/SecondFragment.java @@ -179,6 +179,11 @@ public class SecondFragment extends BaseFragment implements SecondContact.View, NetworkUtils.registerNetworkStatusChangedListener(this); } + @Override + public void fetchData() { + + } + @Override public android.view.View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { 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 3a67207..13a36a2 100644 --- a/app/src/main/java/com/uiuios/aios/receiver/BootReceiver.java +++ b/app/src/main/java/com/uiuios/aios/receiver/BootReceiver.java @@ -68,7 +68,7 @@ public class BootReceiver extends BroadcastReceiver { default: break; case BOOT_COMPLETED: - MainService.mPresenter.getAlarmClock(); +// MainService.mPresenter.getAlarmClock(); case Intent.ACTION_BOOT_COMPLETED: break; diff --git a/app/src/main/java/com/uiuios/aios/service/main/MainSPresenter.java b/app/src/main/java/com/uiuios/aios/service/main/MainSPresenter.java index 282a22d..df7020c 100644 --- a/app/src/main/java/com/uiuios/aios/service/main/MainSPresenter.java +++ b/app/src/main/java/com/uiuios/aios/service/main/MainSPresenter.java @@ -20,6 +20,7 @@ import io.reactivex.rxjava3.subjects.BehaviorSubject; */ public class MainSPresenter implements MainSContact.Presenter { private static final String TAG = MainSPresenter.class.getSimpleName(); + private static final int OK = 200; private MainSContact.MainSView mView; private Context mContext;