tt/XiaoxintongSystemOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

version:2.2

Browse Source 
fix:
update:接口优化
This commit is contained in:
Fanhuitong
2023-01-13 18:05:17 +08:00
parent 6540365e9f
commit 5cddcd0f8e
10 changed files with 128 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/uiuios/aios/activity/main/MainActivity.java
View File

@@ -110,7 +110,7 @@ public class MainActivity extends BaseActivity implements MainContact.MainView {
mFragments.add(mCustomFragment);
mMainPresenter.getSystemSettings();
mMainPresenter.getAdminSnSetting();
// mMainPresenter.getAdminSnSetting();
ArrayList<DesktopIcon> 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

45
app/src/main/java/com/uiuios/aios/activity/main/MainPresenter.java
View File

@@ -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<Contact> contactList) {
Intent intent = new Intent("setting_sos");
mContext.sendBroadcast(intent);
}
@Override
public void setEmergencyContact(List<Contact> emergencyContact) {
}
@Override
public void setEmpty() {
}
@Override
public void onComplete() {
mView.setSystemSettings();
}
});
// NetInterfaceManager.getInstance().getSystemSettings(true, getLifecycle(), new NetInterfaceManager.ContactCallback() {
// @Override
// public void setContact(List<Contact> contactList) {
// Intent intent = new Intent("setting_sos");
// mContext.sendBroadcast(intent);
// }
//
// @Override
// public void setEmergencyContact(List<Contact> emergencyContact) {
//
// }
//
// @Override
// public void setEmpty() {
//
// }
//
// @Override
// public void onComplete() {
// }
// });
mView.setSystemSettings();
}
@Override

35
app/src/main/java/com/uiuios/aios/base/BaseFragment.java
View File

@@ -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<FragmentEvent> {
public abstract class BaseFragment extends Fragment implements LifecycleProvider<FragmentEvent> {
public final BehaviorSubject<FragmentEvent> 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<Fragment
lifecycleSubject.onNext(FragmentEvent.CREATE);
}
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
isViewInitiated = true;
prepareFetchData();
}
@Override
public void setUserVisibleHint(boolean isVisibleToUser) {
super.setUserVisibleHint(isVisibleToUser);
this.isVisibleToUser = isVisibleToUser;
prepareFetchData();
}
public abstract void fetchData();
public boolean prepareFetchData() {
return prepareFetchData(false);
}
public boolean prepareFetchData(boolean forceUpdate) {
if (isVisibleToUser && isViewInitiated && (!isDataInitiated || forceUpdate)) {
fetchData();
isDataInitiated = true;
return true;
}
return false;
}
@Override
@CallSuper
public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {

5
app/src/main/java/com/uiuios/aios/fragment/AppListFragment.java
View File

@@ -94,6 +94,11 @@ public class AppListFragment extends BaseFragment {
}
}
@Override
public void fetchData() {
}
private View rootView;
@Override

83
app/src/main/java/com/uiuios/aios/fragment/custom/CustomFragment.java
View File

@@ -170,7 +170,7 @@ public class CustomFragment extends BaseFragment implements CustomContact.Custom
ImageView iv_app;
private String TAG = CustomFragment.class.getSimpleName();
private static final String TAG = CustomFragment.class.getSimpleName();
// private int[] mShaderColors = new int[]{0xFFfa3db5, 0xFFF8867E, 0xFFF79F6B, 0xFFF79F6B, 0xFFF79F6B, 0xFFF8867E, 0xFFfa3db5};
private int[] mShaderColors = new int[]{0xFFff9300, 0xFFff9300, 0xFFff9300, 0xFFff9300, 0xFFff9300, 0xFFff9300, 0xFFff9300};
private int[] mShaderColorsRed = new int[]{0xFFFF0000, 0xFFFF0000, 0xFFFF0000, 0xFFFF0000, 0xFFFF0000, 0xFFFF0000, 0xFFFF0000};
@@ -232,6 +232,10 @@ public class CustomFragment extends BaseFragment implements CustomContact.Custom
mMMKV = MMKV.defaultMMKV();
}
@Override
public void fetchData() {
initData();
}
@Override
public void onDisconnected() {
@@ -330,7 +334,6 @@ public class CustomFragment extends BaseFragment implements CustomContact.Custom
private BatteryReceiver batteryReceiver;
private class BatteryReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
String action = intent.getAction();
@@ -385,7 +388,6 @@ public class CustomFragment extends BaseFragment implements CustomContact.Custom
mCRv = mContext.getContentResolver();
ButterKnife.bind(this, rootView);
initView();
initData();
return rootView;
}
@@ -549,7 +551,6 @@ public class CustomFragment extends BaseFragment implements CustomContact.Custom
startActivity(new Intent(mContext, ControlActivity.class));
}
});
refreshMemory();
}
@@ -628,36 +629,36 @@ public class CustomFragment extends BaseFragment implements CustomContact.Custom
}
private void initData() {
mCustomPresenter.getSnInfo();
NetInterfaceManager.getInstance().getUserAvatarInfoControl()
.subscribe(new Observer<BaseResponse<UserAvatarInfo>>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
Log.e("getUserAvatarInfoControl", "onSubscribe: ");
}
@Override
public void onNext(@NonNull BaseResponse<UserAvatarInfo> 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<BaseResponse<UserAvatarInfo>>() {
// @Override
// public void onSubscribe(@NonNull Disposable d) {
// Log.e("getUserAvatarInfoControl", "onSubscribe: ");
// }
//
// @Override
// public void onNext(@NonNull BaseResponse<UserAvatarInfo> 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<List<AlarmClockData>>() {
}.getType();
List<AlarmClockData> 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

12
app/src/main/java/com/uiuios/aios/fragment/custom/CustomPresenter.java
View File

@@ -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);
// }
// });
}
}

5
app/src/main/java/com/uiuios/aios/fragment/second/SecondFragment.java
View File

@@ -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) {

2
app/src/main/java/com/uiuios/aios/receiver/BootReceiver.java
View File

@@ -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;

1
app/src/main/java/com/uiuios/aios/service/main/MainSPresenter.java
View File

@@ -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;