From 79ea4abb188663c1c75e6332394e522152156754 Mon Sep 17 00:00:00 2001 From: FHT <981964879@qq.com> Date: Wed, 14 Apr 2021 10:42:08 +0800 Subject: [PATCH] =?UTF-8?q?version:2.0.3.6=20update:=20fix:=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=A1=8C=E9=9D=A2=E5=9B=BE=E6=A0=87=E4=B8=A2=E5=A4=B1?= =?UTF-8?q?=EF=BC=8C=E5=AE=89=E8=A3=85=E4=BC=9A=E5=87=BA=E7=8E=B0=E6=95=99?= =?UTF-8?q?=E5=AE=98=E5=A3=B9=E4=B8=A4=E4=B8=AA=E5=9B=BE=E6=A0=87=20add:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 +- app/src/main/AndroidManifest.xml | 32 ++-- .../myappstore}/KeepAliveConnection.aidl | 2 +- .../jiaoguanyi/appstore/base/BaseView.java | 4 - .../myappstore/activity/HomeActivity.java} | 23 +-- .../myappstore}/activity/MainActivity.java | 22 +-- .../myappstore}/activity/MainContact.java | 6 +- .../myappstore}/activity/MainPresenter.java | 61 ++++--- .../myappstore}/activity/OldActivity.java | 97 ++++------ .../myappstore}/activity/TopActivity.java | 4 +- .../myappstore}/base/BaseActivity.java | 2 +- .../myappstore}/base/BaseApplication.java | 168 ++++++++---------- .../myappstore}/base/BasePresenter.java | 2 +- .../com/mjsheng/myappstore/base/BaseView.java | 4 + .../myappstore}/bean/AppData.java | 8 +- .../myappstore}/bean/AppDateInfo.java | 2 +- .../myappstore}/bean/AppDownloadInfo.java | 2 +- .../myappstore}/bean/AppInfo.java | 2 +- .../myappstore}/bean/AppInfoBean.java | 2 +- .../myappstore}/bean/AppUpdateInfo.java | 2 +- .../myappstore}/bean/Appground.java | 2 +- .../myappstore}/bean/BaseResponse.java | 2 +- .../myappstore}/bean/Batch.java | 2 +- .../myappstore}/bean/BrowserBookmarks.java | 2 +- .../myappstore}/bean/BrowserData.java | 2 +- .../myappstore}/bean/CategoryInfo.java | 2 +- .../myappstore}/bean/CategoryPicBean.java | 2 +- .../myappstore}/bean/CommonPicBean.java | 2 +- .../myappstore}/bean/CommonPicData.java | 2 +- .../myappstore}/bean/Convert.java | 2 +- .../myappstore}/bean/Desktop.java | 2 +- .../myappstore}/bean/Expansions.java | 2 +- .../myappstore}/bean/FileData.java | 2 +- .../myappstore}/bean/ForceDownloadBean.java | 2 +- .../myappstore}/bean/ForceDownloadData.java | 2 +- .../myappstore}/bean/JsonCallback.java | 2 +- .../myappstore}/bean/LocalAppInfo.java | 2 +- .../myappstore}/bean/LogoImg.java | 2 +- .../myappstore}/bean/LzyResponse.java | 2 +- .../myappstore}/bean/NetAndLaunchBean.java | 2 +- .../myappstore}/bean/NetAndLaunchData.java | 2 +- .../myappstore}/bean/NewAppground.java | 2 +- .../myappstore}/bean/ProjectDateInfo.java | 2 +- .../myappstore}/bean/ProjectPicBean.java | 2 +- .../myappstore}/bean/SearchBean.java | 2 +- .../myappstore}/bean/SimpleResponse.java | 2 +- .../myappstore}/bean/SplitApks.java | 2 +- .../myappstore}/bean/StudentsInfo.java | 2 +- .../myappstore}/bean/SystemSetBean.java | 2 +- .../myappstore}/bean/SystemSettingBean.java | 2 +- .../myappstore}/bean/SystemSettingData.java | 2 +- .../myappstore}/bean/TimeControl.java | 2 +- .../myappstore}/bean/UploadAppInfo.java | 2 +- .../myappstore}/bean/UserInfo.java | 2 +- .../myappstore}/comm/CommonDatas.java | 2 +- .../myappstore}/database/DBHelper.java | 2 +- .../myappstore}/database/DBSqlBuilder.java | 2 +- .../myappstore}/jpush/ExampleUtil.java | 2 +- .../jpush/LocalBroadcastManager.java | 2 +- .../myappstore}/jpush/Logger.java | 2 +- .../jpush/MyJPushMessageReceiver.java | 4 +- .../myappstore}/jpush/MyReceiver.java | 4 +- .../myappstore}/jpush/PushService.java | 2 +- .../jpush/TagAliasOperatorHelper.java | 2 +- .../jpush/invalid/ExampleApplication.java | 4 +- .../jpush/invalid/MainActivity.java | 2 +- .../jpush/invalid/PushSetActivity.java | 2 +- .../jpush/invalid/SettingActivity.java | 2 +- .../jpush/invalid/TestActivity.java | 2 +- .../myappstore}/log/LogReceiver.java | 2 +- .../myappstore}/log/ReceiverHandler.java | 2 +- .../myappstore}/manager/AmapManager.java | 4 +- .../myappstore}/manager/FileManager.java | 2 +- .../manager/NetInterfaceManager.java | 85 +++++---- .../myappstore}/network/HTTPInterface.java | 42 ++--- .../myappstore}/network/URLAddress.java | 4 +- .../myappstore}/network/api/AppLimitApi.java | 2 +- .../myappstore}/network/api/BrankPicApi.java | 4 +- .../network/api/CategoryPicApi.java | 4 +- .../network/api/DeselectBrowserIDApi.java | 2 +- .../network/api/DeselectIDApi.java | 2 +- .../network/api/ForceDownloadApi.java | 4 +- .../network/api/NetAndLaunchApi.java | 4 +- .../network/api/ProjectPicApi.java | 4 +- .../myappstore}/network/api/RankAppApi.java | 4 +- .../network/api/SystemSettingApi.java | 2 +- .../myappstore}/network/api/UpdateApi.java | 2 +- .../network/api/UploadAppInfoApi.java | 2 +- .../network/api/newapi/AppinsideWebApi.java | 8 +- .../api/newapi/BrowserBookmarksApi.java | 8 +- .../network/api/newapi/BrowserListApi.java | 8 +- .../api/newapi/CheckTestUpdateApi.java | 6 +- .../network/api/newapi/CheckUpdateApi.java | 6 +- .../network/api/newapi/DesktopIconApi.java | 6 +- .../api/newapi/DevicesLockedStateApi.java | 6 +- .../network/api/newapi/GetBatchApi.java | 2 +- .../network/api/newapi/GetDesktopApi.java | 4 +- .../network/api/newapi/GetLockStateApi.java | 2 +- .../network/api/newapi/JpushTagsApi.java | 6 +- .../network/api/newapi/LogoImgApi.java | 8 +- .../network/api/newapi/MACAddressApi.java | 6 +- .../api/newapi/NewAppinsideWebApi.java | 8 +- .../api/newapi/ScreenLockStateApi.java | 6 +- .../network/api/newapi/SnTimeControl.java | 6 +- .../network/api/newapi/StudentsInfosApi.java | 8 +- .../network/api/newapi/TopAppControlApi.java | 6 +- .../api/newapi/UpdateDeviceInfoApi.java | 2 +- .../myappstore}/receiver/BootReceiver.java | 18 +- .../myappstore}/receiver/MyJPushReceiver.java | 65 ++----- .../myappstore}/receiver/NewAppReceiver.java | 14 +- .../myappstore}/server/GuardService.java | 24 +-- .../myappstore}/server/InitJpushServer.java | 99 ++++------- .../myappstore}/server/JWebSocketClient.java | 2 +- .../myappstore}/server/MainService.java | 23 ++- .../myappstore}/server/MyDownloadService.java | 2 +- .../myappstore}/server/StepService.java | 10 +- .../statistics/AppInformation.java | 2 +- .../statistics/StatisticsInfo.java | 4 +- .../myappstore}/utils/ApkUtils.java | 21 +-- .../myappstore}/utils/AppsManagerUtils.java | 6 +- .../myappstore}/utils/BootUtils.java | 2 +- .../myappstore}/utils/CmdUtil.java | 2 +- .../myappstore}/utils/ExampleUtil.java | 2 +- .../myappstore}/utils/FileUtils.java | 2 +- .../myappstore}/utils/ForegroundAppUtil.java | 2 +- .../utils/InstallResultReceiver.java | 2 +- .../myappstore}/utils/JGYUtils.java | 54 +++--- .../myappstore}/utils/JsonUtils.java | 2 +- .../myappstore}/utils/Logger.java | 4 +- .../myappstore}/utils/MySQLData.java | 8 +- .../myappstore}/utils/NetworkUtils.java | 2 +- .../myappstore}/utils/SPUtils.java | 4 +- .../myappstore}/utils/SaveListUtils.java | 4 +- .../myappstore}/utils/ServiceAliveUtils.java | 2 +- .../utils/SpacesItemDecoration.java | 2 +- .../myappstore}/utils/SysSettingUtils.java | 4 +- .../myappstore}/utils/SystemUtils.java | 2 +- .../myappstore}/utils/TimeUtils.java | 4 +- .../myappstore}/utils/ToastUtil.java | 4 +- .../myappstore}/utils/URLUtils.java | 5 +- .../myappstore}/utils/Utils.java | 10 +- .../myappstore}/utils/XAPKUtils.java | 6 +- .../main/res/layout-land/activity_home.xml | 2 +- app/src/main/res/layout-land/activity_top.xml | 2 +- .../main/res/layout-port/activity_home.xml | 2 +- app/src/main/res/layout-port/activity_top.xml | 2 +- 146 files changed, 580 insertions(+), 689 deletions(-) rename app/src/main/aidl/com/{jiaoguanyi/appstore => mjsheng/myappstore}/KeepAliveConnection.aidl (79%) delete mode 100644 app/src/main/java/com/jiaoguanyi/appstore/base/BaseView.java rename app/src/main/java/com/{jiaoguanyi/appstore/activity/SplashActivity.java => mjsheng/myappstore/activity/HomeActivity.java} (91%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/activity/MainActivity.java (96%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/activity/MainContact.java (97%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/activity/MainPresenter.java (96%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/activity/OldActivity.java (96%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/activity/TopActivity.java (90%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/base/BaseActivity.java (94%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/base/BaseApplication.java (86%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/base/BasePresenter.java (80%) create mode 100644 app/src/main/java/com/mjsheng/myappstore/base/BaseView.java rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/bean/AppData.java (99%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/bean/AppDateInfo.java (98%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/bean/AppDownloadInfo.java (98%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/bean/AppInfo.java (98%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/bean/AppInfoBean.java (94%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/bean/AppUpdateInfo.java (94%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/bean/Appground.java (94%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/bean/BaseResponse.java (91%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/bean/Batch.java (93%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/bean/BrowserBookmarks.java (93%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/bean/BrowserData.java (92%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/bean/CategoryInfo.java (95%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/bean/CategoryPicBean.java (95%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/bean/CommonPicBean.java (97%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/bean/CommonPicData.java (97%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/bean/Convert.java (97%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/bean/Desktop.java (96%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/bean/Expansions.java (95%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/bean/FileData.java (93%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/bean/ForceDownloadBean.java (96%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/bean/ForceDownloadData.java (96%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/bean/JsonCallback.java (99%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/bean/LocalAppInfo.java (98%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/bean/LogoImg.java (94%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/bean/LzyResponse.java (85%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/bean/NetAndLaunchBean.java (96%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/bean/NetAndLaunchData.java (97%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/bean/NewAppground.java (94%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/bean/ProjectDateInfo.java (97%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/bean/ProjectPicBean.java (95%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/bean/SearchBean.java (90%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/bean/SimpleResponse.java (91%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/bean/SplitApks.java (90%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/bean/StudentsInfo.java (96%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/bean/SystemSetBean.java (90%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/bean/SystemSettingBean.java (96%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/bean/SystemSettingData.java (98%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/bean/TimeControl.java (92%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/bean/UploadAppInfo.java (97%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/bean/UserInfo.java (98%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/comm/CommonDatas.java (92%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/database/DBHelper.java (99%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/database/DBSqlBuilder.java (98%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/jpush/ExampleUtil.java (99%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/jpush/LocalBroadcastManager.java (99%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/jpush/Logger.java (95%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/jpush/MyJPushMessageReceiver.java (94%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/jpush/MyReceiver.java (98%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/jpush/PushService.java (72%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/jpush/TagAliasOperatorHelper.java (99%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/jpush/invalid/ExampleApplication.java (87%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/jpush/invalid/MainActivity.java (99%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/jpush/invalid/PushSetActivity.java (99%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/jpush/invalid/SettingActivity.java (99%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/jpush/invalid/TestActivity.java (95%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/log/LogReceiver.java (98%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/log/ReceiverHandler.java (99%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/manager/AmapManager.java (97%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/manager/FileManager.java (96%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/manager/NetInterfaceManager.java (82%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/network/HTTPInterface.java (97%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/network/URLAddress.java (96%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/network/api/AppLimitApi.java (91%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/network/api/BrankPicApi.java (82%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/network/api/CategoryPicApi.java (82%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/network/api/DeselectBrowserIDApi.java (91%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/network/api/DeselectIDApi.java (91%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/network/api/ForceDownloadApi.java (81%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/network/api/NetAndLaunchApi.java (81%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/network/api/ProjectPicApi.java (83%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/network/api/RankAppApi.java (81%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/network/api/SystemSettingApi.java (91%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/network/api/UpdateApi.java (91%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/network/api/UploadAppInfoApi.java (91%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/network/api/newapi/AppinsideWebApi.java (66%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/network/api/newapi/BrowserBookmarksApi.java (64%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/network/api/newapi/BrowserListApi.java (64%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/network/api/newapi/CheckTestUpdateApi.java (62%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/network/api/newapi/CheckUpdateApi.java (67%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/network/api/newapi/DesktopIconApi.java (69%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/network/api/newapi/DevicesLockedStateApi.java (67%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/network/api/newapi/GetBatchApi.java (85%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/network/api/newapi/GetDesktopApi.java (72%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/network/api/newapi/GetLockStateApi.java (89%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/network/api/newapi/JpushTagsApi.java (61%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/network/api/newapi/LogoImgApi.java (55%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/network/api/newapi/MACAddressApi.java (78%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/network/api/newapi/NewAppinsideWebApi.java (66%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/network/api/newapi/ScreenLockStateApi.java (63%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/network/api/newapi/SnTimeControl.java (62%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/network/api/newapi/StudentsInfosApi.java (61%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/network/api/newapi/TopAppControlApi.java (62%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/network/api/newapi/UpdateDeviceInfoApi.java (90%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/receiver/BootReceiver.java (83%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/receiver/MyJPushReceiver.java (96%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/receiver/NewAppReceiver.java (91%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/server/GuardService.java (96%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/server/InitJpushServer.java (95%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/server/JWebSocketClient.java (95%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/server/MainService.java (95%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/server/MyDownloadService.java (99%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/server/StepService.java (96%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/statistics/AppInformation.java (98%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/statistics/StatisticsInfo.java (98%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/utils/ApkUtils.java (98%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/utils/AppsManagerUtils.java (97%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/utils/BootUtils.java (63%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/utils/CmdUtil.java (98%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/utils/ExampleUtil.java (99%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/utils/FileUtils.java (88%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/utils/ForegroundAppUtil.java (99%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/utils/InstallResultReceiver.java (98%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/utils/JGYUtils.java (95%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/utils/JsonUtils.java (96%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/utils/Logger.java (90%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/utils/MySQLData.java (97%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/utils/NetworkUtils.java (96%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/utils/SPUtils.java (98%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/utils/SaveListUtils.java (97%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/utils/ServiceAliveUtils.java (95%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/utils/SpacesItemDecoration.java (96%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/utils/SysSettingUtils.java (99%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/utils/SystemUtils.java (94%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/utils/TimeUtils.java (98%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/utils/ToastUtil.java (97%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/utils/URLUtils.java (98%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/utils/Utils.java (99%) rename app/src/main/java/com/{jiaoguanyi/appstore => mjsheng/myappstore}/utils/XAPKUtils.java (99%) diff --git a/app/build.gradle b/app/build.gradle index fb218f3..1eb79e7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -50,8 +50,8 @@ android { productFlavors { official { flavorDimensions "default" - versionCode 1035 - versionName "2.0.3.5" + versionCode 1036 + versionName "2.0.3.6" /*********************************极光推送************************************/ manifestPlaceholders = [ JPUSH_PKGNAME: "com.jiaoguanyi.appstore", diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 780c00e..ceadb6f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ @@ -82,7 +82,7 @@ - - + + @@ -101,7 +101,7 @@ @@ -111,16 +111,16 @@ - + @@ -139,7 +139,7 @@ @@ -152,11 +152,11 @@ @@ -198,7 +198,7 @@ @@ -339,7 +339,7 @@ @@ -347,7 +347,7 @@ @@ -365,7 +365,7 @@ - + diff --git a/app/src/main/aidl/com/jiaoguanyi/appstore/KeepAliveConnection.aidl b/app/src/main/aidl/com/mjsheng/myappstore/KeepAliveConnection.aidl similarity index 79% rename from app/src/main/aidl/com/jiaoguanyi/appstore/KeepAliveConnection.aidl rename to app/src/main/aidl/com/mjsheng/myappstore/KeepAliveConnection.aidl index 52cc242..b9a3571 100644 --- a/app/src/main/aidl/com/jiaoguanyi/appstore/KeepAliveConnection.aidl +++ b/app/src/main/aidl/com/mjsheng/myappstore/KeepAliveConnection.aidl @@ -1,5 +1,5 @@ // KeepAliveConnection.aidl -package com.jiaoguanyi.appstore; +package com.mjsheng.myappstore; // Declare any non-default types here with import statements diff --git a/app/src/main/java/com/jiaoguanyi/appstore/base/BaseView.java b/app/src/main/java/com/jiaoguanyi/appstore/base/BaseView.java deleted file mode 100644 index df9a404..0000000 --- a/app/src/main/java/com/jiaoguanyi/appstore/base/BaseView.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.jiaoguanyi.appstore.base; - -public interface BaseView { -} diff --git a/app/src/main/java/com/jiaoguanyi/appstore/activity/SplashActivity.java b/app/src/main/java/com/mjsheng/myappstore/activity/HomeActivity.java similarity index 91% rename from app/src/main/java/com/jiaoguanyi/appstore/activity/SplashActivity.java rename to app/src/main/java/com/mjsheng/myappstore/activity/HomeActivity.java index fa7faf1..0646728 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/activity/SplashActivity.java +++ b/app/src/main/java/com/mjsheng/myappstore/activity/HomeActivity.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.activity; +package com.mjsheng.myappstore.activity; import android.annotation.SuppressLint; import android.app.StatusBarManager; @@ -10,33 +10,22 @@ import android.os.Bundle; import android.os.Handler; import android.provider.Settings; import android.util.Log; -import android.webkit.WebSettings; import android.webkit.WebView; import android.webkit.WebViewClient; import androidx.appcompat.app.AppCompatActivity; -import com.jiaoguanyi.appstore.BuildConfig; -import com.jiaoguanyi.appstore.R; +import com.mjsheng.myappstore.BuildConfig; +import com.mjsheng.myappstore.R; import com.lzy.okgo.model.HttpHeaders; -import java.io.IOException; import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Method; -import java.net.URI; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import okhttp3.Call; -import okhttp3.Callback; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.Response; -public class SplashActivity extends AppCompatActivity { - private static String TAG = SplashActivity.class.getSimpleName(); +public class HomeActivity extends AppCompatActivity { + private static String TAG = HomeActivity.class.getSimpleName(); @Override protected void onCreate(Bundle savedInstanceState) { @@ -45,7 +34,7 @@ public class SplashActivity extends AppCompatActivity { new Handler().postDelayed(new Runnable() { @Override public void run() { - startActivity(new Intent(SplashActivity.this, MainActivity.class)); + startActivity(new Intent(HomeActivity.this, MainActivity.class)); finish(); } }, 2000); diff --git a/app/src/main/java/com/jiaoguanyi/appstore/activity/MainActivity.java b/app/src/main/java/com/mjsheng/myappstore/activity/MainActivity.java similarity index 96% rename from app/src/main/java/com/jiaoguanyi/appstore/activity/MainActivity.java rename to app/src/main/java/com/mjsheng/myappstore/activity/MainActivity.java index 3f0fc78..c99ea96 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/activity/MainActivity.java +++ b/app/src/main/java/com/mjsheng/myappstore/activity/MainActivity.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.activity; +package com.mjsheng.myappstore.activity; import android.app.AlertDialog; import android.content.BroadcastReceiver; @@ -17,16 +17,16 @@ import android.widget.TextView; import androidx.localbroadcastmanager.content.LocalBroadcastManager; import com.google.gson.JsonObject; -import com.jiaoguanyi.appstore.BuildConfig; -import com.jiaoguanyi.appstore.R; -import com.jiaoguanyi.appstore.base.BaseActivity; -import com.jiaoguanyi.appstore.utils.ApkUtils; -import com.jiaoguanyi.appstore.utils.ExampleUtil; -import com.jiaoguanyi.appstore.utils.JGYUtils; -import com.jiaoguanyi.appstore.utils.SaveListUtils; -import com.jiaoguanyi.appstore.utils.SysSettingUtils; -import com.jiaoguanyi.appstore.utils.ToastUtil; -import com.jiaoguanyi.appstore.utils.Utils; +import com.mjsheng.myappstore.BuildConfig; +import com.mjsheng.myappstore.R; +import com.mjsheng.myappstore.base.BaseActivity; +import com.mjsheng.myappstore.utils.ApkUtils; +import com.mjsheng.myappstore.utils.ExampleUtil; +import com.mjsheng.myappstore.utils.JGYUtils; +import com.mjsheng.myappstore.utils.SaveListUtils; +import com.mjsheng.myappstore.utils.SysSettingUtils; +import com.mjsheng.myappstore.utils.ToastUtil; +import com.mjsheng.myappstore.utils.Utils; import java.util.concurrent.TimeUnit; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/activity/MainContact.java b/app/src/main/java/com/mjsheng/myappstore/activity/MainContact.java similarity index 97% rename from app/src/main/java/com/jiaoguanyi/appstore/activity/MainContact.java rename to app/src/main/java/com/mjsheng/myappstore/activity/MainContact.java index 7fb5661..fc4700f 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/activity/MainContact.java +++ b/app/src/main/java/com/mjsheng/myappstore/activity/MainContact.java @@ -1,10 +1,10 @@ -package com.jiaoguanyi.appstore.activity; +package com.mjsheng.myappstore.activity; import android.view.View; import com.google.gson.JsonObject; -import com.jiaoguanyi.appstore.base.BasePresenter; -import com.jiaoguanyi.appstore.base.BaseView; +import com.mjsheng.myappstore.base.BasePresenter; +import com.mjsheng.myappstore.base.BaseView; public class MainContact { public interface MainView extends BaseView { diff --git a/app/src/main/java/com/jiaoguanyi/appstore/activity/MainPresenter.java b/app/src/main/java/com/mjsheng/myappstore/activity/MainPresenter.java similarity index 96% rename from app/src/main/java/com/jiaoguanyi/appstore/activity/MainPresenter.java rename to app/src/main/java/com/mjsheng/myappstore/activity/MainPresenter.java index 12a4960..2393cc9 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/activity/MainPresenter.java +++ b/app/src/main/java/com/mjsheng/myappstore/activity/MainPresenter.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.activity; +package com.mjsheng.myappstore.activity; import android.annotation.SuppressLint; import android.content.Context; @@ -18,33 +18,31 @@ import com.google.gson.Gson; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import com.jiaoguanyi.appstore.BuildConfig; -import com.jiaoguanyi.appstore.base.BaseApplication; -import com.jiaoguanyi.appstore.bean.Appground; -import com.jiaoguanyi.appstore.bean.BaseResponse; -import com.jiaoguanyi.appstore.bean.Batch; -import com.jiaoguanyi.appstore.bean.BrowserBookmarks; -import com.jiaoguanyi.appstore.bean.BrowserData; -import com.jiaoguanyi.appstore.bean.Desktop; -import com.jiaoguanyi.appstore.bean.ForceDownloadBean; -import com.jiaoguanyi.appstore.bean.LogoImg; -import com.jiaoguanyi.appstore.bean.NetAndLaunchBean; -import com.jiaoguanyi.appstore.bean.NewAppground; -import com.jiaoguanyi.appstore.bean.StudentsInfo; -import com.jiaoguanyi.appstore.jpush.TagAliasOperatorHelper; -import com.jiaoguanyi.appstore.manager.NetInterfaceManager; -import com.jiaoguanyi.appstore.network.api.newapi.UpdateDeviceInfoApi; -import com.jiaoguanyi.appstore.server.MainService; -import com.jiaoguanyi.appstore.utils.ApkUtils; -import com.jiaoguanyi.appstore.utils.JGYUtils; -import com.jiaoguanyi.appstore.utils.SPUtils; -import com.jiaoguanyi.appstore.utils.SysSettingUtils; -import com.jiaoguanyi.appstore.utils.TimeUtils; -import com.jiaoguanyi.appstore.utils.URLUtils; -import com.jiaoguanyi.appstore.utils.Utils; +import com.mjsheng.myappstore.BuildConfig; +import com.mjsheng.myappstore.base.BaseApplication; +import com.mjsheng.myappstore.bean.Appground; +import com.mjsheng.myappstore.bean.BaseResponse; +import com.mjsheng.myappstore.bean.Batch; +import com.mjsheng.myappstore.bean.BrowserBookmarks; +import com.mjsheng.myappstore.bean.BrowserData; +import com.mjsheng.myappstore.bean.ForceDownloadBean; +import com.mjsheng.myappstore.bean.LogoImg; +import com.mjsheng.myappstore.bean.NetAndLaunchBean; +import com.mjsheng.myappstore.bean.NewAppground; +import com.mjsheng.myappstore.bean.StudentsInfo; +import com.mjsheng.myappstore.jpush.TagAliasOperatorHelper; +import com.mjsheng.myappstore.manager.NetInterfaceManager; +import com.mjsheng.myappstore.network.api.newapi.UpdateDeviceInfoApi; +import com.mjsheng.myappstore.server.MainService; +import com.mjsheng.myappstore.utils.ApkUtils; +import com.mjsheng.myappstore.utils.JGYUtils; +import com.mjsheng.myappstore.utils.SPUtils; +import com.mjsheng.myappstore.utils.SysSettingUtils; +import com.mjsheng.myappstore.utils.TimeUtils; +import com.mjsheng.myappstore.utils.URLUtils; +import com.mjsheng.myappstore.utils.Utils; import java.io.IOException; -import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; import java.util.List; @@ -59,8 +57,8 @@ import io.reactivex.disposables.Disposable; import io.reactivex.schedulers.Schedulers; import okhttp3.ResponseBody; -import static com.jiaoguanyi.appstore.jpush.TagAliasOperatorHelper.ACTION_SET; -import static com.jiaoguanyi.appstore.jpush.TagAliasOperatorHelper.sequence; +import static com.mjsheng.myappstore.jpush.TagAliasOperatorHelper.ACTION_SET; +import static com.mjsheng.myappstore.jpush.TagAliasOperatorHelper.sequence; public class MainPresenter implements MainContact.Presenter { private static final String TAG = MainPresenter.class.getSimpleName(); @@ -621,10 +619,15 @@ public class MainPresenter implements MainContact.Presenter { int code = jsonObject.get("code").getAsInt(); if (code == 200) { String data = jsonObject.get("data").getAsJsonObject().get("result").getAsString(); - JGYUtils.getInstance().writeAppPackageList(mContext,data); + boolean write = Settings.System.putString(mContext.getContentResolver(), "only_jgy_shortcut_list", data); + Log.e(TAG, "onNext: only_jgy_shortcut_list: " + write); + //开机图标 + JGYUtils.getInstance().writeAppPackageList(mContext, data); mView.getAppLimitFinished(data); } else { mView.getAppLimitFinished(""); + boolean write = Settings.System.putString(mContext.getContentResolver(), "only_jgy_shortcut_list", ""); + Log.e(TAG, "onNext: only_jgy_shortcut_list: " + write); Log.e("getAppLimit", "onNext: " + bodyString); } } catch (IOException e) { diff --git a/app/src/main/java/com/jiaoguanyi/appstore/activity/OldActivity.java b/app/src/main/java/com/mjsheng/myappstore/activity/OldActivity.java similarity index 96% rename from app/src/main/java/com/jiaoguanyi/appstore/activity/OldActivity.java rename to app/src/main/java/com/mjsheng/myappstore/activity/OldActivity.java index 9881260..448725b 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/activity/OldActivity.java +++ b/app/src/main/java/com/mjsheng/myappstore/activity/OldActivity.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.activity; +package com.mjsheng.myappstore.activity; import android.annotation.SuppressLint; import android.app.AlertDialog; @@ -36,33 +36,33 @@ import com.blankj.utilcode.util.EncryptUtils; import com.blankj.utilcode.util.PathUtils; import com.lzy.okgo.OkGo; import com.lzy.okgo.callback.StringCallback; -import com.jiaoguanyi.appstore.BuildConfig; -import com.jiaoguanyi.appstore.R; -import com.jiaoguanyi.appstore.base.BaseApplication; -import com.jiaoguanyi.appstore.bean.ForceDownloadBean; -import com.jiaoguanyi.appstore.bean.ForceDownloadData; -import com.jiaoguanyi.appstore.bean.LzyResponse; -import com.jiaoguanyi.appstore.bean.NetAndLaunchBean; -import com.jiaoguanyi.appstore.bean.NetAndLaunchData; -import com.jiaoguanyi.appstore.bean.StudentsInfo; -import com.jiaoguanyi.appstore.jpush.TagAliasOperatorHelper; -import com.jiaoguanyi.appstore.manager.NetInterfaceManager; -import com.jiaoguanyi.appstore.network.HTTPInterface; -import com.jiaoguanyi.appstore.network.URLAddress; -import com.jiaoguanyi.appstore.network.api.AppLimitApi; -import com.jiaoguanyi.appstore.network.api.DeselectBrowserIDApi; -import com.jiaoguanyi.appstore.network.api.DeselectIDApi; -import com.jiaoguanyi.appstore.network.api.ForceDownloadApi; -import com.jiaoguanyi.appstore.network.api.NetAndLaunchApi; -import com.jiaoguanyi.appstore.network.api.SystemSettingApi; -import com.jiaoguanyi.appstore.utils.ApkUtils; -import com.jiaoguanyi.appstore.utils.ExampleUtil; -import com.jiaoguanyi.appstore.utils.JGYUtils; -import com.jiaoguanyi.appstore.utils.SPUtils; -import com.jiaoguanyi.appstore.utils.SaveListUtils; -import com.jiaoguanyi.appstore.utils.SysSettingUtils; -import com.jiaoguanyi.appstore.utils.ToastUtil; -import com.jiaoguanyi.appstore.utils.Utils; +import com.mjsheng.myappstore.BuildConfig; +import com.mjsheng.myappstore.R; +import com.mjsheng.myappstore.base.BaseApplication; +import com.mjsheng.myappstore.bean.ForceDownloadBean; +import com.mjsheng.myappstore.bean.ForceDownloadData; +import com.mjsheng.myappstore.bean.LzyResponse; +import com.mjsheng.myappstore.bean.NetAndLaunchBean; +import com.mjsheng.myappstore.bean.NetAndLaunchData; +import com.mjsheng.myappstore.bean.StudentsInfo; +import com.mjsheng.myappstore.jpush.TagAliasOperatorHelper; +import com.mjsheng.myappstore.manager.NetInterfaceManager; +import com.mjsheng.myappstore.network.HTTPInterface; +import com.mjsheng.myappstore.network.URLAddress; +import com.mjsheng.myappstore.network.api.AppLimitApi; +import com.mjsheng.myappstore.network.api.DeselectBrowserIDApi; +import com.mjsheng.myappstore.network.api.DeselectIDApi; +import com.mjsheng.myappstore.network.api.ForceDownloadApi; +import com.mjsheng.myappstore.network.api.NetAndLaunchApi; +import com.mjsheng.myappstore.network.api.SystemSettingApi; +import com.mjsheng.myappstore.utils.ApkUtils; +import com.mjsheng.myappstore.utils.ExampleUtil; +import com.mjsheng.myappstore.utils.JGYUtils; +import com.mjsheng.myappstore.utils.SPUtils; +import com.mjsheng.myappstore.utils.SaveListUtils; +import com.mjsheng.myappstore.utils.SysSettingUtils; +import com.mjsheng.myappstore.utils.ToastUtil; +import com.mjsheng.myappstore.utils.Utils; import org.json.JSONException; import org.json.JSONObject; @@ -85,9 +85,9 @@ import okhttp3.ResponseBody; import rx.Observable; import rx.functions.Action1; -import static com.jiaoguanyi.appstore.jpush.TagAliasOperatorHelper.ACTION_SET; -import static com.jiaoguanyi.appstore.jpush.TagAliasOperatorHelper.TagAliasBean; -import static com.jiaoguanyi.appstore.jpush.TagAliasOperatorHelper.sequence; +import static com.mjsheng.myappstore.jpush.TagAliasOperatorHelper.ACTION_SET; +import static com.mjsheng.myappstore.jpush.TagAliasOperatorHelper.TagAliasBean; +import static com.mjsheng.myappstore.jpush.TagAliasOperatorHelper.sequence; public class OldActivity extends AppCompatActivity { private static final String TAG = OldActivity.class.getSimpleName(); @@ -1041,7 +1041,7 @@ public class OldActivity extends AppCompatActivity { case 200: JSONObject data = jsonObject.getJSONObject("data"); String result = data.optString("result"); - writeAppPackageList(result); +// writeAppPackageList(result); break; default: Log.e("mjhseng", "getAppLimitApi---code is -200"); @@ -1065,39 +1065,6 @@ public class OldActivity extends AppCompatActivity { }); } - private void writeAppPackageList(String result) { - String appstore = "com.jiaoguanyi.appstore"; - String store = "com.jiaoguanyi.store"; - String info = "com.info.sn"; -// String iflytek = "com.estrongs.android.pop"; - String jgy1 = "com.uiuios.jgy1"; - String jgy2 = "com.uiuios.jgy2"; - if (!TextUtils.isEmpty(result)) { - Log.e("writeAppPackageList", result); - if (!result.contains(appstore)) { - result = result + "," + appstore; - } - if (!result.contains(store)) { - result = result + "," + store; - } - if (!result.contains(jgy1)) { - result = result + "," + jgy1; - } - if (!result.contains(jgy2)) { - result = result + "," + jgy2; - } - if (!result.contains(info)) { - result = result + "," + info; - } - //人脸识别 - boolean b = Settings.System.putString(getContentResolver(), "qch_app_forbid", result); - Log.e("mjsheng", "qch_app_forbid is :" + b + Settings.System.getString(getContentResolver(), "qch_app_forbid")); - - } else { - Log.e("mjsheng", "writeAppPackageList is null:"); - - } - } private void getDeselectID() { DeselectIDApi deselectIDApi = NetInterfaceManager.getDeselectIDApi(); diff --git a/app/src/main/java/com/jiaoguanyi/appstore/activity/TopActivity.java b/app/src/main/java/com/mjsheng/myappstore/activity/TopActivity.java similarity index 90% rename from app/src/main/java/com/jiaoguanyi/appstore/activity/TopActivity.java rename to app/src/main/java/com/mjsheng/myappstore/activity/TopActivity.java index 7df9d3e..4455689 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/activity/TopActivity.java +++ b/app/src/main/java/com/mjsheng/myappstore/activity/TopActivity.java @@ -1,11 +1,11 @@ -package com.jiaoguanyi.appstore.activity; +package com.mjsheng.myappstore.activity; import android.content.Intent; import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.view.KeyEvent; -import com.jiaoguanyi.appstore.R; +import com.mjsheng.myappstore.R; public class TopActivity extends AppCompatActivity { diff --git a/app/src/main/java/com/jiaoguanyi/appstore/base/BaseActivity.java b/app/src/main/java/com/mjsheng/myappstore/base/BaseActivity.java similarity index 94% rename from app/src/main/java/com/jiaoguanyi/appstore/base/BaseActivity.java rename to app/src/main/java/com/mjsheng/myappstore/base/BaseActivity.java index 5059471..819fb84 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/base/BaseActivity.java +++ b/app/src/main/java/com/mjsheng/myappstore/base/BaseActivity.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.base; +package com.mjsheng.myappstore.base; import android.os.Bundle; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/base/BaseApplication.java b/app/src/main/java/com/mjsheng/myappstore/base/BaseApplication.java similarity index 86% rename from app/src/main/java/com/jiaoguanyi/appstore/base/BaseApplication.java rename to app/src/main/java/com/mjsheng/myappstore/base/BaseApplication.java index 6c7103b..56c6baa 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/base/BaseApplication.java +++ b/app/src/main/java/com/mjsheng/myappstore/base/BaseApplication.java @@ -1,6 +1,7 @@ -package com.jiaoguanyi.appstore.base; +package com.mjsheng.myappstore.base; import android.content.BroadcastReceiver; +import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; @@ -14,7 +15,6 @@ import android.os.Looper; import android.os.PowerManager; import android.os.Process; import android.provider.Settings; -import android.text.TextUtils; import android.util.Log; import androidx.multidex.MultiDexApplication; @@ -23,30 +23,32 @@ import com.alibaba.fastjson.JSON; import com.amap.api.location.AMapLocationClient; import com.arialyy.aria.core.Aria; import com.arialyy.aria.core.download.DownloadEntity; -import com.jiaoguanyi.appstore.utils.XAPKUtils; +import com.mjsheng.myappstore.manager.FileManager; +import com.mjsheng.myappstore.receiver.BootReceiver; +import com.mjsheng.myappstore.utils.XAPKUtils; import com.lzy.okgo.OkGo; import com.lzy.okgo.cache.CacheEntity; import com.lzy.okgo.cache.CacheMode; import com.lzy.okgo.callback.StringCallback; import com.lzy.okgo.cookie.store.PersistentCookieStore; -import com.jiaoguanyi.appstore.BuildConfig; -import com.jiaoguanyi.appstore.jpush.TagAliasOperatorHelper; -import com.jiaoguanyi.appstore.manager.AmapManager; -import com.jiaoguanyi.appstore.manager.NetInterfaceManager; -import com.jiaoguanyi.appstore.network.HTTPInterface; -import com.jiaoguanyi.appstore.network.URLAddress; -import com.jiaoguanyi.appstore.network.api.newapi.GetLockStateApi; -import com.jiaoguanyi.appstore.receiver.NewAppReceiver; -import com.jiaoguanyi.appstore.server.GuardService; -import com.jiaoguanyi.appstore.server.MainService; -import com.jiaoguanyi.appstore.server.StepService; -import com.jiaoguanyi.appstore.statistics.AppInformation; -import com.jiaoguanyi.appstore.statistics.StatisticsInfo; -import com.jiaoguanyi.appstore.utils.JGYUtils; -import com.jiaoguanyi.appstore.utils.NetworkUtils; -import com.jiaoguanyi.appstore.utils.SystemUtils; -import com.jiaoguanyi.appstore.utils.ToastUtil; -import com.jiaoguanyi.appstore.utils.Utils; +import com.mjsheng.myappstore.BuildConfig; +import com.mjsheng.myappstore.jpush.TagAliasOperatorHelper; +import com.mjsheng.myappstore.manager.AmapManager; +import com.mjsheng.myappstore.manager.NetInterfaceManager; +import com.mjsheng.myappstore.network.HTTPInterface; +import com.mjsheng.myappstore.network.URLAddress; +import com.mjsheng.myappstore.network.api.newapi.GetLockStateApi; +import com.mjsheng.myappstore.receiver.NewAppReceiver; +import com.mjsheng.myappstore.server.GuardService; +import com.mjsheng.myappstore.server.MainService; +import com.mjsheng.myappstore.server.StepService; +import com.mjsheng.myappstore.statistics.AppInformation; +import com.mjsheng.myappstore.statistics.StatisticsInfo; +import com.mjsheng.myappstore.utils.JGYUtils; +import com.mjsheng.myappstore.utils.NetworkUtils; +import com.mjsheng.myappstore.utils.SystemUtils; +import com.mjsheng.myappstore.utils.ToastUtil; +import com.mjsheng.myappstore.utils.Utils; import org.json.JSONArray; import org.json.JSONObject; @@ -80,6 +82,7 @@ public class BaseApplication extends MultiDexApplication { public static Context context; private static BaseApplication instance; + private Handler mHandler = new Handler(); public static Context getAppContext() { @@ -108,6 +111,7 @@ public class BaseApplication extends MultiDexApplication { NetInterfaceManager.init(this); JGYUtils.init(this); XAPKUtils.init(this); + FileManager.init(this); Configuration config = getResources().getConfiguration(); int smallestScreenWidthDp = config.smallestScreenWidthDp; Log.e("mjsheng", "smallestScreenWidthDp=" + smallestScreenWidthDp); @@ -203,6 +207,13 @@ public class BaseApplication extends MultiDexApplication { private ScreenReceiver screenReceiver; + + Long time1 = 0L; + Long time2 = 0L; + + Long time3 = 0L; + Long time4 = 0L; + public class ScreenReceiver extends BroadcastReceiver { @Override @@ -215,55 +226,52 @@ public class BaseApplication extends MultiDexApplication { aMapLocationClient.stopLocation(); aMapLocationClient.startLocation(); getLockState("2", String.valueOf(time)); - } -// else if (action.equals(Intent.ACTION_USER_PRESENT)) { -//// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { -//// /*在8.0以上 除了开机广播其他广播基本上没有用 -//// *当静默安装升级时，app不会被唤醒，只有通过显示广播唤醒 -//// * */ -//// mHandler.postDelayed(new Runnable() { -//// @Override -//// public void run() { -//// Intent intent1 = new Intent(BootReceiver.BOOT_COMPLETED); -//// intent1.setComponent(new ComponentName("com.jiaoguanyi.store", "com.mjsheng.myappstore.receiver.BootReceiver")); -//// // 携带数据 -////// intent1.putExtra("test", "我是来测 A 应用的Android 8.0 系统静态广播的测试数据"); -//// // 启动发送广播 -//// sendBroadcast(intent1); -//// -//// time2 = System.currentTimeMillis(); -//// if ((time2 - time1) > 60 * 1000) { -//// //可能会多次触发，1分钟之内不执行 -//// //application中启动服务,startcommand执行会两次 -//// startService(new Intent(context, InitJpushServer.class)); -//// startService(new Intent(context, StepService.class)); -//// startService(new Intent(context, GuardService.class)); -//// time1 = time2; -//// } -//// } -//// }, 5000); -//// -//// } -//// } -//// else if (action.equals(Intent.ACTION_SCREEN_OFF)) { -//// mHandler.postDelayed(new Runnable() { -//// @Override -//// public void run() { -//// long time = System.currentTimeMillis(); -//// getLockState("1", String.valueOf(time)); -//// if (time3 - System.currentTimeMillis() >= 10000) { -//// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { -//// Intent intent1 = new Intent(BootReceiver.BOOT_COMPLETED); -//// intent1.setComponent(new ComponentName("com.jiaoguanyi.store", "com.mjsheng.myappstore.receiver.BootReceiver")); -//// sendBroadcast(intent1); -//// deleteScreenshots(); -//// } -//// } -//// time3 = System.currentTimeMillis(); -//// } -//// }, 10000); -//// } - else if (action.equals("android.intent.action.FACTORY_RESET") + } else if (action.equals(Intent.ACTION_USER_PRESENT)) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + /*在8.0以上 除了开机广播其他广播基本上没有用 + *当静默安装升级时，app不会被唤醒，只有通过显示广播唤醒 + * */ + mHandler.postDelayed(new Runnable() { + @Override + public void run() { + Intent intent1 = new Intent(BootReceiver.BOOT_COMPLETED); + intent1.setComponent(new ComponentName("com.jiaoguanyi.store", "com.mjsheng.myappstore.receiver.BootReceiver")); + // 携带数据 +// intent1.putExtra("test", "我是来测 A 应用的Android 8.0 系统静态广播的测试数据"); + // 启动发送广播 + sendBroadcast(intent1); + + time2 = System.currentTimeMillis(); + if ((time2 - time1) > 60 * 1000) { + //可能会多次触发，1分钟之内不执行 + //application中启动服务,startcommand执行会两次 + startService(new Intent(context, MainService.class)); + startService(new Intent(context, StepService.class)); + startService(new Intent(context, GuardService.class)); + time1 = time2; + } + } + }, 5000); + + } + } else if (action.equals(Intent.ACTION_SCREEN_OFF)) { + mHandler.postDelayed(new Runnable() { + @Override + public void run() { + long time = System.currentTimeMillis(); + getLockState("1", String.valueOf(time)); + if (time3 - System.currentTimeMillis() >= 10000) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + Intent intent1 = new Intent(BootReceiver.BOOT_COMPLETED); + intent1.setComponent(new ComponentName("com.jiaoguanyi.store", "com.mjsheng.myappstore.receiver.BootReceiver")); + sendBroadcast(intent1); + deleteScreenshots(); + } + } + time3 = System.currentTimeMillis(); + } + }, 10000); + } else if (action.equals("android.intent.action.FACTORY_RESET") || action.equals("android.intent.action.MASTER_CLEAR") //MASTER_CLEAR 7.0可以监听 || action.equals("android.intent.action.MASTER_CLEAR_NOTIFICATION") @@ -691,7 +699,7 @@ public class BaseApplication extends MultiDexApplication { if (code == 200) { com.alibaba.fastjson.JSONObject resultJson = JSON.parseObject(data); String result = resultJson.getString("result"); - writeAppPackageList(result); +// writeAppPackageList(result); // setAPPUsage(allList); } else { // setAPPUsage(); @@ -705,24 +713,6 @@ public class BaseApplication extends MultiDexApplication { }); } - private void writeAppPackageList(String result) { - String appstore = "com.jiaoguanyi.appstore"; - String store = "com.jiaoguanyi.store"; - if (!TextUtils.isEmpty(result)) { - Log.e("writeAppPackageList", result); - if (!result.contains(appstore)) { - result = result + "," + appstore; - } - if (!result.contains(store)) { - result = result + "," + store; - } - Settings.System.putString(context.getContentResolver(), "qch_app_forbid", result); - Log.e("mjsheng", "qch_app_forbid :" + result); - } else { - Log.e("mjsheng", "writeAppPackageList is null:"); - Settings.System.putString(context.getContentResolver(), "qch_app_forbid", appstore + "," + store); - } - } private void catchException() { Thread.setDefaultUncaughtExceptionHandler( diff --git a/app/src/main/java/com/jiaoguanyi/appstore/base/BasePresenter.java b/app/src/main/java/com/mjsheng/myappstore/base/BasePresenter.java similarity index 80% rename from app/src/main/java/com/jiaoguanyi/appstore/base/BasePresenter.java rename to app/src/main/java/com/mjsheng/myappstore/base/BasePresenter.java index e785404..ba9ab2e 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/base/BasePresenter.java +++ b/app/src/main/java/com/mjsheng/myappstore/base/BasePresenter.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.base; +package com.mjsheng.myappstore.base; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/mjsheng/myappstore/base/BaseView.java b/app/src/main/java/com/mjsheng/myappstore/base/BaseView.java new file mode 100644 index 0000000..0d85d1e --- /dev/null +++ b/app/src/main/java/com/mjsheng/myappstore/base/BaseView.java @@ -0,0 +1,4 @@ +package com.mjsheng.myappstore.base; + +public interface BaseView { +} diff --git a/app/src/main/java/com/jiaoguanyi/appstore/bean/AppData.java b/app/src/main/java/com/mjsheng/myappstore/bean/AppData.java similarity index 99% rename from app/src/main/java/com/jiaoguanyi/appstore/bean/AppData.java rename to app/src/main/java/com/mjsheng/myappstore/bean/AppData.java index 0441ea3..e7c861d 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/bean/AppData.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/AppData.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.bean; +package com.mjsheng.myappstore.bean; import android.content.ContentValues; import android.content.Context; @@ -11,9 +11,9 @@ import android.content.pm.ResolveInfo; import android.database.Cursor; import android.util.Log; -import com.jiaoguanyi.appstore.database.DBHelper; -import com.jiaoguanyi.appstore.database.DBSqlBuilder; -import com.jiaoguanyi.appstore.utils.Utils; +import com.mjsheng.myappstore.database.DBHelper; +import com.mjsheng.myappstore.database.DBSqlBuilder; +import com.mjsheng.myappstore.utils.Utils; import java.util.ArrayList; import java.util.HashMap; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/bean/AppDateInfo.java b/app/src/main/java/com/mjsheng/myappstore/bean/AppDateInfo.java similarity index 98% rename from app/src/main/java/com/jiaoguanyi/appstore/bean/AppDateInfo.java rename to app/src/main/java/com/mjsheng/myappstore/bean/AppDateInfo.java index 2ae323e..b42925b 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/bean/AppDateInfo.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/AppDateInfo.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.bean; +package com.mjsheng.myappstore.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/bean/AppDownloadInfo.java b/app/src/main/java/com/mjsheng/myappstore/bean/AppDownloadInfo.java similarity index 98% rename from app/src/main/java/com/jiaoguanyi/appstore/bean/AppDownloadInfo.java rename to app/src/main/java/com/mjsheng/myappstore/bean/AppDownloadInfo.java index 37fc722..5fd8ded 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/bean/AppDownloadInfo.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/AppDownloadInfo.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.bean; +package com.mjsheng.myappstore.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/bean/AppInfo.java b/app/src/main/java/com/mjsheng/myappstore/bean/AppInfo.java similarity index 98% rename from app/src/main/java/com/jiaoguanyi/appstore/bean/AppInfo.java rename to app/src/main/java/com/mjsheng/myappstore/bean/AppInfo.java index 5f5081e..c4e978e 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/bean/AppInfo.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/AppInfo.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.bean; +package com.mjsheng.myappstore.bean; import android.graphics.drawable.Drawable; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/bean/AppInfoBean.java b/app/src/main/java/com/mjsheng/myappstore/bean/AppInfoBean.java similarity index 94% rename from app/src/main/java/com/jiaoguanyi/appstore/bean/AppInfoBean.java rename to app/src/main/java/com/mjsheng/myappstore/bean/AppInfoBean.java index 8c31762..7fb91fb 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/bean/AppInfoBean.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/AppInfoBean.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.bean; +package com.mjsheng.myappstore.bean; import java.util.List; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/bean/AppUpdateInfo.java b/app/src/main/java/com/mjsheng/myappstore/bean/AppUpdateInfo.java similarity index 94% rename from app/src/main/java/com/jiaoguanyi/appstore/bean/AppUpdateInfo.java rename to app/src/main/java/com/mjsheng/myappstore/bean/AppUpdateInfo.java index 24c2b50..6bb9974 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/bean/AppUpdateInfo.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/AppUpdateInfo.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.bean; +package com.mjsheng.myappstore.bean; /** * Created by Administrator on 2017/1/10. diff --git a/app/src/main/java/com/jiaoguanyi/appstore/bean/Appground.java b/app/src/main/java/com/mjsheng/myappstore/bean/Appground.java similarity index 94% rename from app/src/main/java/com/jiaoguanyi/appstore/bean/Appground.java rename to app/src/main/java/com/mjsheng/myappstore/bean/Appground.java index bc3080f..dac91a3 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/bean/Appground.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/Appground.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.bean; +package com.mjsheng.myappstore.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/bean/BaseResponse.java b/app/src/main/java/com/mjsheng/myappstore/bean/BaseResponse.java similarity index 91% rename from app/src/main/java/com/jiaoguanyi/appstore/bean/BaseResponse.java rename to app/src/main/java/com/mjsheng/myappstore/bean/BaseResponse.java index fd71d56..bcdf050 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/bean/BaseResponse.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/BaseResponse.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.bean; +package com.mjsheng.myappstore.bean; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/bean/Batch.java b/app/src/main/java/com/mjsheng/myappstore/bean/Batch.java similarity index 93% rename from app/src/main/java/com/jiaoguanyi/appstore/bean/Batch.java rename to app/src/main/java/com/mjsheng/myappstore/bean/Batch.java index c4033ed..83cd92d 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/bean/Batch.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/Batch.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.bean; +package com.mjsheng.myappstore.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/bean/BrowserBookmarks.java b/app/src/main/java/com/mjsheng/myappstore/bean/BrowserBookmarks.java similarity index 93% rename from app/src/main/java/com/jiaoguanyi/appstore/bean/BrowserBookmarks.java rename to app/src/main/java/com/mjsheng/myappstore/bean/BrowserBookmarks.java index 68c2f60..3842aa4 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/bean/BrowserBookmarks.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/BrowserBookmarks.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.bean; +package com.mjsheng.myappstore.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/bean/BrowserData.java b/app/src/main/java/com/mjsheng/myappstore/bean/BrowserData.java similarity index 92% rename from app/src/main/java/com/jiaoguanyi/appstore/bean/BrowserData.java rename to app/src/main/java/com/mjsheng/myappstore/bean/BrowserData.java index a472c9c..ea4018b 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/bean/BrowserData.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/BrowserData.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.bean; +package com.mjsheng.myappstore.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/bean/CategoryInfo.java b/app/src/main/java/com/mjsheng/myappstore/bean/CategoryInfo.java similarity index 95% rename from app/src/main/java/com/jiaoguanyi/appstore/bean/CategoryInfo.java rename to app/src/main/java/com/mjsheng/myappstore/bean/CategoryInfo.java index a52b96f..b59decb 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/bean/CategoryInfo.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/CategoryInfo.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.bean; +package com.mjsheng.myappstore.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/bean/CategoryPicBean.java b/app/src/main/java/com/mjsheng/myappstore/bean/CategoryPicBean.java similarity index 95% rename from app/src/main/java/com/jiaoguanyi/appstore/bean/CategoryPicBean.java rename to app/src/main/java/com/mjsheng/myappstore/bean/CategoryPicBean.java index 077887e..7140ce6 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/bean/CategoryPicBean.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/CategoryPicBean.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.bean; +package com.mjsheng.myappstore.bean; import java.util.List; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/bean/CommonPicBean.java b/app/src/main/java/com/mjsheng/myappstore/bean/CommonPicBean.java similarity index 97% rename from app/src/main/java/com/jiaoguanyi/appstore/bean/CommonPicBean.java rename to app/src/main/java/com/mjsheng/myappstore/bean/CommonPicBean.java index 707de39..0d3f470 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/bean/CommonPicBean.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/CommonPicBean.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.bean; +package com.mjsheng.myappstore.bean; import java.util.List; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/bean/CommonPicData.java b/app/src/main/java/com/mjsheng/myappstore/bean/CommonPicData.java similarity index 97% rename from app/src/main/java/com/jiaoguanyi/appstore/bean/CommonPicData.java rename to app/src/main/java/com/mjsheng/myappstore/bean/CommonPicData.java index dc8c828..db4c331 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/bean/CommonPicData.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/CommonPicData.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.bean; +package com.mjsheng.myappstore.bean; /** * 作者 mjsheng diff --git a/app/src/main/java/com/jiaoguanyi/appstore/bean/Convert.java b/app/src/main/java/com/mjsheng/myappstore/bean/Convert.java similarity index 97% rename from app/src/main/java/com/jiaoguanyi/appstore/bean/Convert.java rename to app/src/main/java/com/mjsheng/myappstore/bean/Convert.java index d85b4ec..bd80ac4 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/bean/Convert.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/Convert.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.bean; +package com.mjsheng.myappstore.bean; import com.google.gson.Gson; import com.google.gson.JsonIOException; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/bean/Desktop.java b/app/src/main/java/com/mjsheng/myappstore/bean/Desktop.java similarity index 96% rename from app/src/main/java/com/jiaoguanyi/appstore/bean/Desktop.java rename to app/src/main/java/com/mjsheng/myappstore/bean/Desktop.java index dce4510..34f8053 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/bean/Desktop.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/Desktop.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.bean; +package com.mjsheng.myappstore.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/bean/Expansions.java b/app/src/main/java/com/mjsheng/myappstore/bean/Expansions.java similarity index 95% rename from app/src/main/java/com/jiaoguanyi/appstore/bean/Expansions.java rename to app/src/main/java/com/mjsheng/myappstore/bean/Expansions.java index 27c66d2..0c4dfa8 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/bean/Expansions.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/Expansions.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.bean; +package com.mjsheng.myappstore.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/bean/FileData.java b/app/src/main/java/com/mjsheng/myappstore/bean/FileData.java similarity index 93% rename from app/src/main/java/com/jiaoguanyi/appstore/bean/FileData.java rename to app/src/main/java/com/mjsheng/myappstore/bean/FileData.java index d6c1642..60c73bd 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/bean/FileData.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/FileData.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.bean; +package com.mjsheng.myappstore.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/bean/ForceDownloadBean.java b/app/src/main/java/com/mjsheng/myappstore/bean/ForceDownloadBean.java similarity index 96% rename from app/src/main/java/com/jiaoguanyi/appstore/bean/ForceDownloadBean.java rename to app/src/main/java/com/mjsheng/myappstore/bean/ForceDownloadBean.java index 353a46d..47f853e 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/bean/ForceDownloadBean.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/ForceDownloadBean.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.bean; +package com.mjsheng.myappstore.bean; import java.util.List; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/bean/ForceDownloadData.java b/app/src/main/java/com/mjsheng/myappstore/bean/ForceDownloadData.java similarity index 96% rename from app/src/main/java/com/jiaoguanyi/appstore/bean/ForceDownloadData.java rename to app/src/main/java/com/mjsheng/myappstore/bean/ForceDownloadData.java index c576d50..3d31071 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/bean/ForceDownloadData.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/ForceDownloadData.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.bean; +package com.mjsheng.myappstore.bean; /** * 作者 mjsheng diff --git a/app/src/main/java/com/jiaoguanyi/appstore/bean/JsonCallback.java b/app/src/main/java/com/mjsheng/myappstore/bean/JsonCallback.java similarity index 99% rename from app/src/main/java/com/jiaoguanyi/appstore/bean/JsonCallback.java rename to app/src/main/java/com/mjsheng/myappstore/bean/JsonCallback.java index 9953d82..b416a21 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/bean/JsonCallback.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/JsonCallback.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.bean; +package com.mjsheng.myappstore.bean; import com.google.gson.stream.JsonReader; import com.lzy.okgo.callback.AbsCallback; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/bean/LocalAppInfo.java b/app/src/main/java/com/mjsheng/myappstore/bean/LocalAppInfo.java similarity index 98% rename from app/src/main/java/com/jiaoguanyi/appstore/bean/LocalAppInfo.java rename to app/src/main/java/com/mjsheng/myappstore/bean/LocalAppInfo.java index 455f6e1..3182da2 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/bean/LocalAppInfo.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/LocalAppInfo.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.bean; +package com.mjsheng.myappstore.bean; import android.graphics.drawable.Drawable; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/bean/LogoImg.java b/app/src/main/java/com/mjsheng/myappstore/bean/LogoImg.java similarity index 94% rename from app/src/main/java/com/jiaoguanyi/appstore/bean/LogoImg.java rename to app/src/main/java/com/mjsheng/myappstore/bean/LogoImg.java index a9ec67b..9f820e8 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/bean/LogoImg.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/LogoImg.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.bean; +package com.mjsheng.myappstore.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/bean/LzyResponse.java b/app/src/main/java/com/mjsheng/myappstore/bean/LzyResponse.java similarity index 85% rename from app/src/main/java/com/jiaoguanyi/appstore/bean/LzyResponse.java rename to app/src/main/java/com/mjsheng/myappstore/bean/LzyResponse.java index b13b086..cf6f5ae 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/bean/LzyResponse.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/LzyResponse.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.bean; +package com.mjsheng.myappstore.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/bean/NetAndLaunchBean.java b/app/src/main/java/com/mjsheng/myappstore/bean/NetAndLaunchBean.java similarity index 96% rename from app/src/main/java/com/jiaoguanyi/appstore/bean/NetAndLaunchBean.java rename to app/src/main/java/com/mjsheng/myappstore/bean/NetAndLaunchBean.java index eaadeb4..f16b588 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/bean/NetAndLaunchBean.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/NetAndLaunchBean.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.bean; +package com.mjsheng.myappstore.bean; import java.util.List; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/bean/NetAndLaunchData.java b/app/src/main/java/com/mjsheng/myappstore/bean/NetAndLaunchData.java similarity index 97% rename from app/src/main/java/com/jiaoguanyi/appstore/bean/NetAndLaunchData.java rename to app/src/main/java/com/mjsheng/myappstore/bean/NetAndLaunchData.java index add1145..121ade9 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/bean/NetAndLaunchData.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/NetAndLaunchData.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.bean; +package com.mjsheng.myappstore.bean; /** * 作者 mjsheng diff --git a/app/src/main/java/com/jiaoguanyi/appstore/bean/NewAppground.java b/app/src/main/java/com/mjsheng/myappstore/bean/NewAppground.java similarity index 94% rename from app/src/main/java/com/jiaoguanyi/appstore/bean/NewAppground.java rename to app/src/main/java/com/mjsheng/myappstore/bean/NewAppground.java index ae1b784..5367e65 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/bean/NewAppground.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/NewAppground.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.bean; +package com.mjsheng.myappstore.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/bean/ProjectDateInfo.java b/app/src/main/java/com/mjsheng/myappstore/bean/ProjectDateInfo.java similarity index 97% rename from app/src/main/java/com/jiaoguanyi/appstore/bean/ProjectDateInfo.java rename to app/src/main/java/com/mjsheng/myappstore/bean/ProjectDateInfo.java index ff7da4c..6ffb562 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/bean/ProjectDateInfo.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/ProjectDateInfo.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.bean; +package com.mjsheng.myappstore.bean; /** * Created by Administrator on 2016/10/9. diff --git a/app/src/main/java/com/jiaoguanyi/appstore/bean/ProjectPicBean.java b/app/src/main/java/com/mjsheng/myappstore/bean/ProjectPicBean.java similarity index 95% rename from app/src/main/java/com/jiaoguanyi/appstore/bean/ProjectPicBean.java rename to app/src/main/java/com/mjsheng/myappstore/bean/ProjectPicBean.java index 64da206..2d72c0b 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/bean/ProjectPicBean.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/ProjectPicBean.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.bean; +package com.mjsheng.myappstore.bean; import java.util.List; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/bean/SearchBean.java b/app/src/main/java/com/mjsheng/myappstore/bean/SearchBean.java similarity index 90% rename from app/src/main/java/com/jiaoguanyi/appstore/bean/SearchBean.java rename to app/src/main/java/com/mjsheng/myappstore/bean/SearchBean.java index ae78039..1b0741f 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/bean/SearchBean.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/SearchBean.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.bean; +package com.mjsheng.myappstore.bean; public class SearchBean { private String category; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/bean/SimpleResponse.java b/app/src/main/java/com/mjsheng/myappstore/bean/SimpleResponse.java similarity index 91% rename from app/src/main/java/com/jiaoguanyi/appstore/bean/SimpleResponse.java rename to app/src/main/java/com/mjsheng/myappstore/bean/SimpleResponse.java index f04da50..460f234 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/bean/SimpleResponse.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/SimpleResponse.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.bean; +package com.mjsheng.myappstore.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/bean/SplitApks.java b/app/src/main/java/com/mjsheng/myappstore/bean/SplitApks.java similarity index 90% rename from app/src/main/java/com/jiaoguanyi/appstore/bean/SplitApks.java rename to app/src/main/java/com/mjsheng/myappstore/bean/SplitApks.java index 83c16ea..73e4ab8 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/bean/SplitApks.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/SplitApks.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.bean; +package com.mjsheng.myappstore.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/bean/StudentsInfo.java b/app/src/main/java/com/mjsheng/myappstore/bean/StudentsInfo.java similarity index 96% rename from app/src/main/java/com/jiaoguanyi/appstore/bean/StudentsInfo.java rename to app/src/main/java/com/mjsheng/myappstore/bean/StudentsInfo.java index aea0fdc..6b25918 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/bean/StudentsInfo.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/StudentsInfo.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.bean; +package com.mjsheng.myappstore.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/bean/SystemSetBean.java b/app/src/main/java/com/mjsheng/myappstore/bean/SystemSetBean.java similarity index 90% rename from app/src/main/java/com/jiaoguanyi/appstore/bean/SystemSetBean.java rename to app/src/main/java/com/mjsheng/myappstore/bean/SystemSetBean.java index 55ba09d..bd6bc2f 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/bean/SystemSetBean.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/SystemSetBean.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.bean; +package com.mjsheng.myappstore.bean; /** * 作者 mjsheng diff --git a/app/src/main/java/com/jiaoguanyi/appstore/bean/SystemSettingBean.java b/app/src/main/java/com/mjsheng/myappstore/bean/SystemSettingBean.java similarity index 96% rename from app/src/main/java/com/jiaoguanyi/appstore/bean/SystemSettingBean.java rename to app/src/main/java/com/mjsheng/myappstore/bean/SystemSettingBean.java index afbb9f6..f5c5d06 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/bean/SystemSettingBean.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/SystemSettingBean.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.bean; +package com.mjsheng.myappstore.bean; /** * 作者 mjsheng diff --git a/app/src/main/java/com/jiaoguanyi/appstore/bean/SystemSettingData.java b/app/src/main/java/com/mjsheng/myappstore/bean/SystemSettingData.java similarity index 98% rename from app/src/main/java/com/jiaoguanyi/appstore/bean/SystemSettingData.java rename to app/src/main/java/com/mjsheng/myappstore/bean/SystemSettingData.java index d919a32..f8559be 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/bean/SystemSettingData.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/SystemSettingData.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.bean; +package com.mjsheng.myappstore.bean; /** * 作者 mjsheng diff --git a/app/src/main/java/com/jiaoguanyi/appstore/bean/TimeControl.java b/app/src/main/java/com/mjsheng/myappstore/bean/TimeControl.java similarity index 92% rename from app/src/main/java/com/jiaoguanyi/appstore/bean/TimeControl.java rename to app/src/main/java/com/mjsheng/myappstore/bean/TimeControl.java index add1bf3..436d1e4 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/bean/TimeControl.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/TimeControl.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.bean; +package com.mjsheng.myappstore.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/bean/UploadAppInfo.java b/app/src/main/java/com/mjsheng/myappstore/bean/UploadAppInfo.java similarity index 97% rename from app/src/main/java/com/jiaoguanyi/appstore/bean/UploadAppInfo.java rename to app/src/main/java/com/mjsheng/myappstore/bean/UploadAppInfo.java index 572f9d9..396b6e2 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/bean/UploadAppInfo.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/UploadAppInfo.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.bean; +package com.mjsheng.myappstore.bean; /** * 作者 mjsheng diff --git a/app/src/main/java/com/jiaoguanyi/appstore/bean/UserInfo.java b/app/src/main/java/com/mjsheng/myappstore/bean/UserInfo.java similarity index 98% rename from app/src/main/java/com/jiaoguanyi/appstore/bean/UserInfo.java rename to app/src/main/java/com/mjsheng/myappstore/bean/UserInfo.java index 74615e7..5f8abf8 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/bean/UserInfo.java +++ b/app/src/main/java/com/mjsheng/myappstore/bean/UserInfo.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.bean; +package com.mjsheng.myappstore.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/comm/CommonDatas.java b/app/src/main/java/com/mjsheng/myappstore/comm/CommonDatas.java similarity index 92% rename from app/src/main/java/com/jiaoguanyi/appstore/comm/CommonDatas.java rename to app/src/main/java/com/mjsheng/myappstore/comm/CommonDatas.java index 26e42cb..6adaefd 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/comm/CommonDatas.java +++ b/app/src/main/java/com/mjsheng/myappstore/comm/CommonDatas.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.comm; +package com.mjsheng.myappstore.comm; public class CommonDatas { diff --git a/app/src/main/java/com/jiaoguanyi/appstore/database/DBHelper.java b/app/src/main/java/com/mjsheng/myappstore/database/DBHelper.java similarity index 99% rename from app/src/main/java/com/jiaoguanyi/appstore/database/DBHelper.java rename to app/src/main/java/com/mjsheng/myappstore/database/DBHelper.java index 33435be..7e9135f 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/database/DBHelper.java +++ b/app/src/main/java/com/mjsheng/myappstore/database/DBHelper.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.database; +package com.mjsheng.myappstore.database; import android.content.ContentValues; import android.content.Context; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/database/DBSqlBuilder.java b/app/src/main/java/com/mjsheng/myappstore/database/DBSqlBuilder.java similarity index 98% rename from app/src/main/java/com/jiaoguanyi/appstore/database/DBSqlBuilder.java rename to app/src/main/java/com/mjsheng/myappstore/database/DBSqlBuilder.java index 6348be4..33141eb 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/database/DBSqlBuilder.java +++ b/app/src/main/java/com/mjsheng/myappstore/database/DBSqlBuilder.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.database; +package com.mjsheng.myappstore.database; public class DBSqlBuilder { diff --git a/app/src/main/java/com/jiaoguanyi/appstore/jpush/ExampleUtil.java b/app/src/main/java/com/mjsheng/myappstore/jpush/ExampleUtil.java similarity index 99% rename from app/src/main/java/com/jiaoguanyi/appstore/jpush/ExampleUtil.java rename to app/src/main/java/com/mjsheng/myappstore/jpush/ExampleUtil.java index a45f669..9dd9c70 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/jpush/ExampleUtil.java +++ b/app/src/main/java/com/mjsheng/myappstore/jpush/ExampleUtil.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.jpush; +package com.mjsheng.myappstore.jpush; import android.content.Context; import android.content.pm.ApplicationInfo; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/jpush/LocalBroadcastManager.java b/app/src/main/java/com/mjsheng/myappstore/jpush/LocalBroadcastManager.java similarity index 99% rename from app/src/main/java/com/jiaoguanyi/appstore/jpush/LocalBroadcastManager.java rename to app/src/main/java/com/mjsheng/myappstore/jpush/LocalBroadcastManager.java index fb577b0..5465f66 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/jpush/LocalBroadcastManager.java +++ b/app/src/main/java/com/mjsheng/myappstore/jpush/LocalBroadcastManager.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.jpush; +package com.mjsheng.myappstore.jpush; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/jpush/Logger.java b/app/src/main/java/com/mjsheng/myappstore/jpush/Logger.java similarity index 95% rename from app/src/main/java/com/jiaoguanyi/appstore/jpush/Logger.java rename to app/src/main/java/com/mjsheng/myappstore/jpush/Logger.java index ce446ed..010114d 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/jpush/Logger.java +++ b/app/src/main/java/com/mjsheng/myappstore/jpush/Logger.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.jpush; +package com.mjsheng.myappstore.jpush; import android.util.Log; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/jpush/MyJPushMessageReceiver.java b/app/src/main/java/com/mjsheng/myappstore/jpush/MyJPushMessageReceiver.java similarity index 94% rename from app/src/main/java/com/jiaoguanyi/appstore/jpush/MyJPushMessageReceiver.java rename to app/src/main/java/com/mjsheng/myappstore/jpush/MyJPushMessageReceiver.java index 44a0308..34974c6 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/jpush/MyJPushMessageReceiver.java +++ b/app/src/main/java/com/mjsheng/myappstore/jpush/MyJPushMessageReceiver.java @@ -1,8 +1,8 @@ -package com.jiaoguanyi.appstore.jpush; +package com.mjsheng.myappstore.jpush; import android.content.Context; -import com.jiaoguanyi.appstore.base.BaseApplication; +import com.mjsheng.myappstore.base.BaseApplication; import cn.jpush.android.api.CustomMessage; import cn.jpush.android.api.JPushMessage; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/jpush/MyReceiver.java b/app/src/main/java/com/mjsheng/myappstore/jpush/MyReceiver.java similarity index 98% rename from app/src/main/java/com/jiaoguanyi/appstore/jpush/MyReceiver.java rename to app/src/main/java/com/mjsheng/myappstore/jpush/MyReceiver.java index ec57385..7db837e 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/jpush/MyReceiver.java +++ b/app/src/main/java/com/mjsheng/myappstore/jpush/MyReceiver.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.jpush; +package com.mjsheng.myappstore.jpush; import android.content.BroadcastReceiver; import android.content.Context; @@ -6,7 +6,7 @@ import android.content.Intent; import android.os.Bundle; import android.text.TextUtils; -import com.jiaoguanyi.appstore.activity.MainActivity; +import com.mjsheng.myappstore.activity.MainActivity; import org.json.JSONException; import org.json.JSONObject; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/jpush/PushService.java b/app/src/main/java/com/mjsheng/myappstore/jpush/PushService.java similarity index 72% rename from app/src/main/java/com/jiaoguanyi/appstore/jpush/PushService.java rename to app/src/main/java/com/mjsheng/myappstore/jpush/PushService.java index be6807c..1a5109b 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/jpush/PushService.java +++ b/app/src/main/java/com/mjsheng/myappstore/jpush/PushService.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.jpush; +package com.mjsheng.myappstore.jpush; import cn.jpush.android.service.JCommonService; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/jpush/TagAliasOperatorHelper.java b/app/src/main/java/com/mjsheng/myappstore/jpush/TagAliasOperatorHelper.java similarity index 99% rename from app/src/main/java/com/jiaoguanyi/appstore/jpush/TagAliasOperatorHelper.java rename to app/src/main/java/com/mjsheng/myappstore/jpush/TagAliasOperatorHelper.java index 26c8a26..bbf7b03 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/jpush/TagAliasOperatorHelper.java +++ b/app/src/main/java/com/mjsheng/myappstore/jpush/TagAliasOperatorHelper.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.jpush; +package com.mjsheng.myappstore.jpush; import android.content.Context; import android.os.Handler; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/jpush/invalid/ExampleApplication.java b/app/src/main/java/com/mjsheng/myappstore/jpush/invalid/ExampleApplication.java similarity index 87% rename from app/src/main/java/com/jiaoguanyi/appstore/jpush/invalid/ExampleApplication.java rename to app/src/main/java/com/mjsheng/myappstore/jpush/invalid/ExampleApplication.java index ee307e8..e0fd46a 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/jpush/invalid/ExampleApplication.java +++ b/app/src/main/java/com/mjsheng/myappstore/jpush/invalid/ExampleApplication.java @@ -1,8 +1,8 @@ -package com.jiaoguanyi.appstore.jpush.invalid; +package com.mjsheng.myappstore.jpush.invalid; import android.app.Application; -import com.jiaoguanyi.appstore.jpush.Logger; +import com.mjsheng.myappstore.jpush.Logger; import cn.jpush.android.api.JPushInterface; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/jpush/invalid/MainActivity.java b/app/src/main/java/com/mjsheng/myappstore/jpush/invalid/MainActivity.java similarity index 99% rename from app/src/main/java/com/jiaoguanyi/appstore/jpush/invalid/MainActivity.java rename to app/src/main/java/com/mjsheng/myappstore/jpush/invalid/MainActivity.java index d9bffd8..4d10459 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/jpush/invalid/MainActivity.java +++ b/app/src/main/java/com/mjsheng/myappstore/jpush/invalid/MainActivity.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.jpush.invalid; +package com.mjsheng.myappstore.jpush.invalid; //public class MainActivity extends InstrumentedActivity implements OnClickListener{ diff --git a/app/src/main/java/com/jiaoguanyi/appstore/jpush/invalid/PushSetActivity.java b/app/src/main/java/com/mjsheng/myappstore/jpush/invalid/PushSetActivity.java similarity index 99% rename from app/src/main/java/com/jiaoguanyi/appstore/jpush/invalid/PushSetActivity.java rename to app/src/main/java/com/mjsheng/myappstore/jpush/invalid/PushSetActivity.java index 00065ce..97c3131 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/jpush/invalid/PushSetActivity.java +++ b/app/src/main/java/com/mjsheng/myappstore/jpush/invalid/PushSetActivity.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.jpush.invalid; +package com.mjsheng.myappstore.jpush.invalid; //public class PushSetActivity extends InstrumentedActivity implements OnClickListener { // private static final String TAG = "JIGUANG-Example"; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/jpush/invalid/SettingActivity.java b/app/src/main/java/com/mjsheng/myappstore/jpush/invalid/SettingActivity.java similarity index 99% rename from app/src/main/java/com/jiaoguanyi/appstore/jpush/invalid/SettingActivity.java rename to app/src/main/java/com/mjsheng/myappstore/jpush/invalid/SettingActivity.java index 102981b..4f131e6 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/jpush/invalid/SettingActivity.java +++ b/app/src/main/java/com/mjsheng/myappstore/jpush/invalid/SettingActivity.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.jpush.invalid; +package com.mjsheng.myappstore.jpush.invalid; //public class SettingActivity extends InstrumentedActivity implements OnClickListener { // TimePicker startTime; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/jpush/invalid/TestActivity.java b/app/src/main/java/com/mjsheng/myappstore/jpush/invalid/TestActivity.java similarity index 95% rename from app/src/main/java/com/jiaoguanyi/appstore/jpush/invalid/TestActivity.java rename to app/src/main/java/com/mjsheng/myappstore/jpush/invalid/TestActivity.java index bd4d83f..b426b95 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/jpush/invalid/TestActivity.java +++ b/app/src/main/java/com/mjsheng/myappstore/jpush/invalid/TestActivity.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.jpush.invalid; +package com.mjsheng.myappstore.jpush.invalid; import android.app.Activity; import android.content.Intent; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/log/LogReceiver.java b/app/src/main/java/com/mjsheng/myappstore/log/LogReceiver.java similarity index 98% rename from app/src/main/java/com/jiaoguanyi/appstore/log/LogReceiver.java rename to app/src/main/java/com/mjsheng/myappstore/log/LogReceiver.java index 567bfee..9d64828 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/log/LogReceiver.java +++ b/app/src/main/java/com/mjsheng/myappstore/log/LogReceiver.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.log; +package com.mjsheng.myappstore.log; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/log/ReceiverHandler.java b/app/src/main/java/com/mjsheng/myappstore/log/ReceiverHandler.java similarity index 99% rename from app/src/main/java/com/jiaoguanyi/appstore/log/ReceiverHandler.java rename to app/src/main/java/com/mjsheng/myappstore/log/ReceiverHandler.java index 23bf4a9..5577f5f 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/log/ReceiverHandler.java +++ b/app/src/main/java/com/mjsheng/myappstore/log/ReceiverHandler.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.log; +package com.mjsheng.myappstore.log; import android.content.Intent; import android.os.Handler; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/manager/AmapManager.java b/app/src/main/java/com/mjsheng/myappstore/manager/AmapManager.java similarity index 97% rename from app/src/main/java/com/jiaoguanyi/appstore/manager/AmapManager.java rename to app/src/main/java/com/mjsheng/myappstore/manager/AmapManager.java index 84c2c30..9ccf0b2 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/manager/AmapManager.java +++ b/app/src/main/java/com/mjsheng/myappstore/manager/AmapManager.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.manager; +package com.mjsheng.myappstore.manager; import android.content.Context; import android.util.Log; @@ -7,7 +7,7 @@ import com.amap.api.location.AMapLocation; import com.amap.api.location.AMapLocationClient; import com.amap.api.location.AMapLocationClientOption; import com.amap.api.location.AMapLocationListener; -import com.jiaoguanyi.appstore.utils.SPUtils; +import com.mjsheng.myappstore.utils.SPUtils; public class AmapManager { private static AmapManager sInstance; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/manager/FileManager.java b/app/src/main/java/com/mjsheng/myappstore/manager/FileManager.java similarity index 96% rename from app/src/main/java/com/jiaoguanyi/appstore/manager/FileManager.java rename to app/src/main/java/com/mjsheng/myappstore/manager/FileManager.java index f2f6764..c23f8cd 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/manager/FileManager.java +++ b/app/src/main/java/com/mjsheng/myappstore/manager/FileManager.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.manager; +package com.mjsheng.myappstore.manager; import android.content.Context; import android.util.Log; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/manager/NetInterfaceManager.java b/app/src/main/java/com/mjsheng/myappstore/manager/NetInterfaceManager.java similarity index 82% rename from app/src/main/java/com/jiaoguanyi/appstore/manager/NetInterfaceManager.java rename to app/src/main/java/com/mjsheng/myappstore/manager/NetInterfaceManager.java index 828d983..75a9e73 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/manager/NetInterfaceManager.java +++ b/app/src/main/java/com/mjsheng/myappstore/manager/NetInterfaceManager.java @@ -1,50 +1,49 @@ -package com.jiaoguanyi.appstore.manager; +package com.mjsheng.myappstore.manager; import android.content.Context; import android.os.Environment; -import com.jiaoguanyi.appstore.BuildConfig; -import com.jiaoguanyi.appstore.bean.Appground; -import com.jiaoguanyi.appstore.bean.BaseResponse; -import com.jiaoguanyi.appstore.bean.BrowserBookmarks; -import com.jiaoguanyi.appstore.bean.BrowserData; -import com.jiaoguanyi.appstore.bean.Desktop; -import com.jiaoguanyi.appstore.bean.ForceDownloadBean; -import com.jiaoguanyi.appstore.bean.LogoImg; -import com.jiaoguanyi.appstore.bean.NetAndLaunchBean; -import com.jiaoguanyi.appstore.bean.NewAppground; -import com.jiaoguanyi.appstore.bean.StudentsInfo; -import com.jiaoguanyi.appstore.network.api.AppLimitApi; -import com.jiaoguanyi.appstore.network.api.BrankPicApi; -import com.jiaoguanyi.appstore.network.api.CategoryPicApi; -import com.jiaoguanyi.appstore.network.api.DeselectBrowserIDApi; -import com.jiaoguanyi.appstore.network.api.DeselectIDApi; -import com.jiaoguanyi.appstore.network.api.ForceDownloadApi; -import com.jiaoguanyi.appstore.network.api.NetAndLaunchApi; -import com.jiaoguanyi.appstore.network.api.ProjectPicApi; -import com.jiaoguanyi.appstore.network.api.RankAppApi; -import com.jiaoguanyi.appstore.network.api.SystemSettingApi; -import com.jiaoguanyi.appstore.network.api.UploadAppInfoApi; -import com.jiaoguanyi.appstore.network.api.newapi.AppinsideWebApi; -import com.jiaoguanyi.appstore.network.api.newapi.BrowserBookmarksApi; -import com.jiaoguanyi.appstore.network.api.newapi.BrowserListApi; -import com.jiaoguanyi.appstore.network.api.newapi.CheckTestUpdateApi; -import com.jiaoguanyi.appstore.network.api.newapi.CheckUpdateApi; -import com.jiaoguanyi.appstore.network.api.newapi.DesktopIconApi; -import com.jiaoguanyi.appstore.network.api.newapi.DevicesLockedStateApi; -import com.jiaoguanyi.appstore.network.api.newapi.GetBatchApi; -import com.jiaoguanyi.appstore.network.api.newapi.GetDesktopApi; -import com.jiaoguanyi.appstore.network.api.newapi.GetLockStateApi; -import com.jiaoguanyi.appstore.network.api.newapi.JpushTagsApi; -import com.jiaoguanyi.appstore.network.api.newapi.LogoImgApi; -import com.jiaoguanyi.appstore.network.api.newapi.MACAddressApi; -import com.jiaoguanyi.appstore.network.api.newapi.NewAppinsideWebApi; -import com.jiaoguanyi.appstore.network.api.newapi.ScreenLockStateApi; -import com.jiaoguanyi.appstore.network.api.newapi.SnTimeControl; -import com.jiaoguanyi.appstore.network.api.newapi.StudentsInfosApi; -import com.jiaoguanyi.appstore.network.api.newapi.TopAppControlApi; -import com.jiaoguanyi.appstore.network.api.newapi.UpdateDeviceInfoApi; -import com.jiaoguanyi.appstore.utils.Utils; +import com.mjsheng.myappstore.BuildConfig; +import com.mjsheng.myappstore.bean.Appground; +import com.mjsheng.myappstore.bean.BaseResponse; +import com.mjsheng.myappstore.bean.BrowserBookmarks; +import com.mjsheng.myappstore.bean.BrowserData; +import com.mjsheng.myappstore.bean.ForceDownloadBean; +import com.mjsheng.myappstore.bean.LogoImg; +import com.mjsheng.myappstore.bean.NetAndLaunchBean; +import com.mjsheng.myappstore.bean.NewAppground; +import com.mjsheng.myappstore.bean.StudentsInfo; +import com.mjsheng.myappstore.network.api.AppLimitApi; +import com.mjsheng.myappstore.network.api.BrankPicApi; +import com.mjsheng.myappstore.network.api.CategoryPicApi; +import com.mjsheng.myappstore.network.api.DeselectBrowserIDApi; +import com.mjsheng.myappstore.network.api.DeselectIDApi; +import com.mjsheng.myappstore.network.api.ForceDownloadApi; +import com.mjsheng.myappstore.network.api.NetAndLaunchApi; +import com.mjsheng.myappstore.network.api.ProjectPicApi; +import com.mjsheng.myappstore.network.api.RankAppApi; +import com.mjsheng.myappstore.network.api.SystemSettingApi; +import com.mjsheng.myappstore.network.api.UploadAppInfoApi; +import com.mjsheng.myappstore.network.api.newapi.AppinsideWebApi; +import com.mjsheng.myappstore.network.api.newapi.BrowserBookmarksApi; +import com.mjsheng.myappstore.network.api.newapi.BrowserListApi; +import com.mjsheng.myappstore.network.api.newapi.CheckTestUpdateApi; +import com.mjsheng.myappstore.network.api.newapi.CheckUpdateApi; +import com.mjsheng.myappstore.network.api.newapi.DesktopIconApi; +import com.mjsheng.myappstore.network.api.newapi.DevicesLockedStateApi; +import com.mjsheng.myappstore.network.api.newapi.GetBatchApi; +import com.mjsheng.myappstore.network.api.newapi.GetDesktopApi; +import com.mjsheng.myappstore.network.api.newapi.GetLockStateApi; +import com.mjsheng.myappstore.network.api.newapi.JpushTagsApi; +import com.mjsheng.myappstore.network.api.newapi.LogoImgApi; +import com.mjsheng.myappstore.network.api.newapi.MACAddressApi; +import com.mjsheng.myappstore.network.api.newapi.NewAppinsideWebApi; +import com.mjsheng.myappstore.network.api.newapi.ScreenLockStateApi; +import com.mjsheng.myappstore.network.api.newapi.SnTimeControl; +import com.mjsheng.myappstore.network.api.newapi.StudentsInfosApi; +import com.mjsheng.myappstore.network.api.newapi.TopAppControlApi; +import com.mjsheng.myappstore.network.api.newapi.UpdateDeviceInfoApi; +import com.mjsheng.myappstore.utils.Utils; import java.io.File; import java.util.List; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/network/HTTPInterface.java b/app/src/main/java/com/mjsheng/myappstore/network/HTTPInterface.java similarity index 97% rename from app/src/main/java/com/jiaoguanyi/appstore/network/HTTPInterface.java rename to app/src/main/java/com/mjsheng/myappstore/network/HTTPInterface.java index 7cde0c3..0abede2 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/network/HTTPInterface.java +++ b/app/src/main/java/com/mjsheng/myappstore/network/HTTPInterface.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.network; +package com.mjsheng.myappstore.network; import android.annotation.SuppressLint; import android.content.Context; @@ -16,26 +16,26 @@ import android.util.Log; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONException; import com.alibaba.fastjson.JSONObject; -import com.jiaoguanyi.appstore.utils.URLUtils; +import com.mjsheng.myappstore.utils.URLUtils; import com.lzy.okgo.OkGo; import com.lzy.okgo.callback.StringCallback; -import com.jiaoguanyi.appstore.base.BaseApplication; -import com.jiaoguanyi.appstore.bean.Appground; -import com.jiaoguanyi.appstore.bean.BaseResponse; -import com.jiaoguanyi.appstore.bean.NetAndLaunchBean; -import com.jiaoguanyi.appstore.bean.NetAndLaunchData; -import com.jiaoguanyi.appstore.jpush.TagAliasOperatorHelper; -import com.jiaoguanyi.appstore.manager.NetInterfaceManager; -import com.jiaoguanyi.appstore.network.api.newapi.SnTimeControl; -import com.jiaoguanyi.appstore.network.api.newapi.TopAppControlApi; -import com.jiaoguanyi.appstore.network.api.newapi.UpdateDeviceInfoApi; -import com.jiaoguanyi.appstore.server.MainService; -import com.jiaoguanyi.appstore.utils.ApkUtils; -import com.jiaoguanyi.appstore.utils.ForegroundAppUtil; -import com.jiaoguanyi.appstore.utils.Logger; -import com.jiaoguanyi.appstore.utils.SPUtils; -import com.jiaoguanyi.appstore.utils.TimeUtils; -import com.jiaoguanyi.appstore.utils.Utils; +import com.mjsheng.myappstore.base.BaseApplication; +import com.mjsheng.myappstore.bean.Appground; +import com.mjsheng.myappstore.bean.BaseResponse; +import com.mjsheng.myappstore.bean.NetAndLaunchBean; +import com.mjsheng.myappstore.bean.NetAndLaunchData; +import com.mjsheng.myappstore.jpush.TagAliasOperatorHelper; +import com.mjsheng.myappstore.manager.NetInterfaceManager; +import com.mjsheng.myappstore.network.api.newapi.SnTimeControl; +import com.mjsheng.myappstore.network.api.newapi.TopAppControlApi; +import com.mjsheng.myappstore.network.api.newapi.UpdateDeviceInfoApi; +import com.mjsheng.myappstore.server.MainService; +import com.mjsheng.myappstore.utils.ApkUtils; +import com.mjsheng.myappstore.utils.ForegroundAppUtil; +import com.mjsheng.myappstore.utils.Logger; +import com.mjsheng.myappstore.utils.SPUtils; +import com.mjsheng.myappstore.utils.TimeUtils; +import com.mjsheng.myappstore.utils.Utils; import java.io.IOException; import java.util.Arrays; @@ -51,8 +51,8 @@ import okhttp3.Call; import okhttp3.Response; import okhttp3.ResponseBody; -import static com.jiaoguanyi.appstore.jpush.TagAliasOperatorHelper.ACTION_SET; -import static com.jiaoguanyi.appstore.jpush.TagAliasOperatorHelper.sequence; +import static com.mjsheng.myappstore.jpush.TagAliasOperatorHelper.ACTION_SET; +import static com.mjsheng.myappstore.jpush.TagAliasOperatorHelper.sequence; public class HTTPInterface { // //获取我的设备接口 diff --git a/app/src/main/java/com/jiaoguanyi/appstore/network/URLAddress.java b/app/src/main/java/com/mjsheng/myappstore/network/URLAddress.java similarity index 96% rename from app/src/main/java/com/jiaoguanyi/appstore/network/URLAddress.java rename to app/src/main/java/com/mjsheng/myappstore/network/URLAddress.java index 00f4869..7db9e61 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/network/URLAddress.java +++ b/app/src/main/java/com/mjsheng/myappstore/network/URLAddress.java @@ -1,6 +1,6 @@ -package com.jiaoguanyi.appstore.network; +package com.mjsheng.myappstore.network; -import com.jiaoguanyi.appstore.manager.NetInterfaceManager; +import com.mjsheng.myappstore.manager.NetInterfaceManager; /** * @author Administrator diff --git a/app/src/main/java/com/jiaoguanyi/appstore/network/api/AppLimitApi.java b/app/src/main/java/com/mjsheng/myappstore/network/api/AppLimitApi.java similarity index 91% rename from app/src/main/java/com/jiaoguanyi/appstore/network/api/AppLimitApi.java rename to app/src/main/java/com/mjsheng/myappstore/network/api/AppLimitApi.java index 40ae7b6..5cbcd7c 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/network/api/AppLimitApi.java +++ b/app/src/main/java/com/mjsheng/myappstore/network/api/AppLimitApi.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.network.api; +package com.mjsheng.myappstore.network.api; import io.reactivex.Observable; import okhttp3.ResponseBody; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/network/api/BrankPicApi.java b/app/src/main/java/com/mjsheng/myappstore/network/api/BrankPicApi.java similarity index 82% rename from app/src/main/java/com/jiaoguanyi/appstore/network/api/BrankPicApi.java rename to app/src/main/java/com/mjsheng/myappstore/network/api/BrankPicApi.java index 62aa545..ca26fe0 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/network/api/BrankPicApi.java +++ b/app/src/main/java/com/mjsheng/myappstore/network/api/BrankPicApi.java @@ -1,6 +1,6 @@ -package com.jiaoguanyi.appstore.network.api; +package com.mjsheng.myappstore.network.api; -import com.jiaoguanyi.appstore.bean.CommonPicBean; +import com.mjsheng.myappstore.bean.CommonPicBean; import io.reactivex.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/network/api/CategoryPicApi.java b/app/src/main/java/com/mjsheng/myappstore/network/api/CategoryPicApi.java similarity index 82% rename from app/src/main/java/com/jiaoguanyi/appstore/network/api/CategoryPicApi.java rename to app/src/main/java/com/mjsheng/myappstore/network/api/CategoryPicApi.java index 5e1845c..d98adb5 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/network/api/CategoryPicApi.java +++ b/app/src/main/java/com/mjsheng/myappstore/network/api/CategoryPicApi.java @@ -1,6 +1,6 @@ -package com.jiaoguanyi.appstore.network.api; +package com.mjsheng.myappstore.network.api; -import com.jiaoguanyi.appstore.bean.CategoryPicBean; +import com.mjsheng.myappstore.bean.CategoryPicBean; import io.reactivex.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/network/api/DeselectBrowserIDApi.java b/app/src/main/java/com/mjsheng/myappstore/network/api/DeselectBrowserIDApi.java similarity index 91% rename from app/src/main/java/com/jiaoguanyi/appstore/network/api/DeselectBrowserIDApi.java rename to app/src/main/java/com/mjsheng/myappstore/network/api/DeselectBrowserIDApi.java index ff4904e..0aa10de 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/network/api/DeselectBrowserIDApi.java +++ b/app/src/main/java/com/mjsheng/myappstore/network/api/DeselectBrowserIDApi.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.network.api; +package com.mjsheng.myappstore.network.api; import io.reactivex.Observable; import okhttp3.ResponseBody; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/network/api/DeselectIDApi.java b/app/src/main/java/com/mjsheng/myappstore/network/api/DeselectIDApi.java similarity index 91% rename from app/src/main/java/com/jiaoguanyi/appstore/network/api/DeselectIDApi.java rename to app/src/main/java/com/mjsheng/myappstore/network/api/DeselectIDApi.java index bac0957..1ae69cf 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/network/api/DeselectIDApi.java +++ b/app/src/main/java/com/mjsheng/myappstore/network/api/DeselectIDApi.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.network.api; +package com.mjsheng.myappstore.network.api; import io.reactivex.Observable; import okhttp3.ResponseBody; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/network/api/ForceDownloadApi.java b/app/src/main/java/com/mjsheng/myappstore/network/api/ForceDownloadApi.java similarity index 81% rename from app/src/main/java/com/jiaoguanyi/appstore/network/api/ForceDownloadApi.java rename to app/src/main/java/com/mjsheng/myappstore/network/api/ForceDownloadApi.java index 6022a04..0d11d18 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/network/api/ForceDownloadApi.java +++ b/app/src/main/java/com/mjsheng/myappstore/network/api/ForceDownloadApi.java @@ -1,6 +1,6 @@ -package com.jiaoguanyi.appstore.network.api; +package com.mjsheng.myappstore.network.api; -import com.jiaoguanyi.appstore.bean.ForceDownloadBean; +import com.mjsheng.myappstore.bean.ForceDownloadBean; import io.reactivex.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/network/api/NetAndLaunchApi.java b/app/src/main/java/com/mjsheng/myappstore/network/api/NetAndLaunchApi.java similarity index 81% rename from app/src/main/java/com/jiaoguanyi/appstore/network/api/NetAndLaunchApi.java rename to app/src/main/java/com/mjsheng/myappstore/network/api/NetAndLaunchApi.java index 4a9686e..9f02b0e 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/network/api/NetAndLaunchApi.java +++ b/app/src/main/java/com/mjsheng/myappstore/network/api/NetAndLaunchApi.java @@ -1,6 +1,6 @@ -package com.jiaoguanyi.appstore.network.api; +package com.mjsheng.myappstore.network.api; -import com.jiaoguanyi.appstore.bean.NetAndLaunchBean; +import com.mjsheng.myappstore.bean.NetAndLaunchBean; import io.reactivex.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/network/api/ProjectPicApi.java b/app/src/main/java/com/mjsheng/myappstore/network/api/ProjectPicApi.java similarity index 83% rename from app/src/main/java/com/jiaoguanyi/appstore/network/api/ProjectPicApi.java rename to app/src/main/java/com/mjsheng/myappstore/network/api/ProjectPicApi.java index 31a77a2..f123db0 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/network/api/ProjectPicApi.java +++ b/app/src/main/java/com/mjsheng/myappstore/network/api/ProjectPicApi.java @@ -1,6 +1,6 @@ -package com.jiaoguanyi.appstore.network.api; +package com.mjsheng.myappstore.network.api; -import com.jiaoguanyi.appstore.bean.CommonPicBean; +import com.mjsheng.myappstore.bean.CommonPicBean; import io.reactivex.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/network/api/RankAppApi.java b/app/src/main/java/com/mjsheng/myappstore/network/api/RankAppApi.java similarity index 81% rename from app/src/main/java/com/jiaoguanyi/appstore/network/api/RankAppApi.java rename to app/src/main/java/com/mjsheng/myappstore/network/api/RankAppApi.java index 3a15195..6c6c3bd 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/network/api/RankAppApi.java +++ b/app/src/main/java/com/mjsheng/myappstore/network/api/RankAppApi.java @@ -1,6 +1,6 @@ -package com.jiaoguanyi.appstore.network.api; +package com.mjsheng.myappstore.network.api; -import com.jiaoguanyi.appstore.bean.AppInfoBean; +import com.mjsheng.myappstore.bean.AppInfoBean; import io.reactivex.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/network/api/SystemSettingApi.java b/app/src/main/java/com/mjsheng/myappstore/network/api/SystemSettingApi.java similarity index 91% rename from app/src/main/java/com/jiaoguanyi/appstore/network/api/SystemSettingApi.java rename to app/src/main/java/com/mjsheng/myappstore/network/api/SystemSettingApi.java index 0096c55..029d14f 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/network/api/SystemSettingApi.java +++ b/app/src/main/java/com/mjsheng/myappstore/network/api/SystemSettingApi.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.network.api; +package com.mjsheng.myappstore.network.api; import io.reactivex.Observable; import okhttp3.ResponseBody; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/network/api/UpdateApi.java b/app/src/main/java/com/mjsheng/myappstore/network/api/UpdateApi.java similarity index 91% rename from app/src/main/java/com/jiaoguanyi/appstore/network/api/UpdateApi.java rename to app/src/main/java/com/mjsheng/myappstore/network/api/UpdateApi.java index 6a7e502..ef9b4a3 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/network/api/UpdateApi.java +++ b/app/src/main/java/com/mjsheng/myappstore/network/api/UpdateApi.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.network.api; +package com.mjsheng.myappstore.network.api; import io.reactivex.Observable; import okhttp3.ResponseBody; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/network/api/UploadAppInfoApi.java b/app/src/main/java/com/mjsheng/myappstore/network/api/UploadAppInfoApi.java similarity index 91% rename from app/src/main/java/com/jiaoguanyi/appstore/network/api/UploadAppInfoApi.java rename to app/src/main/java/com/mjsheng/myappstore/network/api/UploadAppInfoApi.java index ef84ddc..65149f1 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/network/api/UploadAppInfoApi.java +++ b/app/src/main/java/com/mjsheng/myappstore/network/api/UploadAppInfoApi.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.network.api; +package com.mjsheng.myappstore.network.api; import io.reactivex.Observable; import okhttp3.ResponseBody; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/AppinsideWebApi.java b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/AppinsideWebApi.java similarity index 66% rename from app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/AppinsideWebApi.java rename to app/src/main/java/com/mjsheng/myappstore/network/api/newapi/AppinsideWebApi.java index ea1606d..485e0f0 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/AppinsideWebApi.java +++ b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/AppinsideWebApi.java @@ -1,9 +1,9 @@ -package com.jiaoguanyi.appstore.network.api.newapi; +package com.mjsheng.myappstore.network.api.newapi; -import com.jiaoguanyi.appstore.bean.Appground; -import com.jiaoguanyi.appstore.bean.BaseResponse; -import com.jiaoguanyi.appstore.network.URLAddress; +import com.mjsheng.myappstore.bean.Appground; +import com.mjsheng.myappstore.bean.BaseResponse; +import com.mjsheng.myappstore.network.URLAddress; import java.util.List; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/BrowserBookmarksApi.java b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/BrowserBookmarksApi.java similarity index 64% rename from app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/BrowserBookmarksApi.java rename to app/src/main/java/com/mjsheng/myappstore/network/api/newapi/BrowserBookmarksApi.java index 5a20768..6477ef8 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/BrowserBookmarksApi.java +++ b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/BrowserBookmarksApi.java @@ -1,8 +1,8 @@ -package com.jiaoguanyi.appstore.network.api.newapi; +package com.mjsheng.myappstore.network.api.newapi; -import com.jiaoguanyi.appstore.bean.BaseResponse; -import com.jiaoguanyi.appstore.bean.BrowserBookmarks; -import com.jiaoguanyi.appstore.network.URLAddress; +import com.mjsheng.myappstore.bean.BaseResponse; +import com.mjsheng.myappstore.bean.BrowserBookmarks; +import com.mjsheng.myappstore.network.URLAddress; import io.reactivex.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/BrowserListApi.java b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/BrowserListApi.java similarity index 64% rename from app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/BrowserListApi.java rename to app/src/main/java/com/mjsheng/myappstore/network/api/newapi/BrowserListApi.java index b4b8635..7422995 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/BrowserListApi.java +++ b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/BrowserListApi.java @@ -1,8 +1,8 @@ -package com.jiaoguanyi.appstore.network.api.newapi; +package com.mjsheng.myappstore.network.api.newapi; -import com.jiaoguanyi.appstore.bean.BaseResponse; -import com.jiaoguanyi.appstore.bean.BrowserData; -import com.jiaoguanyi.appstore.network.URLAddress; +import com.mjsheng.myappstore.bean.BaseResponse; +import com.mjsheng.myappstore.bean.BrowserData; +import com.mjsheng.myappstore.network.URLAddress; import io.reactivex.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/CheckTestUpdateApi.java b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/CheckTestUpdateApi.java similarity index 62% rename from app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/CheckTestUpdateApi.java rename to app/src/main/java/com/mjsheng/myappstore/network/api/newapi/CheckTestUpdateApi.java index a32b791..70e02cb 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/CheckTestUpdateApi.java +++ b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/CheckTestUpdateApi.java @@ -1,7 +1,7 @@ -package com.jiaoguanyi.appstore.network.api.newapi; +package com.mjsheng.myappstore.network.api.newapi; -import com.jiaoguanyi.appstore.bean.BaseResponse; -import com.jiaoguanyi.appstore.network.URLAddress; +import com.mjsheng.myappstore.bean.BaseResponse; +import com.mjsheng.myappstore.network.URLAddress; import io.reactivex.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/CheckUpdateApi.java b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/CheckUpdateApi.java similarity index 67% rename from app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/CheckUpdateApi.java rename to app/src/main/java/com/mjsheng/myappstore/network/api/newapi/CheckUpdateApi.java index 58e87f6..9804246 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/CheckUpdateApi.java +++ b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/CheckUpdateApi.java @@ -1,7 +1,7 @@ -package com.jiaoguanyi.appstore.network.api.newapi; +package com.mjsheng.myappstore.network.api.newapi; -import com.jiaoguanyi.appstore.bean.BaseResponse; -import com.jiaoguanyi.appstore.network.URLAddress; +import com.mjsheng.myappstore.bean.BaseResponse; +import com.mjsheng.myappstore.network.URLAddress; import io.reactivex.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/DesktopIconApi.java b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/DesktopIconApi.java similarity index 69% rename from app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/DesktopIconApi.java rename to app/src/main/java/com/mjsheng/myappstore/network/api/newapi/DesktopIconApi.java index d1c0c42..6da936b 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/DesktopIconApi.java +++ b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/DesktopIconApi.java @@ -1,7 +1,7 @@ -package com.jiaoguanyi.appstore.network.api.newapi; +package com.mjsheng.myappstore.network.api.newapi; -import com.jiaoguanyi.appstore.bean.BaseResponse; -import com.jiaoguanyi.appstore.network.URLAddress; +import com.mjsheng.myappstore.bean.BaseResponse; +import com.mjsheng.myappstore.network.URLAddress; import io.reactivex.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/DevicesLockedStateApi.java b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/DevicesLockedStateApi.java similarity index 67% rename from app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/DevicesLockedStateApi.java rename to app/src/main/java/com/mjsheng/myappstore/network/api/newapi/DevicesLockedStateApi.java index 7836608..af09dee 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/DevicesLockedStateApi.java +++ b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/DevicesLockedStateApi.java @@ -1,7 +1,7 @@ -package com.jiaoguanyi.appstore.network.api.newapi; +package com.mjsheng.myappstore.network.api.newapi; -import com.jiaoguanyi.appstore.bean.BaseResponse; -import com.jiaoguanyi.appstore.network.URLAddress; +import com.mjsheng.myappstore.bean.BaseResponse; +import com.mjsheng.myappstore.network.URLAddress; import io.reactivex.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/GetBatchApi.java b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/GetBatchApi.java similarity index 85% rename from app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/GetBatchApi.java rename to app/src/main/java/com/mjsheng/myappstore/network/api/newapi/GetBatchApi.java index 2cf1886..d7a7f0e 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/GetBatchApi.java +++ b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/GetBatchApi.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.network.api.newapi; +package com.mjsheng.myappstore.network.api.newapi; import io.reactivex.Observable; import okhttp3.ResponseBody; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/GetDesktopApi.java b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/GetDesktopApi.java similarity index 72% rename from app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/GetDesktopApi.java rename to app/src/main/java/com/mjsheng/myappstore/network/api/newapi/GetDesktopApi.java index cefe5be..44f0cd8 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/GetDesktopApi.java +++ b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/GetDesktopApi.java @@ -1,6 +1,6 @@ -package com.jiaoguanyi.appstore.network.api.newapi; +package com.mjsheng.myappstore.network.api.newapi; -import com.jiaoguanyi.appstore.network.URLAddress; +import com.mjsheng.myappstore.network.URLAddress; import io.reactivex.Observable; import okhttp3.ResponseBody; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/GetLockStateApi.java b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/GetLockStateApi.java similarity index 89% rename from app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/GetLockStateApi.java rename to app/src/main/java/com/mjsheng/myappstore/network/api/newapi/GetLockStateApi.java index e49629e..c88704f 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/GetLockStateApi.java +++ b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/GetLockStateApi.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.network.api.newapi; +package com.mjsheng.myappstore.network.api.newapi; import io.reactivex.Observable; import okhttp3.ResponseBody; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/JpushTagsApi.java b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/JpushTagsApi.java similarity index 61% rename from app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/JpushTagsApi.java rename to app/src/main/java/com/mjsheng/myappstore/network/api/newapi/JpushTagsApi.java index 3a2cc53..6ca5a72 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/JpushTagsApi.java +++ b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/JpushTagsApi.java @@ -1,7 +1,7 @@ -package com.jiaoguanyi.appstore.network.api.newapi; +package com.mjsheng.myappstore.network.api.newapi; -import com.jiaoguanyi.appstore.bean.BaseResponse; -import com.jiaoguanyi.appstore.network.URLAddress; +import com.mjsheng.myappstore.bean.BaseResponse; +import com.mjsheng.myappstore.network.URLAddress; import io.reactivex.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/LogoImgApi.java b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/LogoImgApi.java similarity index 55% rename from app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/LogoImgApi.java rename to app/src/main/java/com/mjsheng/myappstore/network/api/newapi/LogoImgApi.java index 330f077..bc0b4fd 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/LogoImgApi.java +++ b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/LogoImgApi.java @@ -1,8 +1,8 @@ -package com.jiaoguanyi.appstore.network.api.newapi; +package com.mjsheng.myappstore.network.api.newapi; -import com.jiaoguanyi.appstore.bean.BaseResponse; -import com.jiaoguanyi.appstore.bean.LogoImg; -import com.jiaoguanyi.appstore.network.URLAddress; +import com.mjsheng.myappstore.bean.BaseResponse; +import com.mjsheng.myappstore.bean.LogoImg; +import com.mjsheng.myappstore.network.URLAddress; import io.reactivex.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/MACAddressApi.java b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/MACAddressApi.java similarity index 78% rename from app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/MACAddressApi.java rename to app/src/main/java/com/mjsheng/myappstore/network/api/newapi/MACAddressApi.java index 20a4d38..41116f2 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/MACAddressApi.java +++ b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/MACAddressApi.java @@ -1,7 +1,7 @@ -package com.jiaoguanyi.appstore.network.api.newapi; +package com.mjsheng.myappstore.network.api.newapi; -import com.jiaoguanyi.appstore.bean.BaseResponse; -import com.jiaoguanyi.appstore.network.URLAddress; +import com.mjsheng.myappstore.bean.BaseResponse; +import com.mjsheng.myappstore.network.URLAddress; import io.reactivex.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/NewAppinsideWebApi.java b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/NewAppinsideWebApi.java similarity index 66% rename from app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/NewAppinsideWebApi.java rename to app/src/main/java/com/mjsheng/myappstore/network/api/newapi/NewAppinsideWebApi.java index 2f23f04..f2d34b6 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/NewAppinsideWebApi.java +++ b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/NewAppinsideWebApi.java @@ -1,9 +1,9 @@ -package com.jiaoguanyi.appstore.network.api.newapi; +package com.mjsheng.myappstore.network.api.newapi; -import com.jiaoguanyi.appstore.bean.BaseResponse; -import com.jiaoguanyi.appstore.bean.NewAppground; -import com.jiaoguanyi.appstore.network.URLAddress; +import com.mjsheng.myappstore.bean.BaseResponse; +import com.mjsheng.myappstore.bean.NewAppground; +import com.mjsheng.myappstore.network.URLAddress; import java.util.List; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/ScreenLockStateApi.java b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/ScreenLockStateApi.java similarity index 63% rename from app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/ScreenLockStateApi.java rename to app/src/main/java/com/mjsheng/myappstore/network/api/newapi/ScreenLockStateApi.java index e5c8428..11d3589 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/ScreenLockStateApi.java +++ b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/ScreenLockStateApi.java @@ -1,7 +1,7 @@ -package com.jiaoguanyi.appstore.network.api.newapi; +package com.mjsheng.myappstore.network.api.newapi; -import com.jiaoguanyi.appstore.bean.BaseResponse; -import com.jiaoguanyi.appstore.network.URLAddress; +import com.mjsheng.myappstore.bean.BaseResponse; +import com.mjsheng.myappstore.network.URLAddress; import io.reactivex.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/SnTimeControl.java b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/SnTimeControl.java similarity index 62% rename from app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/SnTimeControl.java rename to app/src/main/java/com/mjsheng/myappstore/network/api/newapi/SnTimeControl.java index d48153b..a51106d 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/SnTimeControl.java +++ b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/SnTimeControl.java @@ -1,7 +1,7 @@ -package com.jiaoguanyi.appstore.network.api.newapi; +package com.mjsheng.myappstore.network.api.newapi; -import com.jiaoguanyi.appstore.bean.BaseResponse; -import com.jiaoguanyi.appstore.network.URLAddress; +import com.mjsheng.myappstore.bean.BaseResponse; +import com.mjsheng.myappstore.network.URLAddress; import io.reactivex.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/StudentsInfosApi.java b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/StudentsInfosApi.java similarity index 61% rename from app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/StudentsInfosApi.java rename to app/src/main/java/com/mjsheng/myappstore/network/api/newapi/StudentsInfosApi.java index bc01670..ddd0c41 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/StudentsInfosApi.java +++ b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/StudentsInfosApi.java @@ -1,8 +1,8 @@ -package com.jiaoguanyi.appstore.network.api.newapi; +package com.mjsheng.myappstore.network.api.newapi; -import com.jiaoguanyi.appstore.bean.BaseResponse; -import com.jiaoguanyi.appstore.bean.StudentsInfo; -import com.jiaoguanyi.appstore.network.URLAddress; +import com.mjsheng.myappstore.bean.BaseResponse; +import com.mjsheng.myappstore.bean.StudentsInfo; +import com.mjsheng.myappstore.network.URLAddress; import io.reactivex.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/TopAppControlApi.java b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/TopAppControlApi.java similarity index 62% rename from app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/TopAppControlApi.java rename to app/src/main/java/com/mjsheng/myappstore/network/api/newapi/TopAppControlApi.java index 879acd6..6bca241 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/TopAppControlApi.java +++ b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/TopAppControlApi.java @@ -1,7 +1,7 @@ -package com.jiaoguanyi.appstore.network.api.newapi; +package com.mjsheng.myappstore.network.api.newapi; -import com.jiaoguanyi.appstore.bean.BaseResponse; -import com.jiaoguanyi.appstore.network.URLAddress; +import com.mjsheng.myappstore.bean.BaseResponse; +import com.mjsheng.myappstore.network.URLAddress; import io.reactivex.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/UpdateDeviceInfoApi.java b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/UpdateDeviceInfoApi.java similarity index 90% rename from app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/UpdateDeviceInfoApi.java rename to app/src/main/java/com/mjsheng/myappstore/network/api/newapi/UpdateDeviceInfoApi.java index 9dd5c32..9543f03 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/UpdateDeviceInfoApi.java +++ b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/UpdateDeviceInfoApi.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.network.api.newapi; +package com.mjsheng.myappstore.network.api.newapi; import io.reactivex.Observable; import okhttp3.ResponseBody; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/receiver/BootReceiver.java b/app/src/main/java/com/mjsheng/myappstore/receiver/BootReceiver.java similarity index 83% rename from app/src/main/java/com/jiaoguanyi/appstore/receiver/BootReceiver.java rename to app/src/main/java/com/mjsheng/myappstore/receiver/BootReceiver.java index b815a00..c4b3253 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/receiver/BootReceiver.java +++ b/app/src/main/java/com/mjsheng/myappstore/receiver/BootReceiver.java @@ -1,14 +1,16 @@ -package com.jiaoguanyi.appstore.receiver; +package com.mjsheng.myappstore.receiver; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; +import android.provider.Settings; +import android.text.TextUtils; import android.util.Log; -import com.jiaoguanyi.appstore.network.HTTPInterface; -import com.jiaoguanyi.appstore.server.GuardService; -import com.jiaoguanyi.appstore.server.MainService; -import com.jiaoguanyi.appstore.server.StepService; +import com.mjsheng.myappstore.network.HTTPInterface; +import com.mjsheng.myappstore.server.GuardService; +import com.mjsheng.myappstore.server.MainService; +import com.mjsheng.myappstore.server.StepService; public class BootReceiver extends BroadcastReceiver { private String TAG = BootReceiver.class.getSimpleName(); @@ -18,6 +20,10 @@ public class BootReceiver extends BroadcastReceiver { public void onReceive(Context context, Intent intent) { Log.e(TAG, "action:" + intent.getAction()); if (intent.getAction().equals(Intent.ACTION_BOOT_COMPLETED)) { + String packageList = Settings.System.getString(context.getContentResolver(), "qch_launcher_icon_app"); + if (TextUtils.isEmpty(packageList)){ + Settings.System.putString(context.getContentResolver(), "qch_launcher_icon_app", ""); + } HTTPInterface.updateDeviceInfo(context); startService(context); } else if ( @@ -48,7 +54,7 @@ public class BootReceiver extends BroadcastReceiver { ) { //除了USER_PRESENT应该都收不到 // Log.e("fht", "BootReceiver MSG:" + intent.getAction()); -// startService(context); + startService(context); } diff --git a/app/src/main/java/com/jiaoguanyi/appstore/receiver/MyJPushReceiver.java b/app/src/main/java/com/mjsheng/myappstore/receiver/MyJPushReceiver.java similarity index 96% rename from app/src/main/java/com/jiaoguanyi/appstore/receiver/MyJPushReceiver.java rename to app/src/main/java/com/mjsheng/myappstore/receiver/MyJPushReceiver.java index 6da4713..666f16b 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/receiver/MyJPushReceiver.java +++ b/app/src/main/java/com/mjsheng/myappstore/receiver/MyJPushReceiver.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.receiver; +package com.mjsheng.myappstore.receiver; import android.app.ActivityManager; import android.bluetooth.BluetoothAdapter; @@ -21,25 +21,25 @@ import com.amap.api.location.AMapLocation; import com.amap.api.location.AMapLocationClient; import com.amap.api.location.AMapLocationListener; import com.blankj.utilcode.util.PathUtils; -import com.jiaoguanyi.appstore.utils.JGYUtils; +import com.mjsheng.myappstore.utils.JGYUtils; import com.lzy.okgo.OkGo; import com.lzy.okgo.callback.StringCallback; -import com.jiaoguanyi.appstore.base.BaseApplication; -import com.jiaoguanyi.appstore.comm.CommonDatas; -import com.jiaoguanyi.appstore.manager.AmapManager; -import com.jiaoguanyi.appstore.manager.NetInterfaceManager; -import com.jiaoguanyi.appstore.network.HTTPInterface; -import com.jiaoguanyi.appstore.network.URLAddress; -import com.jiaoguanyi.appstore.server.MainService; -import com.jiaoguanyi.appstore.utils.ApkUtils; -import com.jiaoguanyi.appstore.utils.CmdUtil; -import com.jiaoguanyi.appstore.utils.ForegroundAppUtil; -import com.jiaoguanyi.appstore.utils.MySQLData; -import com.jiaoguanyi.appstore.utils.SPUtils; -import com.jiaoguanyi.appstore.utils.SaveListUtils; -import com.jiaoguanyi.appstore.utils.ServiceAliveUtils; -import com.jiaoguanyi.appstore.utils.SysSettingUtils; -import com.jiaoguanyi.appstore.utils.Utils; +import com.mjsheng.myappstore.base.BaseApplication; +import com.mjsheng.myappstore.comm.CommonDatas; +import com.mjsheng.myappstore.manager.AmapManager; +import com.mjsheng.myappstore.manager.NetInterfaceManager; +import com.mjsheng.myappstore.network.HTTPInterface; +import com.mjsheng.myappstore.network.URLAddress; +import com.mjsheng.myappstore.server.MainService; +import com.mjsheng.myappstore.utils.ApkUtils; +import com.mjsheng.myappstore.utils.CmdUtil; +import com.mjsheng.myappstore.utils.ForegroundAppUtil; +import com.mjsheng.myappstore.utils.MySQLData; +import com.mjsheng.myappstore.utils.SPUtils; +import com.mjsheng.myappstore.utils.SaveListUtils; +import com.mjsheng.myappstore.utils.ServiceAliveUtils; +import com.mjsheng.myappstore.utils.SysSettingUtils; +import com.mjsheng.myappstore.utils.Utils; import org.json.JSONException; import org.json.JSONObject; @@ -713,7 +713,7 @@ public class MyJPushReceiver extends BroadcastReceiver { switch (Integer.valueOf(jSONObject.optInt("code")).intValue()) { case 200: str1 = jSONObject.getJSONObject("data").optString("result"); - writeAppPackageList(str1); + JGYUtils.getInstance().writeAppPackageList(mContext, str1); return; } Log.e("mjsheng", "getAppLimitApi---code is -200"); @@ -1113,33 +1113,6 @@ public class MyJPushReceiver extends BroadcastReceiver { } } - private void writeAppPackageList(String result) { - String appstore = "com.jiaoguanyi.appstore"; - String store = "com.jiaoguanyi.store"; - String jgy1 = "com.uiuios.jgy1"; - String jgy2 = "com.uiuios.jgy2"; - if (!TextUtils.isEmpty(result)) { - Log.e("writeAppPackageList", result); - if (!result.contains(appstore)) { - result = result + "," + appstore; - } - if (!result.contains(store)) { - result = result + "," + store; - } - if (!result.contains(jgy1)) { - result = result + "," + jgy1; - } - if (!result.contains(jgy2)) { - result = result + "," + jgy2; - } - Settings.System.putString(mContext.getContentResolver(), "qch_app_forbid", result); - Log.e("mjsheng", "qch_app_forbid " + result); - - } else { - Log.e("mjsheng", "writeAppPackageList is null:"); - - } - } private void writeDeselectBrowserIDtoSystem(String s) { // if (!TextUtils.isEmpty(s)) { diff --git a/app/src/main/java/com/jiaoguanyi/appstore/receiver/NewAppReceiver.java b/app/src/main/java/com/mjsheng/myappstore/receiver/NewAppReceiver.java similarity index 91% rename from app/src/main/java/com/jiaoguanyi/appstore/receiver/NewAppReceiver.java rename to app/src/main/java/com/mjsheng/myappstore/receiver/NewAppReceiver.java index d0f0605..a5a11e4 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/receiver/NewAppReceiver.java +++ b/app/src/main/java/com/mjsheng/myappstore/receiver/NewAppReceiver.java @@ -1,18 +1,17 @@ -package com.jiaoguanyi.appstore.receiver; +package com.mjsheng.myappstore.receiver; import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.os.Build; -import android.provider.Settings; import android.text.TextUtils; import android.util.Log; -import com.jiaoguanyi.appstore.BuildConfig; -import com.jiaoguanyi.appstore.network.HTTPInterface; -import com.jiaoguanyi.appstore.utils.ApkUtils; -import com.jiaoguanyi.appstore.utils.SaveListUtils; +import com.mjsheng.myappstore.BuildConfig; +import com.mjsheng.myappstore.network.HTTPInterface; +import com.mjsheng.myappstore.utils.ApkUtils; +import com.mjsheng.myappstore.utils.SaveListUtils; import java.util.concurrent.TimeUnit; @@ -59,10 +58,9 @@ public class NewAppReceiver extends BroadcastReceiver { break; } Log.e(TAG, "sendAppInfo: " + state + packageName); - String result = Settings.System.getString(context.getContentResolver(), "qch_app_forbid"); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { if (!APPSTORE.equals(packageName) || !BuildConfig.APPLICATION_ID.equals(packageName)) { - ApkUtils.addShortcut(context, result); + ApkUtils.addShortcut(context); ApkUtils.RemoveTask(context, packageName); } Intent bootIntent = new Intent(BootReceiver.BOOT_COMPLETED); diff --git a/app/src/main/java/com/jiaoguanyi/appstore/server/GuardService.java b/app/src/main/java/com/mjsheng/myappstore/server/GuardService.java similarity index 96% rename from app/src/main/java/com/jiaoguanyi/appstore/server/GuardService.java rename to app/src/main/java/com/mjsheng/myappstore/server/GuardService.java index 778d73f..90645d0 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/server/GuardService.java +++ b/app/src/main/java/com/mjsheng/myappstore/server/GuardService.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.server; +package com.mjsheng.myappstore.server; /** * 作者 mjsheng @@ -31,19 +31,19 @@ import com.arialyy.annotations.Download; import com.arialyy.aria.core.Aria; import com.arialyy.aria.core.download.DownloadEntity; import com.arialyy.aria.core.task.DownloadTask; -import com.jiaoguanyi.appstore.utils.JGYUtils; -import com.jiaoguanyi.appstore.utils.XAPKUtils; +import com.mjsheng.myappstore.utils.JGYUtils; +import com.mjsheng.myappstore.utils.XAPKUtils; import com.lzy.okgo.OkGo; import com.lzy.okgo.callback.StringCallback; -import com.jiaoguanyi.appstore.KeepAliveConnection; -import com.jiaoguanyi.appstore.base.BaseApplication; -import com.jiaoguanyi.appstore.manager.NetInterfaceManager; -import com.jiaoguanyi.appstore.network.URLAddress; -import com.jiaoguanyi.appstore.utils.ApkUtils; -import com.jiaoguanyi.appstore.utils.SPUtils; -import com.jiaoguanyi.appstore.utils.ServiceAliveUtils; -import com.jiaoguanyi.appstore.utils.ToastUtil; -import com.jiaoguanyi.appstore.utils.Utils; +import com.mjsheng.myappstore.KeepAliveConnection; +import com.mjsheng.myappstore.base.BaseApplication; +import com.mjsheng.myappstore.manager.NetInterfaceManager; +import com.mjsheng.myappstore.network.URLAddress; +import com.mjsheng.myappstore.utils.ApkUtils; +import com.mjsheng.myappstore.utils.SPUtils; +import com.mjsheng.myappstore.utils.ServiceAliveUtils; +import com.mjsheng.myappstore.utils.ToastUtil; +import com.mjsheng.myappstore.utils.Utils; import java.io.File; import java.io.FileOutputStream; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/server/InitJpushServer.java b/app/src/main/java/com/mjsheng/myappstore/server/InitJpushServer.java similarity index 95% rename from app/src/main/java/com/jiaoguanyi/appstore/server/InitJpushServer.java rename to app/src/main/java/com/mjsheng/myappstore/server/InitJpushServer.java index f47988a..405d25d 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/server/InitJpushServer.java +++ b/app/src/main/java/com/mjsheng/myappstore/server/InitJpushServer.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.server; +package com.mjsheng.myappstore.server; import android.annotation.SuppressLint; import android.app.Service; @@ -30,38 +30,39 @@ import android.widget.TextView; import com.alibaba.fastjson.JSON; import com.arialyy.aria.core.Aria; import com.blankj.utilcode.util.PathUtils; +import com.mjsheng.myappstore.utils.JGYUtils; import com.lzy.okgo.OkGo; import com.lzy.okgo.callback.StringCallback; -import com.jiaoguanyi.appstore.BuildConfig; -import com.jiaoguanyi.appstore.base.BaseApplication; -import com.jiaoguanyi.appstore.R; -import com.jiaoguanyi.appstore.bean.Batch; -import com.jiaoguanyi.appstore.bean.ForceDownloadBean; -import com.jiaoguanyi.appstore.bean.ForceDownloadData; -import com.jiaoguanyi.appstore.bean.LzyResponse; -import com.jiaoguanyi.appstore.bean.NetAndLaunchBean; -import com.jiaoguanyi.appstore.bean.NetAndLaunchData; -import com.jiaoguanyi.appstore.bean.StudentsInfo; -import com.jiaoguanyi.appstore.comm.CommonDatas; -import com.jiaoguanyi.appstore.jpush.TagAliasOperatorHelper; -import com.jiaoguanyi.appstore.manager.NetInterfaceManager; -import com.jiaoguanyi.appstore.network.HTTPInterface; -import com.jiaoguanyi.appstore.network.api.AppLimitApi; -import com.jiaoguanyi.appstore.network.api.DeselectBrowserIDApi; -import com.jiaoguanyi.appstore.network.api.DeselectIDApi; -import com.jiaoguanyi.appstore.network.api.ForceDownloadApi; -import com.jiaoguanyi.appstore.network.api.NetAndLaunchApi; -import com.jiaoguanyi.appstore.network.api.SystemSettingApi; -import com.jiaoguanyi.appstore.network.api.newapi.GetBatchApi; -import com.jiaoguanyi.appstore.utils.ApkUtils; -import com.jiaoguanyi.appstore.network.URLAddress; -import com.jiaoguanyi.appstore.utils.ForegroundAppUtil; -import com.jiaoguanyi.appstore.utils.MySQLData; -import com.jiaoguanyi.appstore.utils.SPUtils; -import com.jiaoguanyi.appstore.utils.SaveListUtils; -import com.jiaoguanyi.appstore.utils.SysSettingUtils; -import com.jiaoguanyi.appstore.utils.TimeUtils; -import com.jiaoguanyi.appstore.utils.Utils; +import com.mjsheng.myappstore.BuildConfig; +import com.mjsheng.myappstore.base.BaseApplication; +import com.mjsheng.myappstore.R; +import com.mjsheng.myappstore.bean.Batch; +import com.mjsheng.myappstore.bean.ForceDownloadBean; +import com.mjsheng.myappstore.bean.ForceDownloadData; +import com.mjsheng.myappstore.bean.LzyResponse; +import com.mjsheng.myappstore.bean.NetAndLaunchBean; +import com.mjsheng.myappstore.bean.NetAndLaunchData; +import com.mjsheng.myappstore.bean.StudentsInfo; +import com.mjsheng.myappstore.comm.CommonDatas; +import com.mjsheng.myappstore.jpush.TagAliasOperatorHelper; +import com.mjsheng.myappstore.manager.NetInterfaceManager; +import com.mjsheng.myappstore.network.HTTPInterface; +import com.mjsheng.myappstore.network.api.AppLimitApi; +import com.mjsheng.myappstore.network.api.DeselectBrowserIDApi; +import com.mjsheng.myappstore.network.api.DeselectIDApi; +import com.mjsheng.myappstore.network.api.ForceDownloadApi; +import com.mjsheng.myappstore.network.api.NetAndLaunchApi; +import com.mjsheng.myappstore.network.api.SystemSettingApi; +import com.mjsheng.myappstore.network.api.newapi.GetBatchApi; +import com.mjsheng.myappstore.utils.ApkUtils; +import com.mjsheng.myappstore.network.URLAddress; +import com.mjsheng.myappstore.utils.ForegroundAppUtil; +import com.mjsheng.myappstore.utils.MySQLData; +import com.mjsheng.myappstore.utils.SPUtils; +import com.mjsheng.myappstore.utils.SaveListUtils; +import com.mjsheng.myappstore.utils.SysSettingUtils; +import com.mjsheng.myappstore.utils.TimeUtils; +import com.mjsheng.myappstore.utils.Utils; import org.json.JSONException; import org.json.JSONObject; @@ -85,8 +86,8 @@ import okhttp3.ResponseBody; import rx.Observable; import rx.functions.Action1; -import static com.jiaoguanyi.appstore.jpush.TagAliasOperatorHelper.ACTION_SET; -import static com.jiaoguanyi.appstore.jpush.TagAliasOperatorHelper.sequence; +import static com.mjsheng.myappstore.jpush.TagAliasOperatorHelper.ACTION_SET; +import static com.mjsheng.myappstore.jpush.TagAliasOperatorHelper.sequence; /** * 作者 mjsheng @@ -706,7 +707,7 @@ public class InitJpushServer extends Service { case 200: JSONObject data = jsonObject.getJSONObject("data"); String result = data.optString("result"); - writeAppPackageList(result); + JGYUtils.getInstance().writeAppPackageList(InitJpushServer.this,result); break; default: Log.e("mjhseng", "getAppLimitApi---code is -200"); @@ -730,36 +731,6 @@ public class InitJpushServer extends Service { }); } - private void writeAppPackageList(String result) { - ApkUtils.addShortcut(this, result);//开机之后添加图标到桌面 - String appstore = "com.jiaoguanyi.appstore"; - String store = "com.jiaoguanyi.store"; - String jgy1 = "com.uiuios.jgy1"; - String jgy2 = "com.uiuios.jgy2"; - if (!TextUtils.isEmpty(result)) { - Log.e("writeAppPackageList", result); - if (!result.contains(appstore)) { - result = result + "," + appstore; - } - if (!result.contains(store)) { - result = result + "," + store; - } - if (!result.contains(jgy1)) { - result = result + "," + jgy1; - } - if (!result.contains(jgy2)) { - result = result + "," + jgy2; - } - Settings.System.putString(getContentResolver(), "qch_app_forbid", result); - Log.e("mjsheng", "qch_app_forbid :" + result); - } else { - Log.e("mjsheng", "writeAppPackageList is null:"); - } - int locked = Settings.System.getInt(this.getContentResolver(), "qch_unlock_ipad", 1); - if (locked == 0) { - getDeviceBatch(result); - } - } private void getDeviceBatch(final String result) { diff --git a/app/src/main/java/com/jiaoguanyi/appstore/server/JWebSocketClient.java b/app/src/main/java/com/mjsheng/myappstore/server/JWebSocketClient.java similarity index 95% rename from app/src/main/java/com/jiaoguanyi/appstore/server/JWebSocketClient.java rename to app/src/main/java/com/mjsheng/myappstore/server/JWebSocketClient.java index b0739ac..0957f74 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/server/JWebSocketClient.java +++ b/app/src/main/java/com/mjsheng/myappstore/server/JWebSocketClient.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.server; +package com.mjsheng.myappstore.server; import android.util.Log; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/server/MainService.java b/app/src/main/java/com/mjsheng/myappstore/server/MainService.java similarity index 95% rename from app/src/main/java/com/jiaoguanyi/appstore/server/MainService.java rename to app/src/main/java/com/mjsheng/myappstore/server/MainService.java index 89f5852..d794329 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/server/MainService.java +++ b/app/src/main/java/com/mjsheng/myappstore/server/MainService.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.server; +package com.mjsheng.myappstore.server; import android.annotation.SuppressLint; import android.app.Service; @@ -22,15 +22,15 @@ import android.widget.Button; import android.widget.TextView; import com.google.gson.JsonObject; -import com.jiaoguanyi.appstore.R; -import com.jiaoguanyi.appstore.activity.MainActivity; -import com.jiaoguanyi.appstore.activity.MainContact; -import com.jiaoguanyi.appstore.activity.MainPresenter; -import com.jiaoguanyi.appstore.utils.ApkUtils; -import com.jiaoguanyi.appstore.utils.ForegroundAppUtil; -import com.jiaoguanyi.appstore.utils.SaveListUtils; -import com.jiaoguanyi.appstore.utils.SysSettingUtils; -import com.jiaoguanyi.appstore.utils.TimeUtils; +import com.mjsheng.myappstore.R; +import com.mjsheng.myappstore.activity.MainActivity; +import com.mjsheng.myappstore.activity.MainContact; +import com.mjsheng.myappstore.activity.MainPresenter; +import com.mjsheng.myappstore.utils.ApkUtils; +import com.mjsheng.myappstore.utils.ForegroundAppUtil; +import com.mjsheng.myappstore.utils.SaveListUtils; +import com.mjsheng.myappstore.utils.SysSettingUtils; +import com.mjsheng.myappstore.utils.TimeUtils; import cn.jpush.android.api.JPushInterface; @@ -92,8 +92,7 @@ public class MainService extends Service implements MainContact.MainView { } private void addShortcut(){ - String result = Settings.System.getString(getContentResolver(), "qch_app_forbid"); - ApkUtils.addShortcut(MainService.this, result); + ApkUtils.addShortcut(MainService.this); } private void registerReceivers() { diff --git a/app/src/main/java/com/jiaoguanyi/appstore/server/MyDownloadService.java b/app/src/main/java/com/mjsheng/myappstore/server/MyDownloadService.java similarity index 99% rename from app/src/main/java/com/jiaoguanyi/appstore/server/MyDownloadService.java rename to app/src/main/java/com/mjsheng/myappstore/server/MyDownloadService.java index 1dd6639..189c90e 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/server/MyDownloadService.java +++ b/app/src/main/java/com/mjsheng/myappstore/server/MyDownloadService.java @@ -1,5 +1,5 @@ -package com.jiaoguanyi.appstore.server; +package com.mjsheng.myappstore.server; import android.app.Service; import android.content.Intent; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/server/StepService.java b/app/src/main/java/com/mjsheng/myappstore/server/StepService.java similarity index 96% rename from app/src/main/java/com/jiaoguanyi/appstore/server/StepService.java rename to app/src/main/java/com/mjsheng/myappstore/server/StepService.java index d914c07..79cd361 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/server/StepService.java +++ b/app/src/main/java/com/mjsheng/myappstore/server/StepService.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.server; +package com.mjsheng.myappstore.server; /** * 作者 mjsheng @@ -19,10 +19,10 @@ import android.util.Log; import androidx.annotation.Nullable; -import com.jiaoguanyi.appstore.KeepAliveConnection; -import com.jiaoguanyi.appstore.manager.NetInterfaceManager; -import com.jiaoguanyi.appstore.utils.ServiceAliveUtils; -import com.jiaoguanyi.appstore.utils.Utils; +import com.mjsheng.myappstore.KeepAliveConnection; +import com.mjsheng.myappstore.manager.NetInterfaceManager; +import com.mjsheng.myappstore.utils.ServiceAliveUtils; +import com.mjsheng.myappstore.utils.Utils; import org.java_websocket.handshake.ServerHandshake; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/statistics/AppInformation.java b/app/src/main/java/com/mjsheng/myappstore/statistics/AppInformation.java similarity index 98% rename from app/src/main/java/com/jiaoguanyi/appstore/statistics/AppInformation.java rename to app/src/main/java/com/mjsheng/myappstore/statistics/AppInformation.java index 71114b1..3741b90 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/statistics/AppInformation.java +++ b/app/src/main/java/com/mjsheng/myappstore/statistics/AppInformation.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.statistics; +package com.mjsheng.myappstore.statistics; import android.app.usage.UsageStats; import android.content.Context; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/statistics/StatisticsInfo.java b/app/src/main/java/com/mjsheng/myappstore/statistics/StatisticsInfo.java similarity index 98% rename from app/src/main/java/com/jiaoguanyi/appstore/statistics/StatisticsInfo.java rename to app/src/main/java/com/mjsheng/myappstore/statistics/StatisticsInfo.java index 84f92b2..11cadf8 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/statistics/StatisticsInfo.java +++ b/app/src/main/java/com/mjsheng/myappstore/statistics/StatisticsInfo.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.statistics; +package com.mjsheng.myappstore.statistics; import android.annotation.TargetApi; import android.app.usage.UsageEvents; @@ -13,7 +13,7 @@ import java.util.Calendar; import java.util.HashMap; import java.util.List; -import static com.jiaoguanyi.appstore.statistics.AppInformation.bootTime; +import static com.mjsheng.myappstore.statistics.AppInformation.bootTime; public class StatisticsInfo { diff --git a/app/src/main/java/com/jiaoguanyi/appstore/utils/ApkUtils.java b/app/src/main/java/com/mjsheng/myappstore/utils/ApkUtils.java similarity index 98% rename from app/src/main/java/com/jiaoguanyi/appstore/utils/ApkUtils.java rename to app/src/main/java/com/mjsheng/myappstore/utils/ApkUtils.java index b9a3fb5..0596da8 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/utils/ApkUtils.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/ApkUtils.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.utils; +package com.mjsheng.myappstore.utils; import android.app.ActivityManager; import android.app.PendingIntent; @@ -31,11 +31,11 @@ import com.alibaba.fastjson.JSONObject; import com.arialyy.aria.core.Aria; import com.arialyy.aria.core.download.DownloadEntity; import com.google.gson.Gson; -import com.jiaoguanyi.appstore.BuildConfig; -import com.jiaoguanyi.appstore.R; -import com.jiaoguanyi.appstore.bean.UploadAppInfo; -import com.jiaoguanyi.appstore.manager.NetInterfaceManager; -import com.jiaoguanyi.appstore.network.api.UploadAppInfoApi; +import com.mjsheng.myappstore.BuildConfig; +import com.mjsheng.myappstore.R; +import com.mjsheng.myappstore.bean.UploadAppInfo; +import com.mjsheng.myappstore.manager.NetInterfaceManager; +import com.mjsheng.myappstore.network.api.UploadAppInfoApi; import java.io.BufferedReader; import java.io.DataOutputStream; @@ -993,13 +993,14 @@ public class ApkUtils { } } - public static void addShortcut(Context context, String packageList) { - Log.e("addShortcut", "addShortcut: " + packageList); - if (TextUtils.isEmpty(packageList)) { + public static void addShortcut(Context context) { + String result = Settings.System.getString(context.getContentResolver(), "only_jgy_shortcut_list"); + if (TextUtils.isEmpty(result)) { Settings.System.putString(context.getContentResolver(), "qch_launcher_icon_app", ""); return; } - String[] stringList = packageList.split(","); + Log.e("addShortcut", "addShortcut: " + result); + String[] stringList = result.split(","); List packages = new ArrayList<>(Arrays.asList(stringList)); String installedList = ""; for (String s : packages) { diff --git a/app/src/main/java/com/jiaoguanyi/appstore/utils/AppsManagerUtils.java b/app/src/main/java/com/mjsheng/myappstore/utils/AppsManagerUtils.java similarity index 97% rename from app/src/main/java/com/jiaoguanyi/appstore/utils/AppsManagerUtils.java rename to app/src/main/java/com/mjsheng/myappstore/utils/AppsManagerUtils.java index 80c1948..0656ae0 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/utils/AppsManagerUtils.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/AppsManagerUtils.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.utils; +package com.mjsheng.myappstore.utils; import android.content.Context; import android.content.Intent; @@ -8,8 +8,8 @@ import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.ResolveInfo; -import com.jiaoguanyi.appstore.bean.AppUpdateInfo; -import com.jiaoguanyi.appstore.bean.LocalAppInfo; +import com.mjsheng.myappstore.bean.AppUpdateInfo; +import com.mjsheng.myappstore.bean.LocalAppInfo; import java.io.File; import java.util.ArrayList; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/utils/BootUtils.java b/app/src/main/java/com/mjsheng/myappstore/utils/BootUtils.java similarity index 63% rename from app/src/main/java/com/jiaoguanyi/appstore/utils/BootUtils.java rename to app/src/main/java/com/mjsheng/myappstore/utils/BootUtils.java index 9065817..5fe05e0 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/utils/BootUtils.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/BootUtils.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.utils; +package com.mjsheng.myappstore.utils; public class BootUtils { public static void main() { diff --git a/app/src/main/java/com/jiaoguanyi/appstore/utils/CmdUtil.java b/app/src/main/java/com/mjsheng/myappstore/utils/CmdUtil.java similarity index 98% rename from app/src/main/java/com/jiaoguanyi/appstore/utils/CmdUtil.java rename to app/src/main/java/com/mjsheng/myappstore/utils/CmdUtil.java index 9c8f098..66d5a57 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/utils/CmdUtil.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/CmdUtil.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.utils; +package com.mjsheng.myappstore.utils; import android.text.TextUtils; import android.util.Log; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/utils/ExampleUtil.java b/app/src/main/java/com/mjsheng/myappstore/utils/ExampleUtil.java similarity index 99% rename from app/src/main/java/com/jiaoguanyi/appstore/utils/ExampleUtil.java rename to app/src/main/java/com/mjsheng/myappstore/utils/ExampleUtil.java index 86e6f38..2d6e022 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/utils/ExampleUtil.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/ExampleUtil.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.utils; +package com.mjsheng.myappstore.utils; import android.content.Context; import android.content.pm.ApplicationInfo; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/utils/FileUtils.java b/app/src/main/java/com/mjsheng/myappstore/utils/FileUtils.java similarity index 88% rename from app/src/main/java/com/jiaoguanyi/appstore/utils/FileUtils.java rename to app/src/main/java/com/mjsheng/myappstore/utils/FileUtils.java index c0bed50..a74f61d 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/utils/FileUtils.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/FileUtils.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.utils; +package com.mjsheng.myappstore.utils; import java.io.File; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/utils/ForegroundAppUtil.java b/app/src/main/java/com/mjsheng/myappstore/utils/ForegroundAppUtil.java similarity index 99% rename from app/src/main/java/com/jiaoguanyi/appstore/utils/ForegroundAppUtil.java rename to app/src/main/java/com/mjsheng/myappstore/utils/ForegroundAppUtil.java index 4dbd5b1..4e05883 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/utils/ForegroundAppUtil.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/ForegroundAppUtil.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.utils; +package com.mjsheng.myappstore.utils; import android.app.ActivityManager; import android.app.usage.UsageStats; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/utils/InstallResultReceiver.java b/app/src/main/java/com/mjsheng/myappstore/utils/InstallResultReceiver.java similarity index 98% rename from app/src/main/java/com/jiaoguanyi/appstore/utils/InstallResultReceiver.java rename to app/src/main/java/com/mjsheng/myappstore/utils/InstallResultReceiver.java index 130ee3e..3d74484 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/utils/InstallResultReceiver.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/InstallResultReceiver.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.utils; +package com.mjsheng.myappstore.utils; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/utils/JGYUtils.java b/app/src/main/java/com/mjsheng/myappstore/utils/JGYUtils.java similarity index 95% rename from app/src/main/java/com/jiaoguanyi/appstore/utils/JGYUtils.java rename to app/src/main/java/com/mjsheng/myappstore/utils/JGYUtils.java index 932decd..a9cd620 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/utils/JGYUtils.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/JGYUtils.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.utils; +package com.mjsheng.myappstore.utils; import android.annotation.SuppressLint; import android.content.Context; @@ -10,7 +10,6 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.os.BatteryManager; import android.os.Build; -import android.os.Environment; import android.os.PowerManager; import android.provider.Settings; import android.text.TextUtils; @@ -20,17 +19,15 @@ import com.alibaba.fastjson.JSONObject; import com.blankj.utilcode.util.FileUtils; import com.blankj.utilcode.util.PathUtils; import com.google.gson.JsonObject; -import com.jiaoguanyi.appstore.BuildConfig; -import com.jiaoguanyi.appstore.base.BaseApplication; -import com.jiaoguanyi.appstore.bean.Appground; -import com.jiaoguanyi.appstore.bean.BaseResponse; -import com.jiaoguanyi.appstore.bean.ForceDownloadData; -import com.jiaoguanyi.appstore.bean.NetAndLaunchBean; -import com.jiaoguanyi.appstore.bean.NetAndLaunchData; -import com.jiaoguanyi.appstore.bean.NewAppground; -import com.jiaoguanyi.appstore.comm.CommonDatas; - -import org.w3c.dom.Text; +import com.mjsheng.myappstore.BuildConfig; +import com.mjsheng.myappstore.base.BaseApplication; +import com.mjsheng.myappstore.bean.Appground; +import com.mjsheng.myappstore.bean.BaseResponse; +import com.mjsheng.myappstore.bean.ForceDownloadData; +import com.mjsheng.myappstore.bean.NetAndLaunchBean; +import com.mjsheng.myappstore.bean.NetAndLaunchData; +import com.mjsheng.myappstore.bean.NewAppground; +import com.mjsheng.myappstore.comm.CommonDatas; import java.io.File; import java.io.FileOutputStream; @@ -427,32 +424,33 @@ public class JGYUtils { SysSettingUtils.setSystemSetting(mContext, data); } - public void writeAppPackageList(Context context, String result) { - ApkUtils.addShortcut(context, result); + public void writeAppPackageList(Context context, String packageList) { + StringBuilder stringBuilder = new StringBuilder(packageList); + ApkUtils.addShortcut(context); String appstore = "com.jiaoguanyi.appstore"; String store = "com.jiaoguanyi.store"; String info = "com.info.sn"; // String iflytek = "com.estrongs.android.pop"; String jgy1 = "com.uiuios.jgy1"; String jgy2 = "com.uiuios.jgy2"; - if (!TextUtils.isEmpty(result)) { - Log.e("writeAppPackageList", "result: " + result); - if (!result.contains(appstore)) { - result = result + "," + appstore; + if (!TextUtils.isEmpty(packageList)) { + Log.e("writeAppPackageList", "result: is empty"); + if (!packageList.contains(appstore)) { + stringBuilder.append(",").append(appstore); } - if (!result.contains(store)) { - result = result + "," + store; + if (!packageList.contains(store)) { + stringBuilder.append(",").append(store); } - if (!result.contains(jgy1)) { - result = result + "," + jgy1; + if (!packageList.contains(jgy1)) { + stringBuilder.append(",").append(jgy1); } - if (!result.contains(jgy2)) { - result = result + "," + jgy2; + if (!packageList.contains(jgy2)) { + stringBuilder.append(",").append(jgy2); } - if (!result.contains(info)) { - result = result + "," + info; + if (!packageList.contains(info)) { + stringBuilder.append(",").append(info); } - boolean b = Settings.System.putString(mContext.getContentResolver(), "qch_app_forbid", result); + boolean b = Settings.System.putString(mContext.getContentResolver(), "qch_app_forbid", stringBuilder.toString()); Log.e("mjsheng", "qch_app_forbid is :" + b + Settings.System.getString(mContext.getContentResolver(), "qch_app_forbid")); } else { diff --git a/app/src/main/java/com/jiaoguanyi/appstore/utils/JsonUtils.java b/app/src/main/java/com/mjsheng/myappstore/utils/JsonUtils.java similarity index 96% rename from app/src/main/java/com/jiaoguanyi/appstore/utils/JsonUtils.java rename to app/src/main/java/com/mjsheng/myappstore/utils/JsonUtils.java index fdc2861..5e6b533 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/utils/JsonUtils.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/JsonUtils.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.utils; +package com.mjsheng.myappstore.utils; import java.io.File; import java.io.FileInputStream; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/utils/Logger.java b/app/src/main/java/com/mjsheng/myappstore/utils/Logger.java similarity index 90% rename from app/src/main/java/com/jiaoguanyi/appstore/utils/Logger.java rename to app/src/main/java/com/mjsheng/myappstore/utils/Logger.java index eae8bf0..2236640 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/utils/Logger.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/Logger.java @@ -1,8 +1,8 @@ -package com.jiaoguanyi.appstore.utils; +package com.mjsheng.myappstore.utils; import android.util.Log; -import com.jiaoguanyi.appstore.BuildConfig; +import com.mjsheng.myappstore.BuildConfig; /** * Created by efan on 2017/4/13. diff --git a/app/src/main/java/com/jiaoguanyi/appstore/utils/MySQLData.java b/app/src/main/java/com/mjsheng/myappstore/utils/MySQLData.java similarity index 97% rename from app/src/main/java/com/jiaoguanyi/appstore/utils/MySQLData.java rename to app/src/main/java/com/mjsheng/myappstore/utils/MySQLData.java index 3c641f5..7e307d3 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/utils/MySQLData.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/MySQLData.java @@ -1,13 +1,13 @@ -package com.jiaoguanyi.appstore.utils; +package com.mjsheng.myappstore.utils; import android.content.ContentValues; import android.content.Context; import android.database.Cursor; -import com.jiaoguanyi.appstore.comm.CommonDatas; -import com.jiaoguanyi.appstore.database.DBHelper; -import com.jiaoguanyi.appstore.database.DBSqlBuilder; +import com.mjsheng.myappstore.comm.CommonDatas; +import com.mjsheng.myappstore.database.DBHelper; +import com.mjsheng.myappstore.database.DBSqlBuilder; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/utils/NetworkUtils.java b/app/src/main/java/com/mjsheng/myappstore/utils/NetworkUtils.java similarity index 96% rename from app/src/main/java/com/jiaoguanyi/appstore/utils/NetworkUtils.java rename to app/src/main/java/com/mjsheng/myappstore/utils/NetworkUtils.java index 9a259b0..00b8ae0 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/utils/NetworkUtils.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/NetworkUtils.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.utils; +package com.mjsheng.myappstore.utils; import android.content.Context; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/utils/SPUtils.java b/app/src/main/java/com/mjsheng/myappstore/utils/SPUtils.java similarity index 98% rename from app/src/main/java/com/jiaoguanyi/appstore/utils/SPUtils.java rename to app/src/main/java/com/mjsheng/myappstore/utils/SPUtils.java index 6ea6bf1..b4f8ae7 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/utils/SPUtils.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/SPUtils.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.utils; +package com.mjsheng.myappstore.utils; import android.content.Context; import android.content.SharedPreferences; @@ -8,7 +8,7 @@ import android.graphics.drawable.BitmapDrawable; import android.util.Base64; import android.widget.ImageView; -import com.jiaoguanyi.appstore.comm.CommonDatas; +import com.mjsheng.myappstore.comm.CommonDatas; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/utils/SaveListUtils.java b/app/src/main/java/com/mjsheng/myappstore/utils/SaveListUtils.java similarity index 97% rename from app/src/main/java/com/jiaoguanyi/appstore/utils/SaveListUtils.java rename to app/src/main/java/com/mjsheng/myappstore/utils/SaveListUtils.java index e31b174..fed4a54 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/utils/SaveListUtils.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/SaveListUtils.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.utils; +package com.mjsheng.myappstore.utils; import android.content.Context; import android.provider.Settings; @@ -7,7 +7,7 @@ import android.util.Log; import com.blankj.utilcode.util.SPStaticUtils; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.jiaoguanyi.appstore.comm.CommonDatas; +import com.mjsheng.myappstore.comm.CommonDatas; import java.lang.reflect.Type; import java.util.ArrayList; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/utils/ServiceAliveUtils.java b/app/src/main/java/com/mjsheng/myappstore/utils/ServiceAliveUtils.java similarity index 95% rename from app/src/main/java/com/jiaoguanyi/appstore/utils/ServiceAliveUtils.java rename to app/src/main/java/com/mjsheng/myappstore/utils/ServiceAliveUtils.java index e0fe12f..8a2535f 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/utils/ServiceAliveUtils.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/ServiceAliveUtils.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.utils; +package com.mjsheng.myappstore.utils; import android.app.ActivityManager; import android.content.Context; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/utils/SpacesItemDecoration.java b/app/src/main/java/com/mjsheng/myappstore/utils/SpacesItemDecoration.java similarity index 96% rename from app/src/main/java/com/jiaoguanyi/appstore/utils/SpacesItemDecoration.java rename to app/src/main/java/com/mjsheng/myappstore/utils/SpacesItemDecoration.java index bb9dbbe..aee971c 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/utils/SpacesItemDecoration.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/SpacesItemDecoration.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.utils; +package com.mjsheng.myappstore.utils; import android.graphics.Rect; import androidx.recyclerview.widget.RecyclerView; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/utils/SysSettingUtils.java b/app/src/main/java/com/mjsheng/myappstore/utils/SysSettingUtils.java similarity index 99% rename from app/src/main/java/com/jiaoguanyi/appstore/utils/SysSettingUtils.java rename to app/src/main/java/com/mjsheng/myappstore/utils/SysSettingUtils.java index 3dde8aa..e8bb7cf 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/utils/SysSettingUtils.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/SysSettingUtils.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.utils; +package com.mjsheng.myappstore.utils; import android.app.StatusBarManager; import android.bluetooth.BluetoothAdapter; @@ -12,7 +12,7 @@ import android.util.Log; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.jiaoguanyi.appstore.BuildConfig; +import com.mjsheng.myappstore.BuildConfig; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/utils/SystemUtils.java b/app/src/main/java/com/mjsheng/myappstore/utils/SystemUtils.java similarity index 94% rename from app/src/main/java/com/jiaoguanyi/appstore/utils/SystemUtils.java rename to app/src/main/java/com/mjsheng/myappstore/utils/SystemUtils.java index 60fa0db..37cd640 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/utils/SystemUtils.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/SystemUtils.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.utils; +package com.mjsheng.myappstore.utils; import android.app.ActivityManager; import android.content.Context; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/utils/TimeUtils.java b/app/src/main/java/com/mjsheng/myappstore/utils/TimeUtils.java similarity index 98% rename from app/src/main/java/com/jiaoguanyi/appstore/utils/TimeUtils.java rename to app/src/main/java/com/mjsheng/myappstore/utils/TimeUtils.java index 6e80c54..95c438f 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/utils/TimeUtils.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/TimeUtils.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.utils; +package com.mjsheng.myappstore.utils; import android.content.Context; import android.content.Intent; @@ -6,7 +6,7 @@ import androidx.annotation.NonNull; import android.text.TextUtils; -import com.jiaoguanyi.appstore.server.MainService; +import com.mjsheng.myappstore.server.MainService; import java.text.DateFormat; import java.text.ParseException; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/utils/ToastUtil.java b/app/src/main/java/com/mjsheng/myappstore/utils/ToastUtil.java similarity index 97% rename from app/src/main/java/com/jiaoguanyi/appstore/utils/ToastUtil.java rename to app/src/main/java/com/mjsheng/myappstore/utils/ToastUtil.java index 1eabe68..233996e 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/utils/ToastUtil.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/ToastUtil.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.utils; +package com.mjsheng.myappstore.utils; import android.annotation.SuppressLint; import android.content.Context; @@ -8,7 +8,7 @@ import android.os.Looper; import android.util.Log; import android.widget.Toast; -import com.jiaoguanyi.appstore.BuildConfig; +import com.mjsheng.myappstore.BuildConfig; /** diff --git a/app/src/main/java/com/jiaoguanyi/appstore/utils/URLUtils.java b/app/src/main/java/com/mjsheng/myappstore/utils/URLUtils.java similarity index 98% rename from app/src/main/java/com/jiaoguanyi/appstore/utils/URLUtils.java rename to app/src/main/java/com/mjsheng/myappstore/utils/URLUtils.java index e4466c4..e9a2712 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/utils/URLUtils.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/URLUtils.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.utils; +package com.mjsheng.myappstore.utils; import android.content.Context; import android.os.Build; @@ -7,8 +7,6 @@ import android.text.TextUtils; import android.util.Log; import android.webkit.WebSettings; -import com.jiaoguanyi.appstore.activity.SplashActivity; - import java.io.IOException; import java.net.URI; import java.util.ArrayList; @@ -25,7 +23,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.Disposable; import io.reactivex.schedulers.Schedulers; import okhttp3.Call; -import okhttp3.Callback; import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/utils/Utils.java b/app/src/main/java/com/mjsheng/myappstore/utils/Utils.java similarity index 99% rename from app/src/main/java/com/jiaoguanyi/appstore/utils/Utils.java rename to app/src/main/java/com/mjsheng/myappstore/utils/Utils.java index 1d8599f..266de46 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/utils/Utils.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/Utils.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.utils; +package com.mjsheng.myappstore.utils; import android.annotation.SuppressLint; import android.app.ActivityManager; @@ -57,10 +57,10 @@ import com.google.zxing.WriterException; import com.google.zxing.common.BitMatrix; import com.google.zxing.qrcode.QRCodeWriter; import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; -import com.jiaoguanyi.appstore.BuildConfig; -import com.jiaoguanyi.appstore.R; -import com.jiaoguanyi.appstore.base.BaseApplication; -import com.jiaoguanyi.appstore.comm.CommonDatas; +import com.mjsheng.myappstore.BuildConfig; +import com.mjsheng.myappstore.R; +import com.mjsheng.myappstore.base.BaseApplication; +import com.mjsheng.myappstore.comm.CommonDatas; import java.io.BufferedReader; import java.io.DataOutputStream; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/utils/XAPKUtils.java b/app/src/main/java/com/mjsheng/myappstore/utils/XAPKUtils.java similarity index 99% rename from app/src/main/java/com/jiaoguanyi/appstore/utils/XAPKUtils.java rename to app/src/main/java/com/mjsheng/myappstore/utils/XAPKUtils.java index a505312..a163480 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/utils/XAPKUtils.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/XAPKUtils.java @@ -1,4 +1,4 @@ -package com.jiaoguanyi.appstore.utils; +package com.mjsheng.myappstore.utils; import android.app.PendingIntent; import android.content.Context; @@ -17,8 +17,8 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.jiaoguanyi.appstore.bean.Expansions; -import com.jiaoguanyi.appstore.bean.SplitApks; +import com.mjsheng.myappstore.bean.Expansions; +import com.mjsheng.myappstore.bean.SplitApks; import org.zeroturnaround.zip.ZipUtil; diff --git a/app/src/main/res/layout-land/activity_home.xml b/app/src/main/res/layout-land/activity_home.xml index 09b8d31..5c26bed 100644 --- a/app/src/main/res/layout-land/activity_home.xml +++ b/app/src/main/res/layout-land/activity_home.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context="com.jiaoguanyi.appstore.activity.SplashActivity"> + tools:context="com.mjsheng.myappstore.activity.HomeActivity"> + tools:context="com.mjsheng.myappstore.activity.TopActivity"> + tools:context="com.mjsheng.myappstore.activity.HomeActivity"> + tools:context="com.mjsheng.myappstore.activity.TopActivity">