From ba540d4689993fa369241e9a71bb2649412ac207 Mon Sep 17 00:00:00 2001 From: tongtongstudio Date: Fri, 21 Oct 2022 14:18:49 +0800 Subject: [PATCH] =?UTF-8?q?version:1.1=20fix:=20update:=E8=BF=81=E7=A7=BB?= =?UTF-8?q?=E5=88=B0UIUISOS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 10 +- .../aios/ExampleInstrumentedTest.java | 4 +- app/src/main/AndroidManifest.xml | 43 +-- .../main/java/com/uiui/aios/utils/Utils.java | 86 ------ .../com/{uiui => uiuios}/aios/AppInfo.java | 2 +- .../aios/activity/APPListActivity.java | 18 +- .../aios/activity/EmergencyActivity.java | 23 +- .../aios/activity/NoticeActivity.java | 23 +- .../activity/alarm/AlarmClockActivity.java | 15 +- .../activity/alarm/AlarmClockContact.java | 8 +- .../activity/alarm/AlarmClockPresenter.java | 6 +- .../activity/code/HealthCodeActivity.java | 25 +- .../aios/activity/code/HealthCodeContact.java | 8 +- .../activity/code/HealthCodePresenter.java | 8 +- .../activity/contact/ContactActivity.java | 11 +- .../aios/activity/contact/ContactContact.java | 8 +- .../activity/contact/ContactPresenter.java | 8 +- .../aios/activity/main/MainActivity.java | 32 +- .../aios/activity/main/MainContact.java | 6 +- .../aios/activity/main/MainPresenter.java | 18 +- .../activity/weather/WeatherActivity.java | 10 +- .../aios/activity/weather/WeatherContact.java | 6 +- .../activity/weather/WeatherPresenter.java | 4 +- .../aios/adapter/APPListAdapter.java | 11 +- .../aios/adapter/AlarmAdapter.java | 15 +- .../aios/adapter/AlarmClockAdapter.java | 6 +- .../aios/adapter/ContactAdapter.java | 7 +- .../aios/adapter/HealthCodeAdapter.java | 2 +- .../aios/adapter/NotificationAdapter.java | 9 +- .../aios/adapter/SOSNnmberAdapter.java | 8 +- .../aios/adapter/WeatherDayApdapter.java | 6 +- .../aios/alarm/AlarmOpenHelper.java | 2 +- .../aios/alarm/AlarmService.java | 2 +- .../aios/alarm/AlarmUtils.java | 10 +- .../aios/base/BaseActivity.java | 4 +- .../aios/base/BaseApplication.java | 18 +- .../aios/base/BaseFragment.java | 2 +- .../aios/base/BasePresenter.java | 2 +- .../aios/base/BaseService.java | 2 +- .../{uiui => uiuios}/aios/base/BaseView.java | 2 +- .../aios/bean/ActivityBean.java | 2 +- .../aios/bean/AlarmClockData.java | 4 +- .../{uiui => uiuios}/aios/bean/AlarmItem.java | 2 +- .../aios/bean/AppListInfo.java | 2 +- .../aios/bean/ArticleDetails.java | 2 +- .../aios/bean/ArticleInfo.java | 2 +- .../aios/bean/BaseResponse.java | 2 +- .../{uiui => uiuios}/aios/bean/Contact.java | 2 +- .../aios/bean/DemandBean.java | 2 +- .../aios/bean/DesktopIcon.java | 2 +- .../aios/bean/GoodsDetails.java | 2 +- .../{uiui => uiuios}/aios/bean/GoodsInfo.java | 2 +- .../aios/bean/HealthCode.java | 2 +- .../aios/bean/NetDesktopIcon.java | 2 +- .../{uiui => uiuios}/aios/bean/SnInfo.java | 2 +- .../aios/bean/SystemSettings.java | 2 +- .../aios/bean/UserAvatarInfo.java | 2 +- .../{uiui => uiuios}/aios/bean/UserId.java | 2 +- .../aios/bean/WeatherDailyJson.java | 2 +- .../uiuios/aios/dialog/PasswordDialog.java | 273 ++++++++++++++++++ .../aios/dialog/SingleDialog.java | 4 +- .../aios/disklrucache/CacheHelper.java | 2 +- .../aios/disklrucache/Utils.java | 2 +- .../aios/fragment/AppListFragment.java | 25 +- .../fragment/BaseFragmentPagerAdapter.java | 2 +- .../aios/fragment/CustomFragment.java | 99 +++++-- .../aios/fragment/CustomPagerAdapter.java | 2 +- .../aios/fragment/SecondFragment.java | 18 +- .../aios/fragment/ViewPager2Adapter.java | 3 +- .../iconpostition/IconPositionDBHelper.java | 2 +- .../iconpostition/IconPositionManager.java | 6 +- .../aios/iconpostition/IconUtils.java | 2 +- .../aios/manager/AmapManager.java | 2 +- .../aios/manager/ConnectManager.java | 4 +- .../aios/manager/ConnectMode.java | 2 +- .../aios/network/NetInterfaceManager.java | 80 ++--- .../aios/network/URLAddress.java | 2 +- .../aios/network/api/ActivityListApi.java | 8 +- .../aios/network/api/AlarmClockApi.java | 8 +- .../aios/network/api/AppUsageRecordApi.java | 6 +- .../aios/network/api/ArticleDetailsApi.java | 8 +- .../aios/network/api/ArticleListApi.java | 8 +- .../aios/network/api/DemandListApi.java | 8 +- .../network/api/GetAdminSnSettingApi.java | 6 +- .../aios/network/api/GetDesktopApi.java | 8 +- .../aios/network/api/GetMailList.java | 8 +- .../aios/network/api/GetUserIDApi.java | 8 +- .../aios/network/api/GoodsDetailsApi.java | 8 +- .../aios/network/api/GoodsListApi.java | 8 +- .../aios/network/api/HealthCodeApi.java | 8 +- .../aios/network/api/RunNewApp.java | 6 +- .../aios/network/api/SNInfoApi.java | 8 +- .../aios/network/api/SOSRecordApi.java | 6 +- .../aios/network/api/SendScreenshotApi.java | 6 +- .../aios/network/api/Setting.java | 8 +- .../aios/network/api/UpdateAlarmClockApi.java | 6 +- .../aios/network/api/UpdateDesktopApi.java | 6 +- .../aios/network/api/UserInfoControl.java | 8 +- .../interceptor/RepeatRequestInterceptor.java | 6 +- .../aios/receiver/BootReceiver.java | 4 +- .../aios/receiver/InstallResultReceiver.java | 2 +- .../aios/service/NotificationService.java | 2 +- .../aios/service/main/MainSContact.java | 8 +- .../aios/service/main/MainSPresenter.java | 10 +- .../aios/service/main/MainService.java | 28 +- .../aios/tpush/Constants.java | 2 +- .../aios/tpush/MessageReceiver.java | 9 +- .../aios/tpush/common/DBOpenHelper.java | 2 +- .../tpush/common/NotificationService.java | 4 +- .../aios/tpush/po/XGNotification.java | 2 +- .../{uiui => uiuios}/aios/utils/ApkUtils.java | 25 +- .../aios/utils/AppUsedTimeUtils.java | 2 +- .../{uiui => uiuios}/aios/utils/AppUtil.java | 2 +- .../aios/utils/BitmapUtils.java | 2 +- .../{uiui => uiuios}/aios/utils/CmdUtil.java | 2 +- .../aios/utils/FFmpegUtils.java | 3 +- .../{uiui => uiuios}/aios/utils/FileUtil.java | 2 +- .../aios/utils/ForegroundAppUtil.java | 2 +- .../aios/utils/GlideLoadUtils.java | 2 +- .../aios/utils/GsonUtils.java | 2 +- .../aios/utils/IconUtils.java | 8 +- .../{uiui => uiuios}/aios/utils/MD5Util.java | 2 +- .../aios/utils/NetStateUtils.java | 2 +- .../aios/utils/SchemeUtils.java | 2 +- .../aios/utils/ScreenUtils.java | 2 +- .../aios/utils/TimeUtils.java | 2 +- .../aios/utils/ToastUtil.java | 4 +- .../java/com/uiuios/aios/utils/Utils.java | 207 +++++++++++++ .../aios/utils/WakeUpUtils.java | 2 +- .../aios/view/CustomContent.java | 2 +- .../aios/view/CustomContentCallbacks.java | 2 +- .../aios/view/HorizontalItemDecoration.java | 2 +- .../aios/view/JzvdStdAssert.java | 2 +- .../aios/view/JzvdStdRound.java | 4 +- .../aios/view/MyGridLayout.java | 10 +- .../aios/view/MyJzvdStdNoTitleNoClarity.java | 4 +- .../aios/view/RecyclerItemDecoration.java | 2 +- .../RecyclerViewSpacesItemDecoration.java | 2 +- .../aios/view/ScaleCircleNavigator.java | 2 +- app/src/main/res/drawable-hdpi/app_exit.jpg | Bin 0 -> 1611 bytes .../res/drawable/actions_item_selector.xml | 2 +- app/src/main/res/drawable/custom_bg_white.xml | 13 + app/src/main/res/drawable/et_bg.xml | 8 + .../main/res/drawable/joined_background.xml | 2 +- app/src/main/res/drawable/main_bg.xml | 8 + .../main/res/layout-land/fragment_custom.xml | 56 +++- .../res/layout-land/fragment_custom_back.xml | 4 +- .../main/res/layout-port/fragment_custom.xml | 64 +++- app/src/main/res/layout/activity_main.xml | 1 + app/src/main/res/layout/activity_notice.xml | 2 +- app/src/main/res/layout/fragment_applist.xml | 3 +- app/src/main/res/layout/item_actions.xml | 32 ++ app/src/main/res/layout/item_alarm_clock.xml | 2 +- app/src/main/res/layout/password_dialog.xml | 126 ++++++++ app/src/main/res/values/colors.xml | 3 +- .../aios/ExampleUnitTest.java | 2 +- app/tpns-configs.json | 6 +- 157 files changed, 1301 insertions(+), 633 deletions(-) rename app/src/androidTest/java/com/{uiui => uiuios}/aios/ExampleInstrumentedTest.java (87%) delete mode 100644 app/src/main/java/com/uiui/aios/utils/Utils.java rename app/src/main/java/com/{uiui => uiuios}/aios/AppInfo.java (86%) rename app/src/main/java/com/{uiui => uiuios}/aios/activity/APPListActivity.java (91%) rename app/src/main/java/com/{uiui => uiuios}/aios/activity/EmergencyActivity.java (95%) rename app/src/main/java/com/{uiui => uiuios}/aios/activity/NoticeActivity.java (95%) rename app/src/main/java/com/{uiui => uiuios}/aios/activity/alarm/AlarmClockActivity.java (90%) rename app/src/main/java/com/{uiui => uiuios}/aios/activity/alarm/AlarmClockContact.java (67%) rename app/src/main/java/com/{uiui => uiuios}/aios/activity/alarm/AlarmClockPresenter.java (91%) rename app/src/main/java/com/{uiui => uiuios}/aios/activity/code/HealthCodeActivity.java (79%) rename app/src/main/java/com/{uiui => uiuios}/aios/activity/code/HealthCodeContact.java (67%) rename app/src/main/java/com/{uiui => uiuios}/aios/activity/code/HealthCodePresenter.java (89%) rename app/src/main/java/com/{uiui => uiuios}/aios/activity/contact/ContactActivity.java (89%) rename app/src/main/java/com/{uiui => uiuios}/aios/activity/contact/ContactContact.java (62%) rename app/src/main/java/com/{uiui => uiuios}/aios/activity/contact/ContactPresenter.java (92%) rename app/src/main/java/com/{uiui => uiuios}/aios/activity/main/MainActivity.java (95%) rename app/src/main/java/com/{uiui => uiuios}/aios/activity/main/MainContact.java (86%) rename app/src/main/java/com/{uiui => uiuios}/aios/activity/main/MainPresenter.java (95%) rename app/src/main/java/com/{uiui => uiuios}/aios/activity/weather/WeatherActivity.java (93%) rename app/src/main/java/com/{uiui => uiuios}/aios/activity/weather/WeatherContact.java (83%) rename app/src/main/java/com/{uiui => uiuios}/aios/activity/weather/WeatherPresenter.java (97%) rename app/src/main/java/com/{uiui => uiuios}/aios/adapter/APPListAdapter.java (92%) rename app/src/main/java/com/{uiui => uiuios}/aios/adapter/AlarmAdapter.java (96%) rename app/src/main/java/com/{uiui => uiuios}/aios/adapter/AlarmClockAdapter.java (94%) rename app/src/main/java/com/{uiui => uiuios}/aios/adapter/ContactAdapter.java (96%) rename app/src/main/java/com/{uiui => uiuios}/aios/adapter/HealthCodeAdapter.java (97%) rename app/src/main/java/com/{uiui => uiuios}/aios/adapter/NotificationAdapter.java (96%) rename app/src/main/java/com/{uiui => uiuios}/aios/adapter/SOSNnmberAdapter.java (93%) rename app/src/main/java/com/{uiui => uiuios}/aios/adapter/WeatherDayApdapter.java (97%) rename app/src/main/java/com/{uiui => uiuios}/aios/alarm/AlarmOpenHelper.java (98%) rename app/src/main/java/com/{uiui => uiuios}/aios/alarm/AlarmService.java (89%) rename app/src/main/java/com/{uiui => uiuios}/aios/alarm/AlarmUtils.java (99%) rename app/src/main/java/com/{uiui => uiuios}/aios/base/BaseActivity.java (98%) rename app/src/main/java/com/{uiui => uiuios}/aios/base/BaseApplication.java (92%) rename app/src/main/java/com/{uiui => uiuios}/aios/base/BaseFragment.java (99%) rename app/src/main/java/com/{uiui => uiuios}/aios/base/BasePresenter.java (83%) rename app/src/main/java/com/{uiui => uiuios}/aios/base/BaseService.java (98%) rename app/src/main/java/com/{uiui => uiuios}/aios/base/BaseView.java (50%) rename app/src/main/java/com/{uiui => uiuios}/aios/bean/ActivityBean.java (98%) rename app/src/main/java/com/{uiui => uiuios}/aios/bean/AlarmClockData.java (98%) rename app/src/main/java/com/{uiui => uiuios}/aios/bean/AlarmItem.java (95%) rename app/src/main/java/com/{uiui => uiuios}/aios/bean/AppListInfo.java (96%) rename app/src/main/java/com/{uiui => uiuios}/aios/bean/ArticleDetails.java (96%) rename app/src/main/java/com/{uiui => uiuios}/aios/bean/ArticleInfo.java (97%) rename app/src/main/java/com/{uiui => uiuios}/aios/bean/BaseResponse.java (94%) rename app/src/main/java/com/{uiui => uiuios}/aios/bean/Contact.java (97%) rename app/src/main/java/com/{uiui => uiuios}/aios/bean/DemandBean.java (98%) rename app/src/main/java/com/{uiui => uiuios}/aios/bean/DesktopIcon.java (98%) rename app/src/main/java/com/{uiui => uiuios}/aios/bean/GoodsDetails.java (98%) rename app/src/main/java/com/{uiui => uiuios}/aios/bean/GoodsInfo.java (98%) rename app/src/main/java/com/{uiui => uiuios}/aios/bean/HealthCode.java (93%) rename app/src/main/java/com/{uiui => uiuios}/aios/bean/NetDesktopIcon.java (97%) rename app/src/main/java/com/{uiui => uiuios}/aios/bean/SnInfo.java (99%) rename app/src/main/java/com/{uiui => uiuios}/aios/bean/SystemSettings.java (99%) rename app/src/main/java/com/{uiui => uiuios}/aios/bean/UserAvatarInfo.java (96%) rename app/src/main/java/com/{uiui => uiuios}/aios/bean/UserId.java (91%) rename app/src/main/java/com/{uiui => uiuios}/aios/bean/WeatherDailyJson.java (99%) create mode 100644 app/src/main/java/com/uiuios/aios/dialog/PasswordDialog.java rename app/src/main/java/com/{uiui => uiuios}/aios/dialog/SingleDialog.java (99%) rename app/src/main/java/com/{uiui => uiuios}/aios/disklrucache/CacheHelper.java (99%) rename app/src/main/java/com/{uiui => uiuios}/aios/disklrucache/Utils.java (98%) rename app/src/main/java/com/{uiui => uiuios}/aios/fragment/AppListFragment.java (94%) rename app/src/main/java/com/{uiui => uiuios}/aios/fragment/BaseFragmentPagerAdapter.java (99%) rename app/src/main/java/com/{uiui => uiuios}/aios/fragment/CustomFragment.java (91%) rename app/src/main/java/com/{uiui => uiuios}/aios/fragment/CustomPagerAdapter.java (95%) rename app/src/main/java/com/{uiui => uiuios}/aios/fragment/SecondFragment.java (97%) rename app/src/main/java/com/{uiui => uiuios}/aios/fragment/ViewPager2Adapter.java (98%) rename app/src/main/java/com/{uiui => uiuios}/aios/iconpostition/IconPositionDBHelper.java (96%) rename app/src/main/java/com/{uiui => uiuios}/aios/iconpostition/IconPositionManager.java (96%) rename app/src/main/java/com/{uiui => uiuios}/aios/iconpostition/IconUtils.java (97%) rename app/src/main/java/com/{uiui => uiuios}/aios/manager/AmapManager.java (99%) rename app/src/main/java/com/{uiui => uiuios}/aios/manager/ConnectManager.java (98%) rename app/src/main/java/com/{uiui => uiuios}/aios/manager/ConnectMode.java (81%) rename app/src/main/java/com/{uiui => uiuios}/aios/network/NetInterfaceManager.java (95%) rename app/src/main/java/com/{uiui => uiuios}/aios/network/URLAddress.java (98%) rename app/src/main/java/com/{uiui => uiuios}/aios/network/api/ActivityListApi.java (73%) rename app/src/main/java/com/{uiui => uiuios}/aios/network/api/AlarmClockApi.java (65%) rename app/src/main/java/com/{uiui => uiuios}/aios/network/api/AppUsageRecordApi.java (81%) rename app/src/main/java/com/{uiui => uiuios}/aios/network/api/ArticleDetailsApi.java (63%) rename app/src/main/java/com/{uiui => uiuios}/aios/network/api/ArticleListApi.java (65%) rename app/src/main/java/com/{uiui => uiuios}/aios/network/api/DemandListApi.java (73%) rename app/src/main/java/com/{uiui => uiuios}/aios/network/api/GetAdminSnSettingApi.java (69%) rename app/src/main/java/com/{uiui => uiuios}/aios/network/api/GetDesktopApi.java (65%) rename app/src/main/java/com/{uiui => uiuios}/aios/network/api/GetMailList.java (64%) rename app/src/main/java/com/{uiui => uiuios}/aios/network/api/GetUserIDApi.java (62%) rename app/src/main/java/com/{uiui => uiuios}/aios/network/api/GoodsDetailsApi.java (62%) rename app/src/main/java/com/{uiui => uiuios}/aios/network/api/GoodsListApi.java (65%) rename app/src/main/java/com/{uiui => uiuios}/aios/network/api/HealthCodeApi.java (65%) rename app/src/main/java/com/{uiui => uiuios}/aios/network/api/RunNewApp.java (74%) rename app/src/main/java/com/{uiui => uiuios}/aios/network/api/SNInfoApi.java (61%) rename app/src/main/java/com/{uiui => uiuios}/aios/network/api/SOSRecordApi.java (79%) rename app/src/main/java/com/{uiui => uiuios}/aios/network/api/SendScreenshotApi.java (77%) rename app/src/main/java/com/{uiui => uiuios}/aios/network/api/Setting.java (61%) rename app/src/main/java/com/{uiui => uiuios}/aios/network/api/UpdateAlarmClockApi.java (74%) rename app/src/main/java/com/{uiui => uiuios}/aios/network/api/UpdateDesktopApi.java (75%) rename app/src/main/java/com/{uiui => uiuios}/aios/network/api/UserInfoControl.java (67%) rename app/src/main/java/com/{uiui => uiuios}/aios/network/interceptor/RepeatRequestInterceptor.java (96%) rename app/src/main/java/com/{uiui => uiuios}/aios/receiver/BootReceiver.java (96%) rename app/src/main/java/com/{uiui => uiuios}/aios/receiver/InstallResultReceiver.java (98%) rename app/src/main/java/com/{uiui => uiuios}/aios/service/NotificationService.java (98%) rename app/src/main/java/com/{uiui => uiuios}/aios/service/main/MainSContact.java (67%) rename app/src/main/java/com/{uiui => uiuios}/aios/service/main/MainSPresenter.java (85%) rename app/src/main/java/com/{uiui => uiuios}/aios/service/main/MainService.java (96%) rename app/src/main/java/com/{uiui => uiuios}/aios/tpush/Constants.java (94%) rename app/src/main/java/com/{uiui => uiuios}/aios/tpush/MessageReceiver.java (98%) rename app/src/main/java/com/{uiui => uiuios}/aios/tpush/common/DBOpenHelper.java (94%) rename app/src/main/java/com/{uiui => uiuios}/aios/tpush/common/NotificationService.java (98%) rename app/src/main/java/com/{uiui => uiuios}/aios/tpush/po/XGNotification.java (97%) rename app/src/main/java/com/{uiui => uiuios}/aios/utils/ApkUtils.java (97%) rename app/src/main/java/com/{uiui => uiuios}/aios/utils/AppUsedTimeUtils.java (99%) rename app/src/main/java/com/{uiui => uiuios}/aios/utils/AppUtil.java (98%) rename app/src/main/java/com/{uiui => uiuios}/aios/utils/BitmapUtils.java (98%) rename app/src/main/java/com/{uiui => uiuios}/aios/utils/CmdUtil.java (98%) rename app/src/main/java/com/{uiui => uiuios}/aios/utils/FFmpegUtils.java (97%) rename app/src/main/java/com/{uiui => uiuios}/aios/utils/FileUtil.java (98%) rename app/src/main/java/com/{uiui => uiuios}/aios/utils/ForegroundAppUtil.java (99%) rename app/src/main/java/com/{uiui => uiuios}/aios/utils/GlideLoadUtils.java (98%) rename app/src/main/java/com/{uiui => uiuios}/aios/utils/GsonUtils.java (95%) rename app/src/main/java/com/{uiui => uiuios}/aios/utils/IconUtils.java (96%) rename app/src/main/java/com/{uiui => uiuios}/aios/utils/MD5Util.java (98%) rename app/src/main/java/com/{uiui => uiuios}/aios/utils/NetStateUtils.java (98%) rename app/src/main/java/com/{uiui => uiuios}/aios/utils/SchemeUtils.java (96%) rename app/src/main/java/com/{uiui => uiuios}/aios/utils/ScreenUtils.java (97%) rename app/src/main/java/com/{uiui => uiuios}/aios/utils/TimeUtils.java (96%) rename app/src/main/java/com/{uiui => uiuios}/aios/utils/ToastUtil.java (97%) create mode 100644 app/src/main/java/com/uiuios/aios/utils/Utils.java rename app/src/main/java/com/{uiui => uiuios}/aios/utils/WakeUpUtils.java (99%) rename app/src/main/java/com/{uiui => uiuios}/aios/view/CustomContent.java (98%) rename app/src/main/java/com/{uiui => uiuios}/aios/view/CustomContentCallbacks.java (95%) rename app/src/main/java/com/{uiui => uiuios}/aios/view/HorizontalItemDecoration.java (97%) rename app/src/main/java/com/{uiui => uiuios}/aios/view/JzvdStdAssert.java (98%) rename app/src/main/java/com/{uiui => uiuios}/aios/view/JzvdStdRound.java (98%) rename app/src/main/java/com/{uiui => uiuios}/aios/view/MyGridLayout.java (95%) rename app/src/main/java/com/{uiui => uiuios}/aios/view/MyJzvdStdNoTitleNoClarity.java (88%) rename app/src/main/java/com/{uiui => uiuios}/aios/view/RecyclerItemDecoration.java (97%) rename app/src/main/java/com/{uiui => uiuios}/aios/view/RecyclerViewSpacesItemDecoration.java (97%) rename app/src/main/java/com/{uiui => uiuios}/aios/view/ScaleCircleNavigator.java (99%) create mode 100644 app/src/main/res/drawable-hdpi/app_exit.jpg create mode 100644 app/src/main/res/drawable/custom_bg_white.xml create mode 100644 app/src/main/res/drawable/et_bg.xml create mode 100644 app/src/main/res/drawable/main_bg.xml create mode 100644 app/src/main/res/layout/password_dialog.xml rename app/src/test/java/com/{uiui => uiuios}/aios/ExampleUnitTest.java (93%) diff --git a/app/build.gradle b/app/build.gradle index 0bff609..db4519d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,11 +13,11 @@ android { compileSdkVersion 29 defaultConfig { - applicationId "com.uiui.aios" + applicationId "com.uiuios.aios" minSdkVersion 24 targetSdkVersion 29 - versionCode 42 - versionName "5.1" + versionCode 2 + versionName "1.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -28,8 +28,8 @@ android { } manifestPlaceholders = [ - XG_ACCESS_ID : "1500030457", - XG_ACCESS_KEY: "AZZXANJF4HBD", + XG_ACCESS_ID : "1580013523", + XG_ACCESS_KEY: "ASJ3MCYWCTTF", ] manifestPlaceholders = [ diff --git a/app/src/androidTest/java/com/uiui/aios/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/uiuios/aios/ExampleInstrumentedTest.java similarity index 87% rename from app/src/androidTest/java/com/uiui/aios/ExampleInstrumentedTest.java rename to app/src/androidTest/java/com/uiuios/aios/ExampleInstrumentedTest.java index 93cbad8..cffd3f8 100644 --- a/app/src/androidTest/java/com/uiui/aios/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/uiuios/aios/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.uiui.aios; +package com.uiuios.aios; import android.content.Context; @@ -22,6 +22,6 @@ public class ExampleInstrumentedTest { // Context of the app under test. Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); - assertEquals("com.uiui.aios", appContext.getPackageName()); + assertEquals("com.uiuios.aios", appContext.getPackageName()); } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5be463b..d51de96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ @@ -61,7 +61,7 @@ + > @@ -92,30 +93,30 @@ - + - + @@ -133,16 +134,16 @@ @@ -154,7 +155,7 @@ @@ -183,7 +184,7 @@ @@ -207,7 +208,7 @@ @@ -264,7 +265,7 @@ tools:replace="android:exported" /> - + @@ -289,10 +290,10 @@ + android:value="1580013523" /> + android:value="ASJ3MCYWCTTF" /> \ No newline at end of file diff --git a/app/src/main/java/com/uiui/aios/utils/Utils.java b/app/src/main/java/com/uiui/aios/utils/Utils.java deleted file mode 100644 index a846748..0000000 --- a/app/src/main/java/com/uiui/aios/utils/Utils.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.uiui.aios.utils; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.content.ContextWrapper; -import android.content.Intent; -import android.content.IntentFilter; -import android.os.BatteryManager; -import android.os.Build; -import android.os.Environment; -import android.util.Log; - -import androidx.core.content.ContextCompat; - -import com.uiui.aios.BuildConfig; - -import java.io.File; -import java.lang.reflect.Method; - -public class Utils { - /** - * 获取设备序列号 - * - * @return - */ - @SuppressLint("MissingPermission") - public static String getSerial() { - String serial = "unknow"; - try { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {//9.0+ - serial = Build.getSerial(); - } else if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N) {//8.0+ - serial = Build.SERIAL; - } else {//8.0- - Class c = Class.forName("android.os.SystemProperties"); - Method get = c.getMethod("get", String.class); - serial = (String) get.invoke(c, "ro.serialno"); - } - } catch (Exception e) { - e.printStackTrace(); - Log.e("e", "读取设备序列号异常：" + e.toString()); - } - if (BuildConfig.DEBUG) { -// return "QNG2DKB00463"; - } - return serial; - } - - public static String getDeviceSN() { - String serial = null; - try { - Class c = Class.forName("android.os.SystemProperties"); - Method get = c.getMethod("get", String.class); - serial = (String) get.invoke(c, "persist.sys.hrSerial"); - } catch (Exception e) { - e.printStackTrace(); - } - return serial; - } - - /** - * 获取电量 - * - * @param mContext - * @return - */ - synchronized public static int getBatteryLevel(Context mContext) { - if (Build.VERSION.SDK_INT >= 21) { - return ((BatteryManager) mContext.getSystemService(Context.BATTERY_SERVICE)).getIntProperty(4); - } else { - Intent intent = (new ContextWrapper(mContext)).registerReceiver(null, new IntentFilter("android.intent.action.BATTERY_CHANGED")); - return intent.getIntExtra("level", -1) * 100 / intent.getIntExtra("scale", -1); - } - } - - public static String getDownLoadPath(Context context) { - String path = ContextCompat.getExternalFilesDirs(context, Environment.DIRECTORY_DOWNLOADS)[0].getAbsolutePath(); - return path + File.separator; - } - - public static String getFileNamefromURL(String url) { - int position = url.lastIndexOf("/"); - return url.substring(position + 1); - } - -} diff --git a/app/src/main/java/com/uiui/aios/AppInfo.java b/app/src/main/java/com/uiuios/aios/AppInfo.java similarity index 86% rename from app/src/main/java/com/uiui/aios/AppInfo.java rename to app/src/main/java/com/uiuios/aios/AppInfo.java index 0081c0a..eb10c2c 100644 --- a/app/src/main/java/com/uiui/aios/AppInfo.java +++ b/app/src/main/java/com/uiuios/aios/AppInfo.java @@ -1,4 +1,4 @@ -package com.uiui.aios; +package com.uiuios.aios; import java.io.Serializable; diff --git a/app/src/main/java/com/uiui/aios/activity/APPListActivity.java b/app/src/main/java/com/uiuios/aios/activity/APPListActivity.java similarity index 91% rename from app/src/main/java/com/uiui/aios/activity/APPListActivity.java rename to app/src/main/java/com/uiuios/aios/activity/APPListActivity.java index 50de7b2..c3aa56e 100644 --- a/app/src/main/java/com/uiui/aios/activity/APPListActivity.java +++ b/app/src/main/java/com/uiuios/aios/activity/APPListActivity.java @@ -1,4 +1,4 @@ -package com.uiui.aios.activity; +package com.uiuios.aios.activity; import android.content.Context; import android.content.pm.ApplicationInfo; @@ -13,14 +13,14 @@ import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.uiui.aios.R; -import com.uiui.aios.adapter.APPListAdapter; -import com.uiui.aios.base.BaseActivity; -import com.uiui.aios.bean.AppListInfo; -import com.uiui.aios.service.NotificationService; -import com.uiui.aios.utils.ApkUtils; -import com.uiui.aios.utils.BitmapUtils; -import com.uiui.aios.view.RecyclerViewSpacesItemDecoration; +import com.uiuios.aios.R; +import com.uiuios.aios.adapter.APPListAdapter; +import com.uiuios.aios.base.BaseActivity; +import com.uiuios.aios.bean.AppListInfo; +import com.uiuios.aios.service.NotificationService; +import com.uiuios.aios.utils.ApkUtils; +import com.uiuios.aios.utils.BitmapUtils; +import com.uiuios.aios.view.RecyclerViewSpacesItemDecoration; import java.util.ArrayList; import java.util.HashMap; diff --git a/app/src/main/java/com/uiui/aios/activity/EmergencyActivity.java b/app/src/main/java/com/uiuios/aios/activity/EmergencyActivity.java similarity index 95% rename from app/src/main/java/com/uiui/aios/activity/EmergencyActivity.java rename to app/src/main/java/com/uiuios/aios/activity/EmergencyActivity.java index e498a71..7ffce97 100644 --- a/app/src/main/java/com/uiui/aios/activity/EmergencyActivity.java +++ b/app/src/main/java/com/uiuios/aios/activity/EmergencyActivity.java @@ -1,4 +1,4 @@ -package com.uiui.aios.activity; +package com.uiuios.aios.activity; import androidx.appcompat.app.AppCompatActivity; @@ -15,20 +15,19 @@ import android.widget.TextView; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.tencent.mmkv.MMKV; -import com.uiui.aios.R; -import com.uiui.aios.bean.BaseResponse; -import com.uiui.aios.bean.Contact; -import com.uiui.aios.disklrucache.CacheHelper; -import com.uiui.aios.manager.AmapManager; -import com.uiui.aios.network.NetInterfaceManager; -import com.uiui.aios.network.URLAddress; -import com.uiui.aios.receiver.BootReceiver; -import com.uiui.aios.utils.ToastUtil; +import com.uiuios.aios.R; +import com.uiuios.aios.bean.BaseResponse; +import com.uiuios.aios.bean.Contact; +import com.uiuios.aios.disklrucache.CacheHelper; +import com.uiuios.aios.manager.AmapManager; +import com.uiuios.aios.network.NetInterfaceManager; +import com.uiuios.aios.network.URLAddress; +import com.uiuios.aios.receiver.BootReceiver; +import com.uiuios.aios.utils.ToastUtil; import java.lang.reflect.Type; import java.util.List; import java.util.concurrent.TimeUnit; -import java.util.function.Predicate; import java.util.stream.Collectors; import butterknife.BindView; @@ -62,7 +61,7 @@ public class EmergencyActivity extends AppCompatActivity { //发送紧急广播 Intent bootIntent = new Intent(BootReceiver.SOS); - bootIntent.setComponent(new ComponentName("com.uiui.sn", "com.uiui.sn.receiver.BootReceiver")); + bootIntent.setComponent(new ComponentName("com.uiuios.sn", "com.uiuios.sn.receiver.BootReceiver")); sendBroadcast(bootIntent); Intent intent = getIntent(); diff --git a/app/src/main/java/com/uiui/aios/activity/NoticeActivity.java b/app/src/main/java/com/uiuios/aios/activity/NoticeActivity.java similarity index 95% rename from app/src/main/java/com/uiui/aios/activity/NoticeActivity.java rename to app/src/main/java/com/uiuios/aios/activity/NoticeActivity.java index 80b9947..4a811fc 100644 --- a/app/src/main/java/com/uiui/aios/activity/NoticeActivity.java +++ b/app/src/main/java/com/uiuios/aios/activity/NoticeActivity.java @@ -1,10 +1,9 @@ -package com.uiui.aios.activity; +package com.uiuios.aios.activity; import android.content.Context; import android.content.Intent; import android.media.AudioManager; import android.media.MediaPlayer; -import android.net.Uri; import android.os.Bundle; import android.os.PowerManager; import android.os.Vibrator; @@ -22,16 +21,16 @@ import com.blankj.utilcode.util.FileUtils; import com.bumptech.glide.Glide; import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.bumptech.glide.request.RequestOptions; -import com.uiui.aios.R; -import com.uiui.aios.alarm.AlarmUtils; -import com.uiui.aios.bean.AlarmClockData; -import com.uiui.aios.bean.BaseResponse; -import com.uiui.aios.network.NetInterfaceManager; -import com.uiui.aios.utils.FileUtil; -import com.uiui.aios.utils.ScreenUtils; -import com.uiui.aios.utils.Utils; -import com.uiui.aios.utils.WakeUpUtils; -import com.uiui.aios.view.JzvdStdAssert; +import com.uiuios.aios.R; +import com.uiuios.aios.alarm.AlarmUtils; +import com.uiuios.aios.bean.AlarmClockData; +import com.uiuios.aios.bean.BaseResponse; +import com.uiuios.aios.network.NetInterfaceManager; +import com.uiuios.aios.utils.FileUtil; +import com.uiuios.aios.utils.ScreenUtils; +import com.uiuios.aios.utils.Utils; +import com.uiuios.aios.utils.WakeUpUtils; +import com.uiuios.aios.view.JzvdStdAssert; import java.io.File; import java.io.FileInputStream; diff --git a/app/src/main/java/com/uiui/aios/activity/alarm/AlarmClockActivity.java b/app/src/main/java/com/uiuios/aios/activity/alarm/AlarmClockActivity.java similarity index 90% rename from app/src/main/java/com/uiui/aios/activity/alarm/AlarmClockActivity.java rename to app/src/main/java/com/uiuios/aios/activity/alarm/AlarmClockActivity.java index 96fd313..a2c4094 100644 --- a/app/src/main/java/com/uiui/aios/activity/alarm/AlarmClockActivity.java +++ b/app/src/main/java/com/uiuios/aios/activity/alarm/AlarmClockActivity.java @@ -1,4 +1,4 @@ -package com.uiui.aios.activity.alarm; +package com.uiuios.aios.activity.alarm; import android.content.BroadcastReceiver; import android.content.Context; @@ -11,13 +11,12 @@ import android.widget.ImageView; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.uiui.aios.R; -import com.uiui.aios.adapter.AlarmAdapter; -import com.uiui.aios.alarm.AlarmUtils; -import com.uiui.aios.base.BaseActivity; -import com.uiui.aios.bean.AlarmClockData; -import com.uiui.aios.tpush.MessageReceiver; -import com.uiui.aios.utils.ToastUtil; +import com.uiuios.aios.R; +import com.uiuios.aios.adapter.AlarmAdapter; +import com.uiuios.aios.base.BaseActivity; +import com.uiuios.aios.bean.AlarmClockData; +import com.uiuios.aios.tpush.MessageReceiver; +import com.uiuios.aios.utils.ToastUtil; import java.util.List; diff --git a/app/src/main/java/com/uiui/aios/activity/alarm/AlarmClockContact.java b/app/src/main/java/com/uiuios/aios/activity/alarm/AlarmClockContact.java similarity index 67% rename from app/src/main/java/com/uiui/aios/activity/alarm/AlarmClockContact.java rename to app/src/main/java/com/uiuios/aios/activity/alarm/AlarmClockContact.java index ce8385e..08998f7 100644 --- a/app/src/main/java/com/uiui/aios/activity/alarm/AlarmClockContact.java +++ b/app/src/main/java/com/uiuios/aios/activity/alarm/AlarmClockContact.java @@ -1,8 +1,8 @@ -package com.uiui.aios.activity.alarm; +package com.uiuios.aios.activity.alarm; -import com.uiui.aios.base.BasePresenter; -import com.uiui.aios.base.BaseView; -import com.uiui.aios.bean.AlarmClockData; +import com.uiuios.aios.base.BasePresenter; +import com.uiuios.aios.base.BaseView; +import com.uiuios.aios.bean.AlarmClockData; import java.util.List; diff --git a/app/src/main/java/com/uiui/aios/activity/alarm/AlarmClockPresenter.java b/app/src/main/java/com/uiuios/aios/activity/alarm/AlarmClockPresenter.java similarity index 91% rename from app/src/main/java/com/uiui/aios/activity/alarm/AlarmClockPresenter.java rename to app/src/main/java/com/uiuios/aios/activity/alarm/AlarmClockPresenter.java index 3689ecf..5c5f00d 100644 --- a/app/src/main/java/com/uiui/aios/activity/alarm/AlarmClockPresenter.java +++ b/app/src/main/java/com/uiuios/aios/activity/alarm/AlarmClockPresenter.java @@ -1,12 +1,12 @@ -package com.uiui.aios.activity.alarm; +package com.uiuios.aios.activity.alarm; import android.content.Context; import androidx.annotation.NonNull; import com.trello.rxlifecycle4.android.ActivityEvent; -import com.uiui.aios.bean.AlarmClockData; -import com.uiui.aios.network.NetInterfaceManager; +import com.uiuios.aios.bean.AlarmClockData; +import com.uiuios.aios.network.NetInterfaceManager; import java.util.List; diff --git a/app/src/main/java/com/uiui/aios/activity/code/HealthCodeActivity.java b/app/src/main/java/com/uiuios/aios/activity/code/HealthCodeActivity.java similarity index 79% rename from app/src/main/java/com/uiui/aios/activity/code/HealthCodeActivity.java rename to app/src/main/java/com/uiuios/aios/activity/code/HealthCodeActivity.java index c4e68f6..fa0546d 100644 --- a/app/src/main/java/com/uiui/aios/activity/code/HealthCodeActivity.java +++ b/app/src/main/java/com/uiuios/aios/activity/code/HealthCodeActivity.java @@ -1,24 +1,18 @@ -package com.uiui.aios.activity.code; +package com.uiuios.aios.activity.code; import android.graphics.Color; -import android.util.Log; import android.view.View; import android.widget.ImageView; import androidx.viewpager.widget.ViewPager; import com.bumptech.glide.Glide; -import com.trello.rxlifecycle4.RxLifecycle; -import com.trello.rxlifecycle4.android.ActivityEvent; -import com.uiui.aios.R; -import com.uiui.aios.adapter.HealthCodeAdapter; -import com.uiui.aios.base.BaseActivity; -import com.uiui.aios.bean.BaseResponse; -import com.uiui.aios.bean.HealthCode; -import com.uiui.aios.network.NetInterfaceManager; -import com.uiui.aios.utils.ToastUtil; -import com.uiui.aios.utils.Utils; -import com.uiui.aios.view.ScaleCircleNavigator; +import com.uiuios.aios.R; +import com.uiuios.aios.adapter.HealthCodeAdapter; +import com.uiuios.aios.base.BaseActivity; +import com.uiuios.aios.bean.HealthCode; +import com.uiuios.aios.utils.ToastUtil; +import com.uiuios.aios.view.ScaleCircleNavigator; import net.lucode.hackware.magicindicator.MagicIndicator; import net.lucode.hackware.magicindicator.ViewPagerHelper; @@ -28,11 +22,6 @@ import java.util.List; import butterknife.BindView; import butterknife.ButterKnife; -import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; -import io.reactivex.rxjava3.annotations.NonNull; -import io.reactivex.rxjava3.core.Observer; -import io.reactivex.rxjava3.disposables.Disposable; -import io.reactivex.rxjava3.schedulers.Schedulers; public class HealthCodeActivity extends BaseActivity implements HealthCodeContact.CodeView { @BindView(R.id.viewPager) diff --git a/app/src/main/java/com/uiui/aios/activity/code/HealthCodeContact.java b/app/src/main/java/com/uiuios/aios/activity/code/HealthCodeContact.java similarity index 67% rename from app/src/main/java/com/uiui/aios/activity/code/HealthCodeContact.java rename to app/src/main/java/com/uiuios/aios/activity/code/HealthCodeContact.java index 1572a5c..39ebaaf 100644 --- a/app/src/main/java/com/uiui/aios/activity/code/HealthCodeContact.java +++ b/app/src/main/java/com/uiuios/aios/activity/code/HealthCodeContact.java @@ -1,8 +1,8 @@ -package com.uiui.aios.activity.code; +package com.uiuios.aios.activity.code; -import com.uiui.aios.base.BasePresenter; -import com.uiui.aios.base.BaseView; -import com.uiui.aios.bean.HealthCode; +import com.uiuios.aios.base.BasePresenter; +import com.uiuios.aios.base.BaseView; +import com.uiuios.aios.bean.HealthCode; import java.util.List; diff --git a/app/src/main/java/com/uiui/aios/activity/code/HealthCodePresenter.java b/app/src/main/java/com/uiuios/aios/activity/code/HealthCodePresenter.java similarity index 89% rename from app/src/main/java/com/uiui/aios/activity/code/HealthCodePresenter.java rename to app/src/main/java/com/uiuios/aios/activity/code/HealthCodePresenter.java index 6cdc816..2e14a77 100644 --- a/app/src/main/java/com/uiui/aios/activity/code/HealthCodePresenter.java +++ b/app/src/main/java/com/uiuios/aios/activity/code/HealthCodePresenter.java @@ -1,15 +1,13 @@ -package com.uiui.aios.activity.code; +package com.uiuios.aios.activity.code; import android.content.Context; import android.util.Log; -import android.view.View; import androidx.annotation.NonNull; import com.trello.rxlifecycle4.android.ActivityEvent; -import com.uiui.aios.bean.HealthCode; -import com.uiui.aios.network.NetInterfaceManager; -import com.uiui.aios.utils.ToastUtil; +import com.uiuios.aios.bean.HealthCode; +import com.uiuios.aios.network.NetInterfaceManager; import java.util.List; diff --git a/app/src/main/java/com/uiui/aios/activity/contact/ContactActivity.java b/app/src/main/java/com/uiuios/aios/activity/contact/ContactActivity.java similarity index 89% rename from app/src/main/java/com/uiui/aios/activity/contact/ContactActivity.java rename to app/src/main/java/com/uiuios/aios/activity/contact/ContactActivity.java index 5190a69..1e34a75 100644 --- a/app/src/main/java/com/uiui/aios/activity/contact/ContactActivity.java +++ b/app/src/main/java/com/uiuios/aios/activity/contact/ContactActivity.java @@ -1,4 +1,4 @@ -package com.uiui.aios.activity.contact; +package com.uiuios.aios.activity.contact; import android.content.res.Configuration; import android.view.View; @@ -6,13 +6,12 @@ import android.widget.ImageView; import android.widget.TextView; import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.uiui.aios.R; -import com.uiui.aios.adapter.ContactAdapter; -import com.uiui.aios.base.BaseActivity; -import com.uiui.aios.bean.Contact; +import com.uiuios.aios.R; +import com.uiuios.aios.adapter.ContactAdapter; +import com.uiuios.aios.base.BaseActivity; +import com.uiuios.aios.bean.Contact; import java.util.List; diff --git a/app/src/main/java/com/uiui/aios/activity/contact/ContactContact.java b/app/src/main/java/com/uiuios/aios/activity/contact/ContactContact.java similarity index 62% rename from app/src/main/java/com/uiui/aios/activity/contact/ContactContact.java rename to app/src/main/java/com/uiuios/aios/activity/contact/ContactContact.java index 20041c6..8aa65cb 100644 --- a/app/src/main/java/com/uiui/aios/activity/contact/ContactContact.java +++ b/app/src/main/java/com/uiuios/aios/activity/contact/ContactContact.java @@ -1,8 +1,8 @@ -package com.uiui.aios.activity.contact; +package com.uiuios.aios.activity.contact; -import com.uiui.aios.base.BasePresenter; -import com.uiui.aios.base.BaseView; -import com.uiui.aios.bean.Contact; +import com.uiuios.aios.base.BasePresenter; +import com.uiuios.aios.base.BaseView; +import com.uiuios.aios.bean.Contact; import java.util.List; diff --git a/app/src/main/java/com/uiui/aios/activity/contact/ContactPresenter.java b/app/src/main/java/com/uiuios/aios/activity/contact/ContactPresenter.java similarity index 92% rename from app/src/main/java/com/uiui/aios/activity/contact/ContactPresenter.java rename to app/src/main/java/com/uiuios/aios/activity/contact/ContactPresenter.java index 61bc49c..88eee86 100644 --- a/app/src/main/java/com/uiui/aios/activity/contact/ContactPresenter.java +++ b/app/src/main/java/com/uiuios/aios/activity/contact/ContactPresenter.java @@ -1,13 +1,13 @@ -package com.uiui.aios.activity.contact; +package com.uiuios.aios.activity.contact; import android.content.Context; import android.util.Log; import com.trello.rxlifecycle4.RxLifecycle; import com.trello.rxlifecycle4.android.ActivityEvent; -import com.uiui.aios.bean.BaseResponse; -import com.uiui.aios.bean.Contact; -import com.uiui.aios.network.NetInterfaceManager; +import com.uiuios.aios.bean.BaseResponse; +import com.uiuios.aios.bean.Contact; +import com.uiuios.aios.network.NetInterfaceManager; import java.util.List; diff --git a/app/src/main/java/com/uiui/aios/activity/main/MainActivity.java b/app/src/main/java/com/uiuios/aios/activity/main/MainActivity.java similarity index 95% rename from app/src/main/java/com/uiui/aios/activity/main/MainActivity.java rename to app/src/main/java/com/uiuios/aios/activity/main/MainActivity.java index dac6897..909840c 100644 --- a/app/src/main/java/com/uiui/aios/activity/main/MainActivity.java +++ b/app/src/main/java/com/uiuios/aios/activity/main/MainActivity.java @@ -1,4 +1,4 @@ -package com.uiui.aios.activity.main; +package com.uiuios.aios.activity.main; import android.content.ActivityNotFoundException; import android.content.BroadcastReceiver; @@ -26,20 +26,20 @@ import androidx.viewpager.widget.ViewPager; import com.alarmclock.uiui.IAlarmAidlInterface; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.uiui.aios.BuildConfig; -import com.uiui.aios.R; -import com.uiui.aios.base.BaseActivity; -import com.uiui.aios.bean.AlarmItem; -import com.uiui.aios.bean.DesktopIcon; -import com.uiui.aios.fragment.AppListFragment; -import com.uiui.aios.fragment.BaseFragmentPagerAdapter; -import com.uiui.aios.fragment.CustomFragment; -import com.uiui.aios.fragment.SecondFragment; -import com.uiui.aios.service.NotificationService; -import com.uiui.aios.utils.ApkUtils; -import com.uiui.aios.utils.AppUsedTimeUtils; -import com.uiui.aios.utils.ToastUtil; -import com.uiui.aios.view.ScaleCircleNavigator; +import com.uiuios.aios.BuildConfig; +import com.uiuios.aios.R; +import com.uiuios.aios.base.BaseActivity; +import com.uiuios.aios.bean.AlarmItem; +import com.uiuios.aios.bean.DesktopIcon; +import com.uiuios.aios.fragment.AppListFragment; +import com.uiuios.aios.fragment.BaseFragmentPagerAdapter; +import com.uiuios.aios.fragment.CustomFragment; +import com.uiuios.aios.fragment.SecondFragment; +import com.uiuios.aios.service.NotificationService; +import com.uiuios.aios.utils.ApkUtils; +import com.uiuios.aios.utils.AppUsedTimeUtils; +import com.uiuios.aios.utils.ToastUtil; +import com.uiuios.aios.view.ScaleCircleNavigator; import net.lucode.hackware.magicindicator.MagicIndicator; import net.lucode.hackware.magicindicator.ViewPagerHelper; @@ -96,7 +96,7 @@ public class MainActivity extends BaseActivity implements MainContact.MainView { // fragmentTransaction.add(R.id.viewPager, appListFragment); // fragmentTransaction.commit(); - is_twoscreen = Settings.Global.getInt(getContentResolver(), "is_twoscreen", 0) == 1; + is_twoscreen = Settings.Global.getInt(getContentResolver(), "is_twoscreen", 1) == 1; if (is_twoscreen) { appListIndex = 2; defaultCurrent = 1; diff --git a/app/src/main/java/com/uiui/aios/activity/main/MainContact.java b/app/src/main/java/com/uiuios/aios/activity/main/MainContact.java similarity index 86% rename from app/src/main/java/com/uiui/aios/activity/main/MainContact.java rename to app/src/main/java/com/uiuios/aios/activity/main/MainContact.java index 7de0405..2c930a8 100644 --- a/app/src/main/java/com/uiui/aios/activity/main/MainContact.java +++ b/app/src/main/java/com/uiuios/aios/activity/main/MainContact.java @@ -1,7 +1,7 @@ -package com.uiui.aios.activity.main; +package com.uiuios.aios.activity.main; -import com.uiui.aios.base.BasePresenter; -import com.uiui.aios.base.BaseView; +import com.uiuios.aios.base.BasePresenter; +import com.uiuios.aios.base.BaseView; public class MainContact { public interface Presenter extends BasePresenter { diff --git a/app/src/main/java/com/uiui/aios/activity/main/MainPresenter.java b/app/src/main/java/com/uiuios/aios/activity/main/MainPresenter.java similarity index 95% rename from app/src/main/java/com/uiui/aios/activity/main/MainPresenter.java rename to app/src/main/java/com/uiuios/aios/activity/main/MainPresenter.java index b4fd44c..49aa452 100644 --- a/app/src/main/java/com/uiui/aios/activity/main/MainPresenter.java +++ b/app/src/main/java/com/uiuios/aios/activity/main/MainPresenter.java @@ -1,4 +1,4 @@ -package com.uiui.aios.activity.main; +package com.uiuios.aios.activity.main; import android.content.Context; import android.content.Intent; @@ -8,14 +8,14 @@ import android.util.Log; import com.google.gson.JsonObject; import com.trello.rxlifecycle4.RxLifecycle; import com.trello.rxlifecycle4.android.ActivityEvent; -import com.uiui.aios.BuildConfig; -import com.uiui.aios.bean.BaseResponse; -import com.uiui.aios.bean.Contact; -import com.uiui.aios.bean.NetDesktopIcon; -import com.uiui.aios.network.NetInterfaceManager; -import com.uiui.aios.utils.ApkUtils; -import com.uiui.aios.utils.AppUsedTimeUtils; -import com.uiui.aios.utils.Utils; +import com.uiuios.aios.BuildConfig; +import com.uiuios.aios.bean.BaseResponse; +import com.uiuios.aios.bean.Contact; +import com.uiuios.aios.bean.NetDesktopIcon; +import com.uiuios.aios.network.NetInterfaceManager; +import com.uiuios.aios.utils.ApkUtils; +import com.uiuios.aios.utils.AppUsedTimeUtils; +import com.uiuios.aios.utils.Utils; import java.util.List; diff --git a/app/src/main/java/com/uiui/aios/activity/weather/WeatherActivity.java b/app/src/main/java/com/uiuios/aios/activity/weather/WeatherActivity.java similarity index 93% rename from app/src/main/java/com/uiui/aios/activity/weather/WeatherActivity.java rename to app/src/main/java/com/uiuios/aios/activity/weather/WeatherActivity.java index af0b397..8814537 100644 --- a/app/src/main/java/com/uiui/aios/activity/weather/WeatherActivity.java +++ b/app/src/main/java/com/uiuios/aios/activity/weather/WeatherActivity.java @@ -1,4 +1,4 @@ -package com.uiui.aios.activity.weather; +package com.uiuios.aios.activity.weather; import android.content.res.Configuration; import android.content.res.Resources; @@ -10,10 +10,10 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.qweather.sdk.bean.weather.WeatherDailyBean; -import com.uiui.aios.R; -import com.uiui.aios.adapter.WeatherDayApdapter; -import com.uiui.aios.base.BaseActivity; -import com.uiui.aios.view.HorizontalItemDecoration; +import com.uiuios.aios.R; +import com.uiuios.aios.adapter.WeatherDayApdapter; +import com.uiuios.aios.base.BaseActivity; +import com.uiuios.aios.view.HorizontalItemDecoration; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/uiui/aios/activity/weather/WeatherContact.java b/app/src/main/java/com/uiuios/aios/activity/weather/WeatherContact.java similarity index 83% rename from app/src/main/java/com/uiui/aios/activity/weather/WeatherContact.java rename to app/src/main/java/com/uiuios/aios/activity/weather/WeatherContact.java index 0e0950f..3fbbf69 100644 --- a/app/src/main/java/com/uiui/aios/activity/weather/WeatherContact.java +++ b/app/src/main/java/com/uiuios/aios/activity/weather/WeatherContact.java @@ -1,8 +1,8 @@ -package com.uiui.aios.activity.weather; +package com.uiuios.aios.activity.weather; import com.qweather.sdk.bean.weather.WeatherDailyBean; -import com.uiui.aios.base.BasePresenter; -import com.uiui.aios.base.BaseView; +import com.uiuios.aios.base.BasePresenter; +import com.uiuios.aios.base.BaseView; public class WeatherContact { public interface Presenter extends BasePresenter { diff --git a/app/src/main/java/com/uiui/aios/activity/weather/WeatherPresenter.java b/app/src/main/java/com/uiuios/aios/activity/weather/WeatherPresenter.java similarity index 97% rename from app/src/main/java/com/uiui/aios/activity/weather/WeatherPresenter.java rename to app/src/main/java/com/uiuios/aios/activity/weather/WeatherPresenter.java index c0c65f9..e949c77 100644 --- a/app/src/main/java/com/uiui/aios/activity/weather/WeatherPresenter.java +++ b/app/src/main/java/com/uiuios/aios/activity/weather/WeatherPresenter.java @@ -1,4 +1,4 @@ -package com.uiui.aios.activity.weather; +package com.uiuios.aios.activity.weather; import android.content.Context; import android.util.Log; @@ -12,7 +12,7 @@ import com.qweather.sdk.bean.weather.WeatherDailyBean; import com.qweather.sdk.view.QWeather; import com.tencent.mmkv.MMKV; import com.trello.rxlifecycle4.android.ActivityEvent; -import com.uiui.aios.manager.AmapManager; +import com.uiuios.aios.manager.AmapManager; import java.lang.reflect.Type; diff --git a/app/src/main/java/com/uiui/aios/adapter/APPListAdapter.java b/app/src/main/java/com/uiuios/aios/adapter/APPListAdapter.java similarity index 92% rename from app/src/main/java/com/uiui/aios/adapter/APPListAdapter.java rename to app/src/main/java/com/uiuios/aios/adapter/APPListAdapter.java index 303a6ed..5e73b3a 100644 --- a/app/src/main/java/com/uiui/aios/adapter/APPListAdapter.java +++ b/app/src/main/java/com/uiuios/aios/adapter/APPListAdapter.java @@ -1,11 +1,10 @@ -package com.uiui.aios.adapter; +package com.uiuios.aios.adapter; import android.content.Context; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; -import android.widget.LinearLayout; import android.widget.TextView; import androidx.annotation.NonNull; @@ -13,10 +12,10 @@ import androidx.constraintlayout.widget.ConstraintLayout; import androidx.recyclerview.widget.RecyclerView; -import com.uiui.aios.R; -import com.uiui.aios.bean.AppListInfo; -import com.uiui.aios.service.NotificationService; -import com.uiui.aios.utils.ApkUtils; +import com.uiuios.aios.R; +import com.uiuios.aios.bean.AppListInfo; +import com.uiuios.aios.service.NotificationService; +import com.uiuios.aios.utils.ApkUtils; import java.util.List; diff --git a/app/src/main/java/com/uiui/aios/adapter/AlarmAdapter.java b/app/src/main/java/com/uiuios/aios/adapter/AlarmAdapter.java similarity index 96% rename from app/src/main/java/com/uiui/aios/adapter/AlarmAdapter.java rename to app/src/main/java/com/uiuios/aios/adapter/AlarmAdapter.java index ecd7590..8a9b3bb 100644 --- a/app/src/main/java/com/uiui/aios/adapter/AlarmAdapter.java +++ b/app/src/main/java/com/uiuios/aios/adapter/AlarmAdapter.java @@ -1,10 +1,8 @@ -package com.uiui.aios.adapter; +package com.uiuios.aios.adapter; -import android.content.Context; import android.graphics.Bitmap; import android.media.AudioAttributes; import android.media.MediaPlayer; -import android.os.Build; import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; @@ -22,12 +20,11 @@ import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.bumptech.glide.request.RequestOptions; -import com.uiui.aios.R; -import com.uiui.aios.bean.AlarmClockData; -import com.uiui.aios.utils.FFmpegUtils; -import com.uiui.aios.utils.ScreenUtils; -import com.uiui.aios.view.JzvdStdRound; -import com.uiui.aios.view.MyJzvdStdNoTitleNoClarity; +import com.uiuios.aios.R; +import com.uiuios.aios.bean.AlarmClockData; +import com.uiuios.aios.utils.FFmpegUtils; +import com.uiuios.aios.utils.ScreenUtils; +import com.uiuios.aios.view.JzvdStdRound; import java.io.IOException; import java.text.ParseException; diff --git a/app/src/main/java/com/uiui/aios/adapter/AlarmClockAdapter.java b/app/src/main/java/com/uiuios/aios/adapter/AlarmClockAdapter.java similarity index 94% rename from app/src/main/java/com/uiui/aios/adapter/AlarmClockAdapter.java rename to app/src/main/java/com/uiuios/aios/adapter/AlarmClockAdapter.java index 97dcd3e..520e15b 100644 --- a/app/src/main/java/com/uiui/aios/adapter/AlarmClockAdapter.java +++ b/app/src/main/java/com/uiuios/aios/adapter/AlarmClockAdapter.java @@ -1,4 +1,4 @@ -package com.uiui.aios.adapter; +package com.uiuios.aios.adapter; import android.view.LayoutInflater; import android.view.View; @@ -8,8 +8,8 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import com.uiui.aios.R; -import com.uiui.aios.bean.AlarmItem; +import com.uiuios.aios.R; +import com.uiuios.aios.bean.AlarmItem; import java.util.List; diff --git a/app/src/main/java/com/uiui/aios/adapter/ContactAdapter.java b/app/src/main/java/com/uiuios/aios/adapter/ContactAdapter.java similarity index 96% rename from app/src/main/java/com/uiui/aios/adapter/ContactAdapter.java rename to app/src/main/java/com/uiuios/aios/adapter/ContactAdapter.java index b8d80dc..fa07f6a 100644 --- a/app/src/main/java/com/uiui/aios/adapter/ContactAdapter.java +++ b/app/src/main/java/com/uiuios/aios/adapter/ContactAdapter.java @@ -1,4 +1,4 @@ -package com.uiui.aios.adapter; +package com.uiuios.aios.adapter; import android.content.Context; import android.content.Intent; @@ -7,7 +7,6 @@ import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.NonNull; @@ -16,8 +15,8 @@ import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.shehuan.niv.NiceImageView; -import com.uiui.aios.R; -import com.uiui.aios.bean.Contact; +import com.uiuios.aios.R; +import com.uiuios.aios.bean.Contact; import java.util.List; diff --git a/app/src/main/java/com/uiui/aios/adapter/HealthCodeAdapter.java b/app/src/main/java/com/uiuios/aios/adapter/HealthCodeAdapter.java similarity index 97% rename from app/src/main/java/com/uiui/aios/adapter/HealthCodeAdapter.java rename to app/src/main/java/com/uiuios/aios/adapter/HealthCodeAdapter.java index d50c7e5..e184f3f 100644 --- a/app/src/main/java/com/uiui/aios/adapter/HealthCodeAdapter.java +++ b/app/src/main/java/com/uiuios/aios/adapter/HealthCodeAdapter.java @@ -1,4 +1,4 @@ -package com.uiui.aios.adapter; +package com.uiuios.aios.adapter; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/uiui/aios/adapter/NotificationAdapter.java b/app/src/main/java/com/uiuios/aios/adapter/NotificationAdapter.java similarity index 96% rename from app/src/main/java/com/uiui/aios/adapter/NotificationAdapter.java rename to app/src/main/java/com/uiuios/aios/adapter/NotificationAdapter.java index 7ce5523..1df1cb5 100644 --- a/app/src/main/java/com/uiui/aios/adapter/NotificationAdapter.java +++ b/app/src/main/java/com/uiuios/aios/adapter/NotificationAdapter.java @@ -1,7 +1,6 @@ -package com.uiui.aios.adapter; +package com.uiuios.aios.adapter; import android.content.Context; -import android.content.Intent; import android.media.AudioAttributes; import android.media.MediaPlayer; import android.text.TextUtils; @@ -15,9 +14,9 @@ import androidx.annotation.NonNull; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.recyclerview.widget.RecyclerView; -import com.uiui.aios.R; -import com.uiui.aios.bean.AlarmClockData; -import com.uiui.aios.utils.FFmpegUtils; +import com.uiuios.aios.R; +import com.uiuios.aios.bean.AlarmClockData; +import com.uiuios.aios.utils.FFmpegUtils; import java.io.IOException; import java.text.ParseException; diff --git a/app/src/main/java/com/uiui/aios/adapter/SOSNnmberAdapter.java b/app/src/main/java/com/uiuios/aios/adapter/SOSNnmberAdapter.java similarity index 93% rename from app/src/main/java/com/uiui/aios/adapter/SOSNnmberAdapter.java rename to app/src/main/java/com/uiuios/aios/adapter/SOSNnmberAdapter.java index 0f01007..d8a9669 100644 --- a/app/src/main/java/com/uiui/aios/adapter/SOSNnmberAdapter.java +++ b/app/src/main/java/com/uiuios/aios/adapter/SOSNnmberAdapter.java @@ -1,4 +1,4 @@ -package com.uiui.aios.adapter; +package com.uiuios.aios.adapter; import android.content.Context; import android.content.Intent; @@ -11,9 +11,9 @@ import androidx.annotation.NonNull; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.recyclerview.widget.RecyclerView; -import com.uiui.aios.R; -import com.uiui.aios.activity.EmergencyActivity; -import com.uiui.aios.bean.Contact; +import com.uiuios.aios.R; +import com.uiuios.aios.activity.EmergencyActivity; +import com.uiuios.aios.bean.Contact; import java.util.List; diff --git a/app/src/main/java/com/uiui/aios/adapter/WeatherDayApdapter.java b/app/src/main/java/com/uiuios/aios/adapter/WeatherDayApdapter.java similarity index 97% rename from app/src/main/java/com/uiui/aios/adapter/WeatherDayApdapter.java rename to app/src/main/java/com/uiuios/aios/adapter/WeatherDayApdapter.java index d19ee49..23d8219 100644 --- a/app/src/main/java/com/uiui/aios/adapter/WeatherDayApdapter.java +++ b/app/src/main/java/com/uiuios/aios/adapter/WeatherDayApdapter.java @@ -1,4 +1,4 @@ -package com.uiui.aios.adapter; +package com.uiuios.aios.adapter; import android.content.Context; import android.graphics.drawable.Drawable; @@ -14,7 +14,7 @@ import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.RecyclerView; import com.qweather.sdk.bean.weather.WeatherDailyBean; -import com.uiui.aios.R; +import com.uiuios.aios.R; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -83,7 +83,7 @@ public class WeatherDayApdapter extends RecyclerView.Adapter showPackageName = new HashSet() {{ this.add("com.android.dialer"); @@ -129,8 +135,8 @@ public class ApkUtils { this.add("com.android.gallery3d"); this.add("com.android.camera2"); this.add("com.android.settings"); - this.add("com.uiui.sn"); - this.add("com.uiui.appstore"); + this.add("com.uiuios.sn"); + this.add("com.uiuios.appstore"); }}; /** @@ -492,4 +498,5 @@ public class ApkUtils { public static int getUserId(int uid) { return uid / PER_USER_RANGE; } -} + + } diff --git a/app/src/main/java/com/uiui/aios/utils/AppUsedTimeUtils.java b/app/src/main/java/com/uiuios/aios/utils/AppUsedTimeUtils.java similarity index 99% rename from app/src/main/java/com/uiui/aios/utils/AppUsedTimeUtils.java rename to app/src/main/java/com/uiuios/aios/utils/AppUsedTimeUtils.java index a632406..a5a10a7 100644 --- a/app/src/main/java/com/uiui/aios/utils/AppUsedTimeUtils.java +++ b/app/src/main/java/com/uiuios/aios/utils/AppUsedTimeUtils.java @@ -1,4 +1,4 @@ -package com.uiui.aios.utils; +package com.uiuios.aios.utils; import android.annotation.SuppressLint; import android.content.Context; diff --git a/app/src/main/java/com/uiui/aios/utils/AppUtil.java b/app/src/main/java/com/uiuios/aios/utils/AppUtil.java similarity index 98% rename from app/src/main/java/com/uiui/aios/utils/AppUtil.java rename to app/src/main/java/com/uiuios/aios/utils/AppUtil.java index d2f6113..08eb338 100644 --- a/app/src/main/java/com/uiui/aios/utils/AppUtil.java +++ b/app/src/main/java/com/uiuios/aios/utils/AppUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.uiui.aios.utils; +package com.uiuios.aios.utils; import android.app.ActivityManager; diff --git a/app/src/main/java/com/uiui/aios/utils/BitmapUtils.java b/app/src/main/java/com/uiuios/aios/utils/BitmapUtils.java similarity index 98% rename from app/src/main/java/com/uiui/aios/utils/BitmapUtils.java rename to app/src/main/java/com/uiuios/aios/utils/BitmapUtils.java index b804413..4a0cc9b 100644 --- a/app/src/main/java/com/uiui/aios/utils/BitmapUtils.java +++ b/app/src/main/java/com/uiuios/aios/utils/BitmapUtils.java @@ -1,4 +1,4 @@ -package com.uiui.aios.utils; +package com.uiuios.aios.utils; import android.content.Context; import android.graphics.Bitmap; diff --git a/app/src/main/java/com/uiui/aios/utils/CmdUtil.java b/app/src/main/java/com/uiuios/aios/utils/CmdUtil.java similarity index 98% rename from app/src/main/java/com/uiui/aios/utils/CmdUtil.java rename to app/src/main/java/com/uiuios/aios/utils/CmdUtil.java index 3dd5591..3d34268 100644 --- a/app/src/main/java/com/uiui/aios/utils/CmdUtil.java +++ b/app/src/main/java/com/uiuios/aios/utils/CmdUtil.java @@ -1,4 +1,4 @@ -package com.uiui.aios.utils; +package com.uiuios.aios.utils; import android.text.TextUtils; import android.util.Log; diff --git a/app/src/main/java/com/uiui/aios/utils/FFmpegUtils.java b/app/src/main/java/com/uiuios/aios/utils/FFmpegUtils.java similarity index 97% rename from app/src/main/java/com/uiui/aios/utils/FFmpegUtils.java rename to app/src/main/java/com/uiuios/aios/utils/FFmpegUtils.java index 39e8acd..1fded33 100644 --- a/app/src/main/java/com/uiui/aios/utils/FFmpegUtils.java +++ b/app/src/main/java/com/uiuios/aios/utils/FFmpegUtils.java @@ -1,6 +1,5 @@ -package com.uiui.aios.utils; +package com.uiuios.aios.utils; -import android.content.Context; import android.graphics.Bitmap; import android.util.Log; diff --git a/app/src/main/java/com/uiui/aios/utils/FileUtil.java b/app/src/main/java/com/uiuios/aios/utils/FileUtil.java similarity index 98% rename from app/src/main/java/com/uiui/aios/utils/FileUtil.java rename to app/src/main/java/com/uiuios/aios/utils/FileUtil.java index b381e39..acac874 100644 --- a/app/src/main/java/com/uiui/aios/utils/FileUtil.java +++ b/app/src/main/java/com/uiuios/aios/utils/FileUtil.java @@ -1,4 +1,4 @@ -package com.uiui.aios.utils; +package com.uiuios.aios.utils; import android.text.TextUtils; diff --git a/app/src/main/java/com/uiui/aios/utils/ForegroundAppUtil.java b/app/src/main/java/com/uiuios/aios/utils/ForegroundAppUtil.java similarity index 99% rename from app/src/main/java/com/uiui/aios/utils/ForegroundAppUtil.java rename to app/src/main/java/com/uiuios/aios/utils/ForegroundAppUtil.java index fbcd566..6a19170 100644 --- a/app/src/main/java/com/uiui/aios/utils/ForegroundAppUtil.java +++ b/app/src/main/java/com/uiuios/aios/utils/ForegroundAppUtil.java @@ -1,4 +1,4 @@ -package com.uiui.aios.utils; +package com.uiuios.aios.utils; import android.app.ActivityManager; import android.app.usage.UsageStats; diff --git a/app/src/main/java/com/uiui/aios/utils/GlideLoadUtils.java b/app/src/main/java/com/uiuios/aios/utils/GlideLoadUtils.java similarity index 98% rename from app/src/main/java/com/uiui/aios/utils/GlideLoadUtils.java rename to app/src/main/java/com/uiuios/aios/utils/GlideLoadUtils.java index 3885fc6..bb5a06b 100644 --- a/app/src/main/java/com/uiui/aios/utils/GlideLoadUtils.java +++ b/app/src/main/java/com/uiuios/aios/utils/GlideLoadUtils.java @@ -1,4 +1,4 @@ -package com.uiui.aios.utils; +package com.uiuios.aios.utils; import android.annotation.TargetApi; import android.app.Activity; diff --git a/app/src/main/java/com/uiui/aios/utils/GsonUtils.java b/app/src/main/java/com/uiuios/aios/utils/GsonUtils.java similarity index 95% rename from app/src/main/java/com/uiui/aios/utils/GsonUtils.java rename to app/src/main/java/com/uiuios/aios/utils/GsonUtils.java index 9ea2b86..d71a588 100644 --- a/app/src/main/java/com/uiui/aios/utils/GsonUtils.java +++ b/app/src/main/java/com/uiuios/aios/utils/GsonUtils.java @@ -1,4 +1,4 @@ -package com.uiui.aios.utils; +package com.uiuios.aios.utils; import com.google.gson.Gson; import com.google.gson.JsonObject; diff --git a/app/src/main/java/com/uiui/aios/utils/IconUtils.java b/app/src/main/java/com/uiuios/aios/utils/IconUtils.java similarity index 96% rename from app/src/main/java/com/uiui/aios/utils/IconUtils.java rename to app/src/main/java/com/uiuios/aios/utils/IconUtils.java index 01cb120..4434da7 100644 --- a/app/src/main/java/com/uiui/aios/utils/IconUtils.java +++ b/app/src/main/java/com/uiuios/aios/utils/IconUtils.java @@ -1,4 +1,4 @@ -package com.uiui.aios.utils; +package com.uiuios.aios.utils; import android.util.Log; @@ -7,11 +7,11 @@ import java.util.List; public class IconUtils { public static List appClassNameList = new ArrayList() {{ - this.add("com.uiui.sn");//设别信息 - this.add("com.uiui.appstore");//应用市场 + this.add("com.uiuios.sn");//设别信息 + this.add("com.uiuios.appstore");//应用市场 this.add("com.uiui.weather");//天气 this.add("com.android.browser");//浏览器 - this.add("com.uiui.browser");//浏览器 + this.add("com.uiuios.browser");//浏览器 this.add("com.aoleyun.browser");//浏览器 this.add("com.android.calculator2");//计算器 this.add("com.android.calendar");//日历 diff --git a/app/src/main/java/com/uiui/aios/utils/MD5Util.java b/app/src/main/java/com/uiuios/aios/utils/MD5Util.java similarity index 98% rename from app/src/main/java/com/uiui/aios/utils/MD5Util.java rename to app/src/main/java/com/uiuios/aios/utils/MD5Util.java index ad473f5..2cd148a 100644 --- a/app/src/main/java/com/uiui/aios/utils/MD5Util.java +++ b/app/src/main/java/com/uiuios/aios/utils/MD5Util.java @@ -1,4 +1,4 @@ -package com.uiui.aios.utils; +package com.uiuios.aios.utils; import android.annotation.SuppressLint; diff --git a/app/src/main/java/com/uiui/aios/utils/NetStateUtils.java b/app/src/main/java/com/uiuios/aios/utils/NetStateUtils.java similarity index 98% rename from app/src/main/java/com/uiui/aios/utils/NetStateUtils.java rename to app/src/main/java/com/uiuios/aios/utils/NetStateUtils.java index 694f1a6..e033692 100644 --- a/app/src/main/java/com/uiui/aios/utils/NetStateUtils.java +++ b/app/src/main/java/com/uiuios/aios/utils/NetStateUtils.java @@ -1,4 +1,4 @@ -package com.uiui.aios.utils; +package com.uiuios.aios.utils; import android.content.Context; import android.net.ConnectivityManager; diff --git a/app/src/main/java/com/uiui/aios/utils/SchemeUtils.java b/app/src/main/java/com/uiuios/aios/utils/SchemeUtils.java similarity index 96% rename from app/src/main/java/com/uiui/aios/utils/SchemeUtils.java rename to app/src/main/java/com/uiuios/aios/utils/SchemeUtils.java index 8a3c80d..0a51472 100644 --- a/app/src/main/java/com/uiui/aios/utils/SchemeUtils.java +++ b/app/src/main/java/com/uiuios/aios/utils/SchemeUtils.java @@ -1,4 +1,4 @@ -package com.uiui.aios.utils; +package com.uiuios.aios.utils; import android.app.Activity; import android.content.Intent; diff --git a/app/src/main/java/com/uiui/aios/utils/ScreenUtils.java b/app/src/main/java/com/uiuios/aios/utils/ScreenUtils.java similarity index 97% rename from app/src/main/java/com/uiui/aios/utils/ScreenUtils.java rename to app/src/main/java/com/uiuios/aios/utils/ScreenUtils.java index 06a8e7c..07670b0 100644 --- a/app/src/main/java/com/uiui/aios/utils/ScreenUtils.java +++ b/app/src/main/java/com/uiuios/aios/utils/ScreenUtils.java @@ -1,4 +1,4 @@ -package com.uiui.aios.utils; +package com.uiuios.aios.utils; import android.content.Context; import android.content.res.Resources; diff --git a/app/src/main/java/com/uiui/aios/utils/TimeUtils.java b/app/src/main/java/com/uiuios/aios/utils/TimeUtils.java similarity index 96% rename from app/src/main/java/com/uiui/aios/utils/TimeUtils.java rename to app/src/main/java/com/uiuios/aios/utils/TimeUtils.java index 70b3712..a5bc99d 100644 --- a/app/src/main/java/com/uiui/aios/utils/TimeUtils.java +++ b/app/src/main/java/com/uiuios/aios/utils/TimeUtils.java @@ -1,4 +1,4 @@ -package com.uiui.aios.utils; +package com.uiuios.aios.utils; import android.os.Build; diff --git a/app/src/main/java/com/uiui/aios/utils/ToastUtil.java b/app/src/main/java/com/uiuios/aios/utils/ToastUtil.java similarity index 97% rename from app/src/main/java/com/uiui/aios/utils/ToastUtil.java rename to app/src/main/java/com/uiuios/aios/utils/ToastUtil.java index 87fb3da..8375104 100644 --- a/app/src/main/java/com/uiui/aios/utils/ToastUtil.java +++ b/app/src/main/java/com/uiuios/aios/utils/ToastUtil.java @@ -1,4 +1,4 @@ -package com.uiui.aios.utils; +package com.uiuios.aios.utils; import android.annotation.SuppressLint; import android.content.Context; @@ -10,7 +10,7 @@ import android.util.Log; import android.widget.Toast; import com.blankj.utilcode.util.ToastUtils; -import com.uiui.aios.BuildConfig; +import com.uiuios.aios.BuildConfig; /** diff --git a/app/src/main/java/com/uiuios/aios/utils/Utils.java b/app/src/main/java/com/uiuios/aios/utils/Utils.java new file mode 100644 index 0000000..e1c08df --- /dev/null +++ b/app/src/main/java/com/uiuios/aios/utils/Utils.java @@ -0,0 +1,207 @@ +package com.uiuios.aios.utils; + +import android.annotation.SuppressLint; +import android.app.role.RoleManager; +import android.content.ComponentName; +import android.content.Context; +import android.content.ContextWrapper; +import android.content.Intent; +import android.content.IntentFilter; +import android.content.pm.PackageManager; +import android.content.pm.ResolveInfo; +import android.os.BatteryManager; +import android.os.Build; +import android.os.Environment; +import android.os.SystemProperties; +import android.os.UserHandle; +import android.text.TextUtils; +import android.util.Log; + +import androidx.core.content.ContextCompat; + +import com.uiuios.aios.BuildConfig; + +import java.io.File; +import java.lang.reflect.Method; +import java.util.List; +import java.util.concurrent.Executor; +import java.util.function.Consumer; + +public class Utils { + private static final String TAG = Utils.class.getSimpleName(); + + /** + * 获取设备序列号 + * + * @return + */ + @SuppressLint("MissingPermission") + public static String getSerial() { + String serial = "unknow"; + try { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {//9.0+ + serial = Build.getSerial(); + } else if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N) {//8.0+ + serial = Build.SERIAL; + } else {//8.0- + Class c = Class.forName("android.os.SystemProperties"); + Method get = c.getMethod("get", String.class); + serial = (String) get.invoke(c, "ro.serialno"); + } + } catch (Exception e) { + e.printStackTrace(); + Log.e("e", "读取设备序列号异常：" + e.toString()); + } + if (BuildConfig.DEBUG) { +// return "QNG2DKB00463"; + } + return serial; + } + + public static String getDeviceSN() { + String serial = null; + try { + Class c = Class.forName("android.os.SystemProperties"); + Method get = c.getMethod("get", String.class); + serial = (String) get.invoke(c, "persist.sys.hrSerial"); + } catch (Exception e) { + e.printStackTrace(); + } + return serial; + } + + /** + * 获取电量 + * + * @param mContext + * @return + */ + synchronized public static int getBatteryLevel(Context mContext) { + if (Build.VERSION.SDK_INT >= 21) { + return ((BatteryManager) mContext.getSystemService(Context.BATTERY_SERVICE)).getIntProperty(4); + } else { + Intent intent = (new ContextWrapper(mContext)).registerReceiver(null, new IntentFilter("android.intent.action.BATTERY_CHANGED")); + return intent.getIntExtra("level", -1) * 100 / intent.getIntExtra("scale", -1); + } + } + + public static String getDownLoadPath(Context context) { + String path = ContextCompat.getExternalFilesDirs(context, Environment.DIRECTORY_DOWNLOADS)[0].getAbsolutePath(); + return path + File.separator; + } + + public static String getFileNamefromURL(String url) { + int position = url.lastIndexOf("/"); + return url.substring(position + 1); + } + + public static void openLauncher3(Context context) { + setDefaultDesktop(context, Launcher3, Launcher3Class); +// ApkUtils.openPackage(mContext, Launcher3); + gotoLauncher(context); + } + + public static void gotoLauncher(Context context) { + Intent i = new Intent(Intent.ACTION_MAIN); + i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); //android123提示如果是服务里调用，必须加入new task标识 + i.addCategory(Intent.CATEGORY_HOME); + context.startActivity(i); + } + + private static String Launcher3 = "com.android.launcher3"; + private static String Launcher3Class = "com.android.launcher3.Launcher"; + + public static void setDefaultDesktop(Context context, String pkg, String className) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + setRoleHolderAsUser(context, pkg); + Log.e(TAG, "setDefaultDesktop: setRoleHolderAsUser"); + } else { + //爱华设置，暂时屏蔽 +// setDefaultLauncher(mContext, pkg, className); + Log.e(TAG, "setDefaultDesktop: setDefaultLauncher"); + } +// String oldDesktop = (String) SPUtils.get(mContext, "default_launcher", ""); +// if (Objects.equals(oldDesktop, pkg)) { +// Log.e(TAG, "setDefaultDesktop: " + "数据一致"); +// return; +// } + Intent intent = new Intent("setDefaultLauncher"); + intent.putExtra("package", pkg); + intent.putExtra("className", className); +// if (JGYUtils.getInstance().checkAppPlatform() == MTKPlatform) { + Log.e(TAG, "setDefaultDesktop: MTK"); + //爱华定制 + intent.setComponent(new ComponentName("com.android.settings", "com.android.settings.AoleReceiver")); + // TODO: 2022/7/6 有问题 + setDefaultLauncher(context, "com.android.transfer", "com.android.transfer.MainActivity"); + SystemProperties.set("persist.sys.launcher.pkgname", pkg); + SystemProperties.set("persist.sys.launcher.classname", className); +// } + intent.setPackage("com.android.settings"); + context.sendBroadcast(intent); +// ApkUtils.openPackage(mContext, pkg); + Log.e(TAG, "setDefaultDesktop: " + pkg + ":" + className); + Log.e(TAG, "setDefaultDesktop: " + "persist.sys.launcher.pkgname = " + SystemProperties.get("persist.sys.launcher.pkgname")); + Log.e(TAG, "setDefaultDesktop: " + "persist.sys.launcher.classname = " + SystemProperties.get("persist.sys.launcher.classname")); + } + + public static void setDefaultLauncher(Context context, String defPackageName, String defClassName) { + try { + if (!TextUtils.isEmpty(defPackageName) && !TextUtils.isEmpty(defClassName)) { + IntentFilter filter = new IntentFilter(); + filter.addAction("android.intent.action.MAIN"); + filter.addCategory("android.intent.category.HOME"); + filter.addCategory("android.intent.category.DEFAULT"); + Intent intent = new Intent(Intent.ACTION_MAIN); + intent.addCategory(Intent.CATEGORY_HOME); + // 返回给定条件的所有ResolveInfo对象(本质上是Activity) + List list = context.getPackageManager().queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY); + int bestMatch = 0; + final int size = list.size(); + ComponentName[] set = new ComponentName[size]; + for (int i = 0; i < size; i++) { + ResolveInfo ri = list.get(i); + set[i] = new ComponentName(ri.activityInfo.packageName, ri.activityInfo.name); + if (ri.match > bestMatch) { + bestMatch = ri.match; + } + } + ComponentName preActivity = new ComponentName(defPackageName, defClassName); + context.getPackageManager().addPreferredActivity(filter, bestMatch, set, preActivity); + } + } catch (java.lang.SecurityException e) { + e.printStackTrace(); + Log.e(TAG, "setDefaultLauncher: " + e.getMessage()); + } + } + + + public static void setRoleHolderAsUser(Context context, String packageName) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + String roleName = "android.app.role.HOME"; + boolean add = true; + int flags = 0; + UserHandle user = android.os.Process.myUserHandle(); + Log.i("settingssssssstemf", (add ? "Adding" : "Removing") + " package as role holder, role: " + + roleName + ", package: " + packageName); +// if (JGYUtils.getInstance().checkAppPlatform() != JGYUtils.MTKPlatform) { + RoleManager roleManager = context.getSystemService(RoleManager.class); + Executor executor = context.getMainExecutor(); + Consumer callback = successful -> { + if (successful) { + Log.d("settingssssssstemf", "Package " + (add ? "added" : "removed") + + " as role holder, role: " + roleName + ", package: " + packageName); + } else { + Log.d("settingssssssstemf", "Failed to " + (add ? "add" : "remove") + + " package as role holder, role: " + roleName + ", package: " + + packageName); + } + }; + roleManager.addRoleHolderAsUser(roleName, packageName, flags, user, executor, callback); + Log.i("settingssssssstemf", "addRoleHolderAsUser done"); +// } + } + } + + +} diff --git a/app/src/main/java/com/uiui/aios/utils/WakeUpUtils.java b/app/src/main/java/com/uiuios/aios/utils/WakeUpUtils.java similarity index 99% rename from app/src/main/java/com/uiui/aios/utils/WakeUpUtils.java rename to app/src/main/java/com/uiuios/aios/utils/WakeUpUtils.java index fb35a7b..9196f94 100644 --- a/app/src/main/java/com/uiui/aios/utils/WakeUpUtils.java +++ b/app/src/main/java/com/uiuios/aios/utils/WakeUpUtils.java @@ -1,4 +1,4 @@ -package com.uiui.aios.utils; +package com.uiuios.aios.utils; import android.annotation.SuppressLint; import android.app.Activity; diff --git a/app/src/main/java/com/uiui/aios/view/CustomContent.java b/app/src/main/java/com/uiuios/aios/view/CustomContent.java similarity index 98% rename from app/src/main/java/com/uiui/aios/view/CustomContent.java rename to app/src/main/java/com/uiuios/aios/view/CustomContent.java index 4737752..e42221f 100644 --- a/app/src/main/java/com/uiui/aios/view/CustomContent.java +++ b/app/src/main/java/com/uiuios/aios/view/CustomContent.java @@ -1,4 +1,4 @@ -package com.uiui.aios.view; +package com.uiuios.aios.view; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/uiui/aios/view/CustomContentCallbacks.java b/app/src/main/java/com/uiuios/aios/view/CustomContentCallbacks.java similarity index 95% rename from app/src/main/java/com/uiui/aios/view/CustomContentCallbacks.java rename to app/src/main/java/com/uiuios/aios/view/CustomContentCallbacks.java index dafaef8..60428fb 100644 --- a/app/src/main/java/com/uiui/aios/view/CustomContentCallbacks.java +++ b/app/src/main/java/com/uiuios/aios/view/CustomContentCallbacks.java @@ -1,4 +1,4 @@ -package com.uiui.aios.view; +package com.uiuios.aios.view; // add by codemx.cn ---- 20190712 ---plus- start diff --git a/app/src/main/java/com/uiui/aios/view/HorizontalItemDecoration.java b/app/src/main/java/com/uiuios/aios/view/HorizontalItemDecoration.java similarity index 97% rename from app/src/main/java/com/uiui/aios/view/HorizontalItemDecoration.java rename to app/src/main/java/com/uiuios/aios/view/HorizontalItemDecoration.java index afd8b97..bf49ee7 100644 --- a/app/src/main/java/com/uiui/aios/view/HorizontalItemDecoration.java +++ b/app/src/main/java/com/uiuios/aios/view/HorizontalItemDecoration.java @@ -1,4 +1,4 @@ -package com.uiui.aios.view; +package com.uiuios.aios.view; import android.content.Context; import android.graphics.Rect; diff --git a/app/src/main/java/com/uiui/aios/view/JzvdStdAssert.java b/app/src/main/java/com/uiuios/aios/view/JzvdStdAssert.java similarity index 98% rename from app/src/main/java/com/uiui/aios/view/JzvdStdAssert.java rename to app/src/main/java/com/uiuios/aios/view/JzvdStdAssert.java index fdf4462..21863b1 100644 --- a/app/src/main/java/com/uiui/aios/view/JzvdStdAssert.java +++ b/app/src/main/java/com/uiuios/aios/view/JzvdStdAssert.java @@ -1,4 +1,4 @@ -package com.uiui.aios.view; +package com.uiuios.aios.view; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/uiui/aios/view/JzvdStdRound.java b/app/src/main/java/com/uiuios/aios/view/JzvdStdRound.java similarity index 98% rename from app/src/main/java/com/uiui/aios/view/JzvdStdRound.java rename to app/src/main/java/com/uiuios/aios/view/JzvdStdRound.java index b16208b..0989dc4 100644 --- a/app/src/main/java/com/uiui/aios/view/JzvdStdRound.java +++ b/app/src/main/java/com/uiuios/aios/view/JzvdStdRound.java @@ -1,4 +1,4 @@ -package com.uiui.aios.view; +package com.uiuios.aios.view; import android.content.Context; import android.content.res.TypedArray; @@ -9,7 +9,7 @@ import android.graphics.Path; import android.graphics.RectF; import android.util.AttributeSet; -import com.uiui.aios.R; +import com.uiuios.aios.R; import cn.jzvd.JzvdStd; diff --git a/app/src/main/java/com/uiui/aios/view/MyGridLayout.java b/app/src/main/java/com/uiuios/aios/view/MyGridLayout.java similarity index 95% rename from app/src/main/java/com/uiui/aios/view/MyGridLayout.java rename to app/src/main/java/com/uiuios/aios/view/MyGridLayout.java index bff1a0d..4afe95a 100644 --- a/app/src/main/java/com/uiui/aios/view/MyGridLayout.java +++ b/app/src/main/java/com/uiuios/aios/view/MyGridLayout.java @@ -1,4 +1,4 @@ -package com.uiui.aios.view; +package com.uiuios.aios.view; import android.annotation.SuppressLint; import android.content.Context; @@ -8,8 +8,8 @@ import android.view.View; import android.view.ViewGroup; -import com.uiui.aios.R; -import com.uiui.aios.bean.DesktopIcon; +import com.uiuios.aios.R; +import com.uiuios.aios.bean.DesktopIcon; import java.util.ArrayList; @@ -22,7 +22,7 @@ import static android.view.View.MeasureSpec.makeMeasureSpec; * @author zihao */ public class MyGridLayout extends ViewGroup { - int margin = 2;// 每个格子的水平和垂直间隔 + int margin = 0;// 每个格子的水平和垂直间隔 int colums = 4;//列数 int rows = 3;//行数 int count = 0; @@ -36,7 +36,7 @@ public class MyGridLayout extends ViewGroup { if (attrs != null) { TypedArray a = getContext().obtainStyledAttributes(attrs, R.styleable.MyGridLayout); - margin = a.getInteger(R.styleable.MyGridLayout_itemMargin, 2); +// margin = a.getInteger(R.styleable.MyGridLayout_itemMargin, 2); colums = a.getInteger(R.styleable.MyGridLayout_numColumns, 4); rows = a.getInteger(R.styleable.MyGridLayout_numRows, 3); } diff --git a/app/src/main/java/com/uiui/aios/view/MyJzvdStdNoTitleNoClarity.java b/app/src/main/java/com/uiuios/aios/view/MyJzvdStdNoTitleNoClarity.java similarity index 88% rename from app/src/main/java/com/uiui/aios/view/MyJzvdStdNoTitleNoClarity.java rename to app/src/main/java/com/uiuios/aios/view/MyJzvdStdNoTitleNoClarity.java index 381dd75..5f959bb 100644 --- a/app/src/main/java/com/uiui/aios/view/MyJzvdStdNoTitleNoClarity.java +++ b/app/src/main/java/com/uiuios/aios/view/MyJzvdStdNoTitleNoClarity.java @@ -1,9 +1,9 @@ -package com.uiui.aios.view; +package com.uiuios.aios.view; import android.content.Context; import android.util.AttributeSet; -import com.uiui.aios.R; +import com.uiuios.aios.R; import cn.jzvd.JzvdStd; diff --git a/app/src/main/java/com/uiui/aios/view/RecyclerItemDecoration.java b/app/src/main/java/com/uiuios/aios/view/RecyclerItemDecoration.java similarity index 97% rename from app/src/main/java/com/uiui/aios/view/RecyclerItemDecoration.java rename to app/src/main/java/com/uiuios/aios/view/RecyclerItemDecoration.java index 4efb0c2..7718e45 100644 --- a/app/src/main/java/com/uiui/aios/view/RecyclerItemDecoration.java +++ b/app/src/main/java/com/uiuios/aios/view/RecyclerItemDecoration.java @@ -1,4 +1,4 @@ -package com.uiui.aios.view; +package com.uiuios.aios.view; import android.graphics.Rect; import android.view.View; diff --git a/app/src/main/java/com/uiui/aios/view/RecyclerViewSpacesItemDecoration.java b/app/src/main/java/com/uiuios/aios/view/RecyclerViewSpacesItemDecoration.java similarity index 97% rename from app/src/main/java/com/uiui/aios/view/RecyclerViewSpacesItemDecoration.java rename to app/src/main/java/com/uiuios/aios/view/RecyclerViewSpacesItemDecoration.java index ed8f17d..db8813d 100644 --- a/app/src/main/java/com/uiui/aios/view/RecyclerViewSpacesItemDecoration.java +++ b/app/src/main/java/com/uiuios/aios/view/RecyclerViewSpacesItemDecoration.java @@ -1,4 +1,4 @@ -package com.uiui.aios.view; +package com.uiuios.aios.view; import android.graphics.Rect; import android.view.View; diff --git a/app/src/main/java/com/uiui/aios/view/ScaleCircleNavigator.java b/app/src/main/java/com/uiuios/aios/view/ScaleCircleNavigator.java similarity index 99% rename from app/src/main/java/com/uiui/aios/view/ScaleCircleNavigator.java rename to app/src/main/java/com/uiuios/aios/view/ScaleCircleNavigator.java index 0eb58d5..eb90d77 100644 --- a/app/src/main/java/com/uiui/aios/view/ScaleCircleNavigator.java +++ b/app/src/main/java/com/uiuios/aios/view/ScaleCircleNavigator.java @@ -1,4 +1,4 @@ -package com.uiui.aios.view; +package com.uiuios.aios.view; import android.content.Context; import android.graphics.Canvas; diff --git a/app/src/main/res/drawable-hdpi/app_exit.jpg b/app/src/main/res/drawable-hdpi/app_exit.jpg new file mode 100644 index 0000000000000000000000000000000000000000..774942ffae7a87d0222fc6a3591deb525baadcf6 GIT binary patch literal 1611 zcmbW%do8}!w_&J5`mCSvt)e$fkmpU-(ZhYr3In& zB5~%Y((^F-+l94i9<5Ub7QxI!IS8+=u~w5{XhbBDEjMnm+HAeWVF$&L>g4R=>E-RS z%hzxB{*VI)Ll4mzQPDBSV&jg-C!J1CIdk?LJL6Jj7U%MntJm^x-7etr_=R^$O3TVC zDjz(odRkZC@T~E9Q*+y!_Kwc3?zcVf2L^{E!y_Ml8J+$(GduTbe&O@tstW|*UsCB9{||1^8QTO;*mT#Z-j?SRsfE}jz6udf@T%}r^fs@>T`lFEC#*WPewbFEiGsz0^AR~ouR9D`-%@UP*L9xPEO|uW zRx8pjj)=1jn5A3QHrL9FIoqIGTSr;qCGwN<}_Rd2mTIg;?VGq5=RwMfjC*x>#S}V9Rm0p{1bNzl+n4rj3E?F~D zzcA`rZ!zP-_-{5P8N8I#fEeSxK+56fl2D`9(RU#SfU4UOCL$L5+MG^V7uoBbtYs%Z zPceECuDBe*&uA7pwv1q^8OE;sUz0RGLUX7B4uP}j{4?*Wb{~$gCj~pi8QuBaF>#P! z>D(B5TAN?dE=NmFJEGRpwQ-Oj1uh<&e13;JXY*2gEl0a))|ySsuX0a=NaG^kr0#)? zE935TR^&nF%CzEmcIC1tK?-c6O8lZd=vq`&AE@<`Yx|p(-Wn;8Q&XVx?y?k^>6$HS zCNYZ}Sj?K4nn&#`eSbD9zc#Cgl7OVKEGckfd6@TULJBO+Et79_^mau&jy374zEh23 zrrS_qjGGR+O8Do)p4<)g-Py?FBV{C?8kTx>G`=P;i_5bF84>* znBV-&6+EC(a2R4f8z9liP6Nk%^%R5?c5RRAV|td%TeUnoliLfk_ndT#$B&c5+Ea?R z_$99K$nr}6+(*>=_X66Y$HK`CriWh}xY*i8`J~Ss$5VU?e7o*xQNlvIRzT@nU32`G G&+2yy&%bB@ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/actions_item_selector.xml b/app/src/main/res/drawable/actions_item_selector.xml index df26a4a..9b13a1b 100644 --- a/app/src/main/res/drawable/actions_item_selector.xml +++ b/app/src/main/res/drawable/actions_item_selector.xml @@ -5,7 +5,7 @@ - + diff --git a/app/src/main/res/drawable/custom_bg_white.xml b/app/src/main/res/drawable/custom_bg_white.xml new file mode 100644 index 0000000..82577af --- /dev/null +++ b/app/src/main/res/drawable/custom_bg_white.xml @@ -0,0 +1,13 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/et_bg.xml b/app/src/main/res/drawable/et_bg.xml new file mode 100644 index 0000000..5514a47 --- /dev/null +++ b/app/src/main/res/drawable/et_bg.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/joined_background.xml b/app/src/main/res/drawable/joined_background.xml index b025032..184e579 100644 --- a/app/src/main/res/drawable/joined_background.xml +++ b/app/src/main/res/drawable/joined_background.xml @@ -3,7 +3,7 @@ - + + + + \ No newline at end of file diff --git a/app/src/main/res/layout-land/fragment_custom.xml b/app/src/main/res/layout-land/fragment_custom.xml index 6bf77c8..8e67606 100644 --- a/app/src/main/res/layout-land/fragment_custom.xml +++ b/app/src/main/res/layout-land/fragment_custom.xml @@ -1,5 +1,5 @@ - + android:background="@drawable/custom_bg_white"> + android:background="@drawable/custom_bg_white"> + + + + + + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout-land/fragment_custom_back.xml b/app/src/main/res/layout-land/fragment_custom_back.xml index fd9325d..b989012 100644 --- a/app/src/main/res/layout-land/fragment_custom_back.xml +++ b/app/src/main/res/layout-land/fragment_custom_back.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout-port/fragment_custom.xml b/app/src/main/res/layout-port/fragment_custom.xml index a535d1c..2daeb53 100644 --- a/app/src/main/res/layout-port/fragment_custom.xml +++ b/app/src/main/res/layout-port/fragment_custom.xml @@ -1,5 +1,5 @@ - + android:background="@drawable/custom_bg_white"> @@ -235,7 +235,7 @@ android:layout_marginEnd="@dimen/dp_4" android:layout_marginBottom="@dimen/dp_2" android:layout_weight="1" - android:background="@drawable/custom_bg_clean" + android:background="@drawable/custom_bg_white" tools:ignore="NestedWeights"> @@ -282,7 +282,7 @@ android:layout_marginEnd="@dimen/dp_8" app:cpvDuration="1000" app:cpvLabelTextSize="26sp" - app:cpvLabelTextColor="@color/white" + app:cpvLabelTextColor="@color/black" app:cpvProgressColor="#27602f" app:cpvNormalColor="#c1d4c4" app:cpvShowTick="false" @@ -407,7 +407,7 @@ android:layout_marginEnd="@dimen/dp_2" android:layout_marginBottom="@dimen/dp_4" android:layout_weight="1" - android:background="@drawable/custom_bg_contact"> + android:background="@drawable/custom_bg_white"> + android:background="@drawable/custom_bg_health"> + + + + + + + + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 812bc15..9738844 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -4,6 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@drawable/main_bg" tools:context=".activity.main.MainActivity"> - diff --git a/app/src/main/res/layout/fragment_applist.xml b/app/src/main/res/layout/fragment_applist.xml index cbb612c..458cfdd 100644 --- a/app/src/main/res/layout/fragment_applist.xml +++ b/app/src/main/res/layout/fragment_applist.xml @@ -6,11 +6,10 @@ android:layout_height="match_parent" tools:context=".fragment.AppListFragment"> - + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 100d2b3..b26396a 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -15,7 +15,7 @@ #0480FF #4D4B50 #FF0000 - #424144 + #4f1fdb #8e6afb #00D56B @@ -28,5 +28,6 @@ #2c77ba #f4bea3 + #5d55b2 diff --git a/app/src/test/java/com/uiui/aios/ExampleUnitTest.java b/app/src/test/java/com/uiuios/aios/ExampleUnitTest.java similarity index 93% rename from app/src/test/java/com/uiui/aios/ExampleUnitTest.java rename to app/src/test/java/com/uiuios/aios/ExampleUnitTest.java index ec22a89..65cb693 100644 --- a/app/src/test/java/com/uiui/aios/ExampleUnitTest.java +++ b/app/src/test/java/com/uiuios/aios/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package com.uiui.aios; +package com.uiuios.aios; import org.junit.Test; diff --git a/app/tpns-configs.json b/app/tpns-configs.json index b27cd81..04d6828 100644 --- a/app/tpns-configs.json +++ b/app/tpns-configs.json @@ -1,9 +1,9 @@ { "tpns": { - "access_id": "1500030457", - "access_key": "AZZXANJF4HBD" + "access_id": "1580013523", + "access_key": "ASJ3MCYWCTTF" }, - "com.uiui.aios": { + "com.uiuios.aios": { "channel": { "enable": true }