From 96d9f21b2bc1e2d0addbbd1545860eb7d38c4070 Mon Sep 17 00:00:00 2001 From: Fanhuitong <981964879@qq.com> Date: Sat, 11 Feb 2023 20:54:59 +0800 Subject: [PATCH] =?UTF-8?q?version:1.1=20fix:=20update:=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 98 ++------------ app/keystore/TeclastMTK12.jks | Bin 0 -> 2553 bytes app/keystore/TeclastUserDebug.jks | Bin 2897 -> 0 bytes app/keystore/mtkAndroid12.keystore | Bin 2701 -> 0 bytes app/keystore/xueshibaoos.jks | Bin 2552 -> 0 bytes app/keystore/zhanxun.keystore | Bin 2617 -> 0 bytes .../ExampleInstrumentedTest.java | 4 +- app/src/main/AndroidManifest.xml | 106 ++++++++++----- .../KeepAliveConnection.aidl | 2 +- .../java/com/uiui/appstore/base/BaseView.java | 4 - .../TextCode/MessageWhat.java | 2 +- .../activity/AboutActivity.java | 8 +- .../activity/ClassAppActivity.java | 16 +-- .../activity/CopyrightActivity.java | 6 +- .../activity/DetailsActivity.java | 34 ++--- .../activity/DownloadManagerActivity.java | 8 +- .../activity/HintActivity.java | 7 +- .../activity/KindDetailActivity.java | 19 +-- .../activity/LocalManagerActivity.java | 23 +--- .../activity/MainActivity.java | 37 +++-- .../activity/ManagerAppActivity.java | 6 +- .../activity/MoreAppActivity.java | 18 +-- .../activity/PrivacyPolicyActivity.java | 6 +- .../activity/SearcherActivity.java | 17 ++- .../activity/UserAgreementActivity.java | 6 +- .../adapter/AppAdapter.java | 19 ++- .../adapter/BannerViewHolder.java | 6 +- .../adapter/ClassAdapter.java | 6 +- .../adapter/DownloadManagerAdapter.java | 10 +- .../adapter/ImageAdapter.java | 4 +- .../adapter/KindAdapter.java | 8 +- .../adapter/LocalAppAdapter.java | 14 +- .../adapter/ShowImageAdapter.java | 6 +- .../adapter/UpdateAppAdapter.java | 6 +- .../base/BaseActivity.java | 4 +- .../base/BaseApplication.java | 84 ++++++++---- .../base/BaseFragment.java | 4 +- .../base/BasePresenter.java | 2 +- .../com/uiui/zyappstore/base/BaseView.java | 4 + .../base/LazyLoadFragment.java | 2 +- .../base/RefreshManager.java | 2 +- .../bean/AppClassBean.java | 2 +- .../bean/AppDateInfo.java | 2 +- .../bean/AppDownloadInfo.java | 2 +- .../bean/AppInfo.java | 2 +- .../bean/AppInfos.java | 2 +- .../{appstore => zyappstore}/bean/Banner.java | 2 +- .../bean/BannerImage.java | 2 +- .../bean/BaseResponse.java | 2 +- .../bean/BatchID.java | 2 +- .../bean/GlideCircleWithBorder.java | 4 +- .../bean/ImageUrl.java | 2 +- .../{appstore => zyappstore}/bean/Kind.java | 2 +- .../bean/LocalApp.java | 2 +- .../bean/UpdateAppInfo.java | 2 +- .../bean/UserInfo.java | 2 +- .../common/BuikdConf.java | 2 +- .../common/CommonDatas.java | 2 +- .../disklrucache/CacheHelper.java | 2 +- .../disklrucache/Utils.java | 2 +- .../fragment/FeaturedFragment.java | 40 +++--- .../fragment/KindFragment.java | 12 +- .../fragment/ManageFragment.java | 22 +-- .../fragment/RankFragment.java | 19 +-- .../gson/GsonUtils.java | 2 +- .../gson/IntegerDefault0Adapter.java | 2 +- .../gson/NullStringToEmptyAdapterFactory.java | 2 +- .../helper/CustomSnapHelper.java | 2 +- .../image/ImageLoader.java | 4 +- .../manager/ConnectManager.java | 4 +- .../manager/ConnectMode.java | 2 +- .../network/HTTPInterface.java | 12 +- .../network/NetInterfaceManager.java | 74 ++++++---- .../network/UrlAddress.java | 4 +- .../network/api/AdminAppApi.java | 8 +- .../network/api/AdminAppClassApi.java | 8 +- .../network/api/BannerImage.java | 8 +- .../network/api/ClassAppApi.java | 8 +- .../network/api/DownloadApp.java | 6 +- .../network/api/GetBanner.java | 8 +- .../network/api/NewestAppUpdate.java | 8 +- .../network/api/QueryAllApp.java | 8 +- .../network/api/QueryPackageApp.java | 8 +- .../network/api/SNInfo.java | 8 +- .../network/api/SearchAdminAppApi.java | 8 +- .../network/api/SearchAppApi.java | 8 +- .../interceptor/RepeatRequestInterceptor.java | 6 +- .../com/uiui/zyappstore/push/PushManager.java | 85 ++++++++++++ .../push/alipush/AliMessageIntentService.java | 99 ++++++++++++++ .../push/alipush/AliyunMessageReceiver.java | 116 ++++++++++++++++ .../push}/tpush/Constants.java | 2 +- .../push}/tpush/MessageReceiver.java | 49 ++----- .../push}/tpush/common/DBOpenHelper.java | 2 +- .../tpush/common/NotificationService.java | 4 +- .../push}/tpush/po/XGNotification.java | 2 +- .../receiver/AppManagerReceiver.java | 18 +-- .../receiver/BootReceiver.java | 12 +- .../receiver/InstallResultReceiver.java | 4 +- .../receiver/NewAppReceiver.java | 5 +- .../service/DownloadService.java} | 4 +- .../service/GuardService.java | 24 ++-- .../service/StepService.java | 12 +- .../service/main/MainSContact.java | 6 +- .../service/main/MainSPresenter.java | 4 +- .../service/main/MainService.java | 16 +-- .../utils/ApkUtils.java | 16 +-- .../utils/DensityUtil.java | 2 +- .../utils/FileUtils.java | 2 +- .../utils/JGYUtils.java | 47 +++++-- .../utils/LogUtils.java | 4 +- .../utils/MD5Util.java | 2 +- .../utils/SPUtils.java | 4 +- .../utils/ServiceAliveUtils.java | 8 +- .../utils/StatusBarUtil.java | 2 +- .../utils/StorageUtils.java | 2 +- .../utils/TimeUtils.java | 2 +- .../utils/ToastUtil.java | 4 +- .../{appstore => zyappstore}/utils/Utils.java | 127 +++++++++++++++--- .../view/CornerImageView.kt | 2 +- .../view/HorizontalItemDecoration.java | 2 +- .../view/NumberProgressBar.java | 4 +- .../res/layout-land/item_download_manager.xml | 2 +- app/src/main/res/layout-land/item_net.xml | 2 +- .../res/layout-port/item_download_manager.xml | 2 +- app/src/main/res/layout-port/item_net.xml | 2 +- .../main/res/layout/activity_manager_app.xml | 2 +- .../ExampleUnitTest.java | 2 +- app/tpns-configs.json | 2 +- build.gradle | 7 +- settings.gradle | 2 +- 130 files changed, 1013 insertions(+), 653 deletions(-) create mode 100644 app/keystore/TeclastMTK12.jks delete mode 100644 app/keystore/TeclastUserDebug.jks delete mode 100644 app/keystore/mtkAndroid12.keystore delete mode 100644 app/keystore/xueshibaoos.jks delete mode 100644 app/keystore/zhanxun.keystore rename app/src/androidTest/java/com/uiui/{appstore => zyappstore}/ExampleInstrumentedTest.java (86%) rename app/src/main/aidl/com/uiui/{appstore => zyappstore}/KeepAliveConnection.aidl (81%) delete mode 100644 app/src/main/java/com/uiui/appstore/base/BaseView.java rename app/src/main/java/com/uiui/{appstore => zyappstore}/TextCode/MessageWhat.java (66%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/activity/AboutActivity.java (90%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/activity/ClassAppActivity.java (91%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/activity/CopyrightActivity.java (74%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/activity/DetailsActivity.java (94%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/activity/DownloadManagerActivity.java (94%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/activity/HintActivity.java (91%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/activity/KindDetailActivity.java (85%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/activity/LocalManagerActivity.java (81%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/activity/MainActivity.java (92%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/activity/ManagerAppActivity.java (81%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/activity/MoreAppActivity.java (92%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/activity/PrivacyPolicyActivity.java (96%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/activity/SearcherActivity.java (95%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/activity/UserAgreementActivity.java (96%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/adapter/AppAdapter.java (96%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/adapter/BannerViewHolder.java (83%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/adapter/ClassAdapter.java (93%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/adapter/DownloadManagerAdapter.java (98%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/adapter/ImageAdapter.java (95%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/adapter/KindAdapter.java (95%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/adapter/LocalAppAdapter.java (92%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/adapter/ShowImageAdapter.java (92%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/adapter/UpdateAppAdapter.java (98%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/base/BaseActivity.java (98%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/base/BaseApplication.java (72%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/base/BaseFragment.java (95%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/base/BasePresenter.java (76%) create mode 100644 app/src/main/java/com/uiui/zyappstore/base/BaseView.java rename app/src/main/java/com/uiui/{appstore => zyappstore}/base/LazyLoadFragment.java (98%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/base/RefreshManager.java (97%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/bean/AppClassBean.java (94%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/bean/AppDateInfo.java (99%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/bean/AppDownloadInfo.java (98%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/bean/AppInfo.java (99%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/bean/AppInfos.java (99%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/bean/Banner.java (95%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/bean/BannerImage.java (95%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/bean/BaseResponse.java (93%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/bean/BatchID.java (94%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/bean/GlideCircleWithBorder.java (98%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/bean/ImageUrl.java (85%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/bean/Kind.java (96%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/bean/LocalApp.java (98%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/bean/UpdateAppInfo.java (98%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/bean/UserInfo.java (98%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/common/BuikdConf.java (67%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/common/CommonDatas.java (88%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/disklrucache/CacheHelper.java (99%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/disklrucache/Utils.java (98%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/fragment/FeaturedFragment.java (97%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/fragment/KindFragment.java (94%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/fragment/ManageFragment.java (86%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/fragment/RankFragment.java (85%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/gson/GsonUtils.java (99%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/gson/IntegerDefault0Adapter.java (96%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/gson/NullStringToEmptyAdapterFactory.java (97%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/helper/CustomSnapHelper.java (98%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/image/ImageLoader.java (98%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/manager/ConnectManager.java (98%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/manager/ConnectMode.java (80%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/network/HTTPInterface.java (93%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/network/NetInterfaceManager.java (76%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/network/UrlAddress.java (87%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/network/api/AdminAppApi.java (56%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/network/api/AdminAppClassApi.java (58%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/network/api/BannerImage.java (62%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/network/api/ClassAppApi.java (63%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/network/api/DownloadApp.java (77%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/network/api/GetBanner.java (52%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/network/api/NewestAppUpdate.java (68%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/network/api/QueryAllApp.java (62%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/network/api/QueryPackageApp.java (66%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/network/api/SNInfo.java (60%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/network/api/SearchAdminAppApi.java (64%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/network/api/SearchAppApi.java (66%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/network/interceptor/RepeatRequestInterceptor.java (96%) create mode 100644 app/src/main/java/com/uiui/zyappstore/push/PushManager.java create mode 100644 app/src/main/java/com/uiui/zyappstore/push/alipush/AliMessageIntentService.java create mode 100644 app/src/main/java/com/uiui/zyappstore/push/alipush/AliyunMessageReceiver.java rename app/src/main/java/com/uiui/{appstore => zyappstore/push}/tpush/Constants.java (92%) rename app/src/main/java/com/uiui/{appstore => zyappstore/push}/tpush/MessageReceiver.java (87%) rename app/src/main/java/com/uiui/{appstore => zyappstore/push}/tpush/common/DBOpenHelper.java (93%) rename app/src/main/java/com/uiui/{appstore => zyappstore/push}/tpush/common/NotificationService.java (97%) rename app/src/main/java/com/uiui/{appstore => zyappstore/push}/tpush/po/XGNotification.java (97%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/receiver/AppManagerReceiver.java (84%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/receiver/BootReceiver.java (78%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/receiver/InstallResultReceiver.java (96%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/receiver/NewAppReceiver.java (96%) rename app/src/main/java/com/uiui/{appstore/service/MyDownloadService.java => zyappstore/service/DownloadService.java} (90%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/service/GuardService.java (90%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/service/StepService.java (85%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/service/main/MainSContact.java (63%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/service/main/MainSPresenter.java (92%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/service/main/MainService.java (85%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/utils/ApkUtils.java (98%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/utils/DensityUtil.java (95%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/utils/FileUtils.java (99%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/utils/JGYUtils.java (90%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/utils/LogUtils.java (90%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/utils/MD5Util.java (98%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/utils/SPUtils.java (98%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/utils/ServiceAliveUtils.java (69%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/utils/StatusBarUtil.java (99%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/utils/StorageUtils.java (99%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/utils/TimeUtils.java (96%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/utils/ToastUtil.java (95%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/utils/Utils.java (87%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/view/CornerImageView.kt (94%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/view/HorizontalItemDecoration.java (97%) rename app/src/main/java/com/uiui/{appstore => zyappstore}/view/NumberProgressBar.java (99%) rename app/src/test/java/com/uiui/{appstore => zyappstore}/ExampleUnitTest.java (92%) diff --git a/app/build.gradle b/app/build.gradle index 7a05f97..e43bb9c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'kotlin-android' apply plugin: "com.tencent.android.tpns" def appName() { - return "UIUIAppStore" + return "ZYAppStore" } def releaseTime() { @@ -14,9 +14,11 @@ android { compileSdkVersion 29 buildToolsVersion "29.0.3" defaultConfig { - applicationId "com.uiui.appstore" + applicationId "com.uiui.zyappstore" minSdkVersion 26 targetSdkVersion 29 + versionCode 2 + versionName "1.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -41,99 +43,25 @@ android { checkReleaseBuilds false } - //多版本 - productFlavors { - official { - flavorDimensions "default" - versionCode 74 - versionName "8.3" - } - } - //签名 signingConfigs { - zhanRui { - storeFile file("keystore/zhanxun.keystore") - storePassword "123456" - keyAlias "zhanxun" - keyPassword "123456" - v1SigningEnabled true - v2SigningEnabled true - } - - teclastuserdebug { - storeFile file("keystore/TeclastUserDebug.jks") - storePassword "123456" - keyAlias "teclast" - keyPassword "123456" - v1SigningEnabled true - v2SigningEnabled true - } - - mtk { - storeFile file("keystore/xueshibaoos.jks") - storePassword "123456" - keyAlias "xueshibaoos" - keyPassword "123456" - v1SigningEnabled true - v2SigningEnabled true - } - mtk12 { - storeFile file("keystore/mtkAndroid12.keystore") + storeFile file("keystore/TeclastMTK12.jks") storePassword "123456" - keyAlias "mtk12" + keyAlias "TeclastMTK12" keyPassword "123456" - v1SigningEnabled true - v2SigningEnabled true + v2SigningEnabled false } } buildTypes { - MTKAndroid12Release.initWith(release) - MTKAndroid12Release { - buildConfigField "String", "platform", '"MTK"' - signingConfig signingConfigs.mtk12 - } - - MTKAndroid12Debug.initWith(debug) - MTKAndroid12Debug { - buildConfigField "String", "platform", '"MTK"' - versionNameSuffix "-debug" - debuggable true - signingConfig signingConfigs.mtk12 - } - - zhanRuiRelease.initWith(release) - zhanRuiRelease { - buildConfigField "String", "platform", '"ZhanRui"' - signingConfig signingConfigs.zhanRui - } - - zhanRuiDebug.initWith(debug) - zhanRuiDebug { - versionNameSuffix "-debug" - buildConfigField "String", "platform", '"ZhanRui"' - debuggable true - signingConfig signingConfigs.zhanRui - } - - //userdebug rom使用这个版本 - zhanRuiUserdebug.initWith(zhanRuiDebug) - zhanRuiUserdebug { - buildConfigField "String", "platform", '"ZhanRui"' - versionNameSuffix "-debug" - debuggable true - signingConfig signingConfigs.teclastuserdebug - } - debug { - buildConfigField "String", "platform", '"MTK"' + buildConfigField "String", "platform", '"TeclastMTK12"' versionNameSuffix "-debug" minifyEnabled false //Zipalign优化 zipAlignEnabled true - signingConfig signingConfigs.mtk + signingConfig signingConfigs.mtk12 applicationVariants.all { variant -> variant.outputs.each { output -> if (outputFile != null) { @@ -144,7 +72,7 @@ android { } } release { - buildConfigField "String", "platform", '"MTK"' + buildConfigField "String", "platform", '"TeclastMTK12"' //混淆 minifyEnabled false //Zipalign优化 @@ -152,7 +80,7 @@ android { //前一部分代表系统默认的android程序的混淆文件，该文件已经包含了基本的混淆声明，后一个文件是自己的定义混淆文件 proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' //签名 - signingConfig signingConfigs.mtk + signingConfig signingConfigs.mtk12 // 将release版本的包名重命名，加上版本及日期 applicationVariants.all { variant -> variant.outputs.each { output -> @@ -222,6 +150,8 @@ dependencies { implementation 'com.tencent:mmkv-static:1.2.13' //腾讯移动推送 TPNS implementation 'com.tencent.tpns:tpns:1.3.2.0-release' + //阿里云推送 + implementation 'com.aliyun.ams:alicloud-android-push:3.8.0' //banner图 implementation 'com.zhpan.library:bannerview:2.6.4' //更换字体框架 @@ -230,4 +160,4 @@ dependencies { implementation 'com.blankj:utilcodex:1.31.1' //沉浸状态栏 implementation 'com.gitee.zackratos:UltimateBarX:0.8.0' -} +} \ No newline at end of file diff --git a/app/keystore/TeclastMTK12.jks b/app/keystore/TeclastMTK12.jks new file mode 100644 index 0000000000000000000000000000000000000000..669cfa92936634484a135ca9a0486d5ad89899d3 GIT binary patch literal 2553 zcmd6o`8U-2AIE3K3}YM7hztf1<1_Y>7G#M?GM0;MBkRbTBF2p-M9MPu zy-{|;MTX2Rl1bd$>3;9``|X_X_Yb%~yw3Z)9`E=2oY(7pp6}=DJL@|O1Oh=g0sbra zLP+j@uE8PxA-)7P4y57x+qyv@I0&G^b^v}ZdP{PL1PzsknLCq!akT8`qN3wZjo1Y@X`yKtUqA?5SM!r;5GknM&VirR<) z&y0}1z-@Hxr-@GXGxDukm>nh?!&Rf}C;WuI(qyG{eK>m2bC-6g7)#{rVAEdn(p-vWfZjWw6|Mbp$%!EMujP53lgd@CfN? zVV_kP()x~sN^fnobK7)2s4=vgJ(6;Ho9wXG)V>*J?$e&+{@OUlFz%|_!^?%4SikjG zSrZD{kDZOgFio(}nQ~G~Z=T54wBXzF;f6shCt4CTxUXJ&vYsf_|b4)sWLyD>K!A9s{ z^GNZ91BMkz2QH`@PsvBzzx7$+WZR(^D^*EY>yd+Tn8XL8HWV?9>7?+PHc_{0&Lgep0eLc&&*yB2a$T_~tcG=Y6pHY-%sPGwE~1~c!o*38!+jn`|>*<&qo+6Vy~+`5)H z(K;%Y`%_s^(HMIpH~1N2^_$1LO^3}VZ|KoyEM}DE)l%%GQ4o82CepU)8C7@+bzAP6 zrq0bE1R@vbG^BZxF{roKHm|y7zEdx(vPjXONR=Vn*;XA_h0Cv?CpPEpaa_u3mRjd> z*WbR+?(mIiFd4YMgV(Yy9@lP*WM%k!67US?pXPFzyh{ZQux*!4#n0wR)o+6|K@_e^9r zp0q%Z_%b1TsQjPW59sdq{)J1-F^y8EeExRElO?y8P57yL5UK8jxHAM_>n6z5xs-P~ zjFzoy=+aZzfb28MQdRmj{uy~rNn3_BljyU+LXgHYSzr7VuZ!) zJH`q&f76Qhq~w{IL!U-XIji^L7P%CEA*B{4k(~qwxkYfhQ#jf~`sV(Z{)u<7b@CM^ z5p$LDt6J5!D#9C&ua2ye@^b872zYIrGAyR|?k6&4qxB`aVFtdR9L1i0nYo+N&|KoO zq4$?N!tL;yz#$L_R?4x%#{dK=vmnmG6kKye|IXeKl^3JivETr(z( zzzZO_pf)frG{nZ5fChwqBs^%OfvcalXFw3y+m#>+i2Q)uXw>O|P;!W?HyKOxCS4*3 zatxQlk!bD{WRIW#Z;yWy-v1%c{}LGh`=1&RU{SQ|zwRFYd&Rp4_yhaJP=F4gLC{oF z(*QI92Qid7r!j!=clu8)n+nGM{J@+M1f_yeoY@5Cfl$FaUR^tT9nh7)-S;xvyI{QyYOv>YQZ&3W?tIW`$vIVJLGN!O8 zu<6lACU ze=PdjHI6YSM7Q!?5ZT&~HHv0f&ugns!5(twdG8D=pG#jK)EYUxh15+-*2sTRV*W)v zutXv7zHVXMxiUWM9g(@olf(OEEgP1P+%I5l4V;rlpINmgayNPB?VifHTEkw!q7X$b z)eohQt0u67QW6fAINYYJon@-V7T8)3o^MGBZ2!GW0Ro2R$Ls(xTYw}-IFkG@QJ9G3 zLQd6m_6tR}WKdk&Qfo4nM!yHdbpP0wg~hZ0F^!b}dnPv~s~{%hAF2fEPd|?DM=NL; z9DstsyFbf=^Zz*V0E2Ahtm?)OO9j6Z@Hcuyn;5w$0#ZB@pVJ>X8vb0bq7M^Y682si zPi*OQ9c)t_ReyK39XT5>GO&Zxbr3f&f}f^7lB8B2#F{k4*Dy>KKgMqIPYaK#*pQ-R z=9x~gF2V?!aZjfqfr^XHmzML*Rgv^bPF<0#Yz-zvpGw^wO2c9lAh`a8{u12|2*$U31I;IY_i+A>=NryR_?hD%Xnx#xm+R-5oG$Iq# zZY~_%d|YXx&e~p1c;#a?-x|r{Etg-VqtiM7ek+~%!J*jq i3k%n*Z`M^-*)|E%3NhLDTX{PpKhi;3+Qwyp5q|=Hqc`OM literal 0 HcmV?d00001 diff --git a/app/keystore/TeclastUserDebug.jks b/app/keystore/TeclastUserDebug.jks deleted file mode 100644 index 072af4bc79d50d10c0b460fe8d733b73bdcb529c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2897 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 diff --git a/app/keystore/mtkAndroid12.keystore b/app/keystore/mtkAndroid12.keystore deleted file mode 100644 index 860f30f3fb87fbfeac382d4ac144be5ba998cd0c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2701 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 diff --git a/app/keystore/xueshibaoos.jks b/app/keystore/xueshibaoos.jks deleted file mode 100644 index b94a626a1e59b41e0d2b0e1725c1d164b6a8f5ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2552 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 KiHH~&lJ##+rq5Ua diff --git a/app/src/androidTest/java/com/uiui/appstore/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/uiui/zyappstore/ExampleInstrumentedTest.java similarity index 86% rename from app/src/androidTest/java/com/uiui/appstore/ExampleInstrumentedTest.java rename to app/src/androidTest/java/com/uiui/zyappstore/ExampleInstrumentedTest.java index f2c3712..8f6e653 100644 --- a/app/src/androidTest/java/com/uiui/appstore/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/uiui/zyappstore/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.uiui.appstore; +package com.uiui.zyappstore; import android.content.Context; @@ -22,6 +22,6 @@ public class ExampleInstrumentedTest { // Context of the app under test. Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); - assertEquals("com.uiui.appstore", appContext.getPackageName()); + assertEquals("com.uiui.zyappstore", appContext.getPackageName()); } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 592435f..ac92408 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ @@ -22,13 +22,13 @@ - + - + @@ -44,7 +44,7 @@ - - - + + + @@ -66,50 +66,50 @@ - - - + + + @@ -117,7 +117,7 @@ @@ -132,11 +132,11 @@ @@ -151,7 +151,7 @@ - + + android:authorities="com.uiui.zyappstore.XGVIP_PUSH_AUTH" /> + android:authorities="com.uiui.zyappstore.TPUSH_PROVIDER" /> - + @@ -271,10 +271,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/aidl/com/uiui/appstore/KeepAliveConnection.aidl b/app/src/main/aidl/com/uiui/zyappstore/KeepAliveConnection.aidl similarity index 81% rename from app/src/main/aidl/com/uiui/appstore/KeepAliveConnection.aidl rename to app/src/main/aidl/com/uiui/zyappstore/KeepAliveConnection.aidl index 0e34b5f..4196c03 100644 --- a/app/src/main/aidl/com/uiui/appstore/KeepAliveConnection.aidl +++ b/app/src/main/aidl/com/uiui/zyappstore/KeepAliveConnection.aidl @@ -1,5 +1,5 @@ // KeepAliveConnection.aidl -package com.uiui.appstore; +package com.uiui.zyappstore; // Declare any non-default types here with import statements diff --git a/app/src/main/java/com/uiui/appstore/base/BaseView.java b/app/src/main/java/com/uiui/appstore/base/BaseView.java deleted file mode 100644 index 3238992..0000000 --- a/app/src/main/java/com/uiui/appstore/base/BaseView.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.uiui.appstore.base; - -public interface BaseView { -} diff --git a/app/src/main/java/com/uiui/appstore/TextCode/MessageWhat.java b/app/src/main/java/com/uiui/zyappstore/TextCode/MessageWhat.java similarity index 66% rename from app/src/main/java/com/uiui/appstore/TextCode/MessageWhat.java rename to app/src/main/java/com/uiui/zyappstore/TextCode/MessageWhat.java index 16b478c..6869135 100644 --- a/app/src/main/java/com/uiui/appstore/TextCode/MessageWhat.java +++ b/app/src/main/java/com/uiui/zyappstore/TextCode/MessageWhat.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.TextCode; +package com.uiui.zyappstore.TextCode; public class MessageWhat { public static int CODE_SUCCESSFUL = 200; diff --git a/app/src/main/java/com/uiui/appstore/activity/AboutActivity.java b/app/src/main/java/com/uiui/zyappstore/activity/AboutActivity.java similarity index 90% rename from app/src/main/java/com/uiui/appstore/activity/AboutActivity.java rename to app/src/main/java/com/uiui/zyappstore/activity/AboutActivity.java index 8058453..c78fa74 100644 --- a/app/src/main/java/com/uiui/appstore/activity/AboutActivity.java +++ b/app/src/main/java/com/uiui/zyappstore/activity/AboutActivity.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.activity; +package com.uiui.zyappstore.activity; import android.content.Intent; import android.graphics.Paint; @@ -6,9 +6,9 @@ import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import com.uiui.appstore.BuildConfig; -import com.uiui.appstore.R; -import com.uiui.appstore.base.BaseActivity; +import com.uiui.zyappstore.BuildConfig; +import com.uiui.zyappstore.R; +import com.uiui.zyappstore.base.BaseActivity; public class AboutActivity extends BaseActivity { private ImageView iv_exit; diff --git a/app/src/main/java/com/uiui/appstore/activity/ClassAppActivity.java b/app/src/main/java/com/uiui/zyappstore/activity/ClassAppActivity.java similarity index 91% rename from app/src/main/java/com/uiui/appstore/activity/ClassAppActivity.java rename to app/src/main/java/com/uiui/zyappstore/activity/ClassAppActivity.java index 333ebc8..357cdeb 100644 --- a/app/src/main/java/com/uiui/appstore/activity/ClassAppActivity.java +++ b/app/src/main/java/com/uiui/zyappstore/activity/ClassAppActivity.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.activity; +package com.uiui.zyappstore.activity; import android.content.Intent; import android.text.TextUtils; @@ -10,13 +10,13 @@ import android.widget.TextView; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.uiui.appstore.R; -import com.uiui.appstore.adapter.AppAdapter; -import com.uiui.appstore.base.BaseActivity; -import com.uiui.appstore.bean.AppInfo; -import com.uiui.appstore.bean.BaseResponse; -import com.uiui.appstore.common.CommonDatas; -import com.uiui.appstore.network.NetInterfaceManager; +import com.uiui.zyappstore.R; +import com.uiui.zyappstore.adapter.AppAdapter; +import com.uiui.zyappstore.base.BaseActivity; +import com.uiui.zyappstore.bean.AppInfo; +import com.uiui.zyappstore.bean.BaseResponse; +import com.uiui.zyappstore.common.CommonDatas; +import com.uiui.zyappstore.network.NetInterfaceManager; import java.util.List; diff --git a/app/src/main/java/com/uiui/appstore/activity/CopyrightActivity.java b/app/src/main/java/com/uiui/zyappstore/activity/CopyrightActivity.java similarity index 74% rename from app/src/main/java/com/uiui/appstore/activity/CopyrightActivity.java rename to app/src/main/java/com/uiui/zyappstore/activity/CopyrightActivity.java index 4ac8458..16d7002 100644 --- a/app/src/main/java/com/uiui/appstore/activity/CopyrightActivity.java +++ b/app/src/main/java/com/uiui/zyappstore/activity/CopyrightActivity.java @@ -1,7 +1,7 @@ -package com.uiui.appstore.activity; +package com.uiui.zyappstore.activity; -import com.uiui.appstore.R; -import com.uiui.appstore.base.BaseActivity; +import com.uiui.zyappstore.R; +import com.uiui.zyappstore.base.BaseActivity; public class CopyrightActivity extends BaseActivity { diff --git a/app/src/main/java/com/uiui/appstore/activity/DetailsActivity.java b/app/src/main/java/com/uiui/zyappstore/activity/DetailsActivity.java similarity index 94% rename from app/src/main/java/com/uiui/appstore/activity/DetailsActivity.java rename to app/src/main/java/com/uiui/zyappstore/activity/DetailsActivity.java index 1cc6e0b..dda360e 100644 --- a/app/src/main/java/com/uiui/appstore/activity/DetailsActivity.java +++ b/app/src/main/java/com/uiui/zyappstore/activity/DetailsActivity.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.activity; +package com.uiui.zyappstore.activity; import android.content.BroadcastReceiver; import android.content.Context; @@ -25,18 +25,18 @@ import com.bumptech.glide.Glide; import com.google.gson.Gson; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import com.uiui.appstore.R; -import com.uiui.appstore.adapter.ImageAdapter; -import com.uiui.appstore.base.BaseActivity; -import com.uiui.appstore.bean.AppInfo; -import com.uiui.appstore.bean.BaseResponse; -import com.uiui.appstore.bean.GlideCircleWithBorder; -import com.uiui.appstore.helper.CustomSnapHelper; -import com.uiui.appstore.network.NetInterfaceManager; -import com.uiui.appstore.utils.ApkUtils; -import com.uiui.appstore.utils.FileUtils; -import com.uiui.appstore.utils.StorageUtils; -import com.uiui.appstore.utils.ToastUtil; +import com.uiui.zyappstore.R; +import com.uiui.zyappstore.adapter.ImageAdapter; +import com.uiui.zyappstore.base.BaseActivity; +import com.uiui.zyappstore.bean.AppInfo; +import com.uiui.zyappstore.bean.BaseResponse; +import com.uiui.zyappstore.bean.GlideCircleWithBorder; +import com.uiui.zyappstore.helper.CustomSnapHelper; +import com.uiui.zyappstore.network.NetInterfaceManager; +import com.uiui.zyappstore.utils.ApkUtils; +import com.uiui.zyappstore.utils.FileUtils; +import com.uiui.zyappstore.utils.StorageUtils; +import com.uiui.zyappstore.utils.ToastUtil; import java.io.File; import java.util.ArrayList; @@ -266,9 +266,9 @@ public class DetailsActivity extends BaseActivity { if (myReceiver == null) { myReceiver = new installReceiver(); IntentFilter filter = new IntentFilter(); - filter.addAction("com.uiui.appstore.PACKAGE_ADDED"); - filter.addAction("com.uiui.appstore.PACKAGE_REPLACED"); - filter.addAction("com.uiui.appstore.PACKAGE_REMOVED"); + filter.addAction("com.uiui.zyappstore.PACKAGE_ADDED"); + filter.addAction("com.uiui.zyappstore.PACKAGE_REPLACED"); + filter.addAction("com.uiui.zyappstore.PACKAGE_REMOVED"); filter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY); registerReceiver(myReceiver, filter); } @@ -349,7 +349,7 @@ public class DetailsActivity extends BaseActivity { public void onReceive(Context context, Intent intent) { String action = intent.getAction(); //接收安装广播 - if ("com.uiui.appstore.PACKAGE_ADDED".equals(action) || "com.uiui.appstore.PACKAGE_REPLACED".equals(action)) { + if ("com.uiui.zyappstore.PACKAGE_ADDED".equals(action) || "com.uiui.zyappstore.PACKAGE_REPLACED".equals(action)) { String packageName = intent.getStringExtra("package"); if (packageName.equalsIgnoreCase(appInfo.getApp_package())) { tv_download.setText("打开"); diff --git a/app/src/main/java/com/uiui/appstore/activity/DownloadManagerActivity.java b/app/src/main/java/com/uiui/zyappstore/activity/DownloadManagerActivity.java similarity index 94% rename from app/src/main/java/com/uiui/appstore/activity/DownloadManagerActivity.java rename to app/src/main/java/com/uiui/zyappstore/activity/DownloadManagerActivity.java index 9196551..7aff279 100644 --- a/app/src/main/java/com/uiui/appstore/activity/DownloadManagerActivity.java +++ b/app/src/main/java/com/uiui/zyappstore/activity/DownloadManagerActivity.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.activity; +package com.uiui.zyappstore.activity; import android.os.Handler; import android.os.Message; @@ -9,9 +9,9 @@ import androidx.annotation.NonNull; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.uiui.appstore.R; -import com.uiui.appstore.adapter.DownloadManagerAdapter; -import com.uiui.appstore.base.BaseActivity; +import com.uiui.zyappstore.R; +import com.uiui.zyappstore.adapter.DownloadManagerAdapter; +import com.uiui.zyappstore.base.BaseActivity; public class DownloadManagerActivity extends BaseActivity /*implements XExecutor.OnAllTaskEndListener*/ { private RecyclerView recyclerView; diff --git a/app/src/main/java/com/uiui/appstore/activity/HintActivity.java b/app/src/main/java/com/uiui/zyappstore/activity/HintActivity.java similarity index 91% rename from app/src/main/java/com/uiui/appstore/activity/HintActivity.java rename to app/src/main/java/com/uiui/zyappstore/activity/HintActivity.java index ba71753..4b3f4b5 100644 --- a/app/src/main/java/com/uiui/appstore/activity/HintActivity.java +++ b/app/src/main/java/com/uiui/zyappstore/activity/HintActivity.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.activity; +package com.uiui.zyappstore.activity; import android.content.Intent; import android.text.TextUtils; @@ -9,9 +9,8 @@ import android.widget.TextView; import androidx.constraintlayout.widget.ConstraintLayout; -import com.uiui.appstore.R; -import com.uiui.appstore.base.BaseActivity; -import com.uiui.appstore.utils.ApkUtils; +import com.uiui.zyappstore.R; +import com.uiui.zyappstore.base.BaseActivity; public class HintActivity extends BaseActivity { private ConstraintLayout root; diff --git a/app/src/main/java/com/uiui/appstore/activity/KindDetailActivity.java b/app/src/main/java/com/uiui/zyappstore/activity/KindDetailActivity.java similarity index 85% rename from app/src/main/java/com/uiui/appstore/activity/KindDetailActivity.java rename to app/src/main/java/com/uiui/zyappstore/activity/KindDetailActivity.java index 1f64139..e8987c8 100644 --- a/app/src/main/java/com/uiui/appstore/activity/KindDetailActivity.java +++ b/app/src/main/java/com/uiui/zyappstore/activity/KindDetailActivity.java @@ -1,28 +1,21 @@ -package com.uiui.appstore.activity; +package com.uiui.zyappstore.activity; -import android.os.Handler; -import android.os.Message; import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import androidx.annotation.NonNull; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.uiui.appstore.R; -import com.uiui.appstore.adapter.AppAdapter; -import com.uiui.appstore.base.BaseActivity; -import com.uiui.appstore.base.RefreshManager; -import com.uiui.appstore.bean.AppInfo; -import com.uiui.appstore.utils.SPUtils; +import com.uiui.zyappstore.R; +import com.uiui.zyappstore.adapter.AppAdapter; +import com.uiui.zyappstore.base.BaseActivity; +import com.uiui.zyappstore.base.RefreshManager; +import com.uiui.zyappstore.utils.SPUtils; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; import com.scwang.smartrefresh.layout.listener.OnRefreshListener; -import java.util.ArrayList; -import java.util.List; - public class KindDetailActivity extends BaseActivity implements RefreshManager.RefreshInterface { private TextView title; diff --git a/app/src/main/java/com/uiui/appstore/activity/LocalManagerActivity.java b/app/src/main/java/com/uiui/zyappstore/activity/LocalManagerActivity.java similarity index 81% rename from app/src/main/java/com/uiui/appstore/activity/LocalManagerActivity.java rename to app/src/main/java/com/uiui/zyappstore/activity/LocalManagerActivity.java index 01c4419..67477ef 100644 --- a/app/src/main/java/com/uiui/appstore/activity/LocalManagerActivity.java +++ b/app/src/main/java/com/uiui/zyappstore/activity/LocalManagerActivity.java @@ -1,30 +1,21 @@ -package com.uiui.appstore.activity; +package com.uiui.zyappstore.activity; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import android.content.Intent; -import android.content.pm.ApplicationInfo; -import android.content.pm.PackageInfo; -import android.content.pm.PackageManager; -import android.content.pm.ResolveInfo; -import android.graphics.drawable.Drawable; -import android.provider.Settings; -import android.util.Log; import android.view.View; import android.widget.ImageView; -import com.uiui.appstore.R; -import com.uiui.appstore.adapter.LocalAppAdapter; -import com.uiui.appstore.base.BaseActivity; -import com.uiui.appstore.base.RefreshManager; -import com.uiui.appstore.bean.LocalApp; -import com.uiui.appstore.utils.ApkUtils; +import com.uiui.zyappstore.R; +import com.uiui.zyappstore.adapter.LocalAppAdapter; +import com.uiui.zyappstore.base.BaseActivity; +import com.uiui.zyappstore.base.RefreshManager; +import com.uiui.zyappstore.bean.LocalApp; +import com.uiui.zyappstore.utils.ApkUtils; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; import com.scwang.smartrefresh.layout.listener.OnRefreshListener; -import java.io.File; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/uiui/appstore/activity/MainActivity.java b/app/src/main/java/com/uiui/zyappstore/activity/MainActivity.java similarity index 92% rename from app/src/main/java/com/uiui/appstore/activity/MainActivity.java rename to app/src/main/java/com/uiui/zyappstore/activity/MainActivity.java index 7cb095e..cadedd0 100644 --- a/app/src/main/java/com/uiui/appstore/activity/MainActivity.java +++ b/app/src/main/java/com/uiui/zyappstore/activity/MainActivity.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.activity; +package com.uiui.zyappstore.activity; import android.content.Intent; import android.content.res.Configuration; @@ -19,22 +19,21 @@ import com.flyco.tablayout.SlidingTabLayout; import com.hjq.permissions.OnPermission; import com.hjq.permissions.Permission; import com.hjq.permissions.XXPermissions; -import com.uiui.appstore.R; -import com.uiui.appstore.base.BaseActivity; -import com.uiui.appstore.bean.AppInfo; -import com.uiui.appstore.bean.BaseResponse; -import com.uiui.appstore.bean.UserInfo; -import com.uiui.appstore.fragment.FeaturedFragment; -import com.uiui.appstore.fragment.ManageFragment; -import com.uiui.appstore.network.NetInterfaceManager; -import com.uiui.appstore.service.GuardService; -import com.uiui.appstore.service.MyDownloadService; -import com.uiui.appstore.service.StepService; -import com.uiui.appstore.service.main.MainService; -import com.uiui.appstore.utils.JGYUtils; -import com.uiui.appstore.utils.SPUtils; -import com.uiui.appstore.utils.ToastUtil; -import com.uiui.appstore.utils.Utils; +import com.uiui.zyappstore.R; +import com.uiui.zyappstore.base.BaseActivity; +import com.uiui.zyappstore.bean.AppInfo; +import com.uiui.zyappstore.bean.BaseResponse; +import com.uiui.zyappstore.bean.UserInfo; +import com.uiui.zyappstore.fragment.FeaturedFragment; +import com.uiui.zyappstore.network.NetInterfaceManager; +import com.uiui.zyappstore.service.GuardService; +import com.uiui.zyappstore.service.DownloadService; +import com.uiui.zyappstore.service.StepService; +import com.uiui.zyappstore.service.main.MainService; +import com.uiui.zyappstore.utils.JGYUtils; +import com.uiui.zyappstore.utils.SPUtils; +import com.uiui.zyappstore.utils.ToastUtil; +import com.uiui.zyappstore.utils.Utils; import java.io.File; import java.util.ArrayList; @@ -60,7 +59,7 @@ public class MainActivity extends BaseActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); Log.e(TAG, "onCreate"); - startService(new Intent(MainActivity.this, MyDownloadService.class)); + startService(new Intent(MainActivity.this, DownloadService.class)); starService(); } @@ -68,7 +67,7 @@ public class MainActivity extends BaseActivity { startService(new Intent(this, GuardService.class)); startService(new Intent(this, StepService.class)); startService(new Intent(this, MainService.class)); - startService(new Intent(this, MyDownloadService.class)); + startService(new Intent(this, DownloadService.class)); } @Override diff --git a/app/src/main/java/com/uiui/appstore/activity/ManagerAppActivity.java b/app/src/main/java/com/uiui/zyappstore/activity/ManagerAppActivity.java similarity index 81% rename from app/src/main/java/com/uiui/appstore/activity/ManagerAppActivity.java rename to app/src/main/java/com/uiui/zyappstore/activity/ManagerAppActivity.java index acc2af4..c6befc6 100644 --- a/app/src/main/java/com/uiui/appstore/activity/ManagerAppActivity.java +++ b/app/src/main/java/com/uiui/zyappstore/activity/ManagerAppActivity.java @@ -1,9 +1,9 @@ -package com.uiui.appstore.activity; +package com.uiui.zyappstore.activity; import android.view.View; -import com.uiui.appstore.R; -import com.uiui.appstore.base.BaseActivity; +import com.uiui.zyappstore.R; +import com.uiui.zyappstore.base.BaseActivity; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/uiui/appstore/activity/MoreAppActivity.java b/app/src/main/java/com/uiui/zyappstore/activity/MoreAppActivity.java similarity index 92% rename from app/src/main/java/com/uiui/appstore/activity/MoreAppActivity.java rename to app/src/main/java/com/uiui/zyappstore/activity/MoreAppActivity.java index 4e092cf..6e6dd86 100644 --- a/app/src/main/java/com/uiui/appstore/activity/MoreAppActivity.java +++ b/app/src/main/java/com/uiui/zyappstore/activity/MoreAppActivity.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.activity; +package com.uiui.zyappstore.activity; import android.content.Intent; import android.text.TextUtils; @@ -10,14 +10,14 @@ import android.widget.TextView; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.uiui.appstore.R; -import com.uiui.appstore.adapter.AppAdapter; -import com.uiui.appstore.base.BaseActivity; -import com.uiui.appstore.bean.AppInfo; -import com.uiui.appstore.bean.BaseResponse; -import com.uiui.appstore.common.CommonDatas; -import com.uiui.appstore.fragment.FeaturedFragment; -import com.uiui.appstore.network.NetInterfaceManager; +import com.uiui.zyappstore.R; +import com.uiui.zyappstore.adapter.AppAdapter; +import com.uiui.zyappstore.base.BaseActivity; +import com.uiui.zyappstore.bean.AppInfo; +import com.uiui.zyappstore.bean.BaseResponse; +import com.uiui.zyappstore.common.CommonDatas; +import com.uiui.zyappstore.fragment.FeaturedFragment; +import com.uiui.zyappstore.network.NetInterfaceManager; import java.util.Comparator; import java.util.List; diff --git a/app/src/main/java/com/uiui/appstore/activity/PrivacyPolicyActivity.java b/app/src/main/java/com/uiui/zyappstore/activity/PrivacyPolicyActivity.java similarity index 96% rename from app/src/main/java/com/uiui/appstore/activity/PrivacyPolicyActivity.java rename to app/src/main/java/com/uiui/zyappstore/activity/PrivacyPolicyActivity.java index 494cdd8..3f2dcab 100644 --- a/app/src/main/java/com/uiui/appstore/activity/PrivacyPolicyActivity.java +++ b/app/src/main/java/com/uiui/zyappstore/activity/PrivacyPolicyActivity.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.activity; +package com.uiui.zyappstore.activity; import android.util.Log; import android.view.View; @@ -6,8 +6,8 @@ import android.webkit.WebSettings; import android.webkit.WebView; import android.widget.TextView; -import com.uiui.appstore.R; -import com.uiui.appstore.base.BaseActivity; +import com.uiui.zyappstore.R; +import com.uiui.zyappstore.base.BaseActivity; import java.io.BufferedReader; import java.io.IOException; diff --git a/app/src/main/java/com/uiui/appstore/activity/SearcherActivity.java b/app/src/main/java/com/uiui/zyappstore/activity/SearcherActivity.java similarity index 95% rename from app/src/main/java/com/uiui/appstore/activity/SearcherActivity.java rename to app/src/main/java/com/uiui/zyappstore/activity/SearcherActivity.java index bf6cbe7..274a155 100644 --- a/app/src/main/java/com/uiui/appstore/activity/SearcherActivity.java +++ b/app/src/main/java/com/uiui/zyappstore/activity/SearcherActivity.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.activity; +package com.uiui.zyappstore.activity; import android.provider.Settings; import android.text.TextUtils; @@ -14,14 +14,13 @@ import android.widget.TextView; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.uiui.appstore.R; -import com.uiui.appstore.adapter.AppAdapter; -import com.uiui.appstore.base.BaseActivity; -import com.uiui.appstore.bean.AppInfo; -import com.uiui.appstore.bean.BaseResponse; -import com.uiui.appstore.network.NetInterfaceManager; -import com.uiui.appstore.utils.ToastUtil; -import com.uiui.appstore.utils.Utils; +import com.uiui.zyappstore.R; +import com.uiui.zyappstore.adapter.AppAdapter; +import com.uiui.zyappstore.base.BaseActivity; +import com.uiui.zyappstore.bean.AppInfo; +import com.uiui.zyappstore.bean.BaseResponse; +import com.uiui.zyappstore.network.NetInterfaceManager; +import com.uiui.zyappstore.utils.ToastUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/uiui/appstore/activity/UserAgreementActivity.java b/app/src/main/java/com/uiui/zyappstore/activity/UserAgreementActivity.java similarity index 96% rename from app/src/main/java/com/uiui/appstore/activity/UserAgreementActivity.java rename to app/src/main/java/com/uiui/zyappstore/activity/UserAgreementActivity.java index b2e47de..01c50e0 100644 --- a/app/src/main/java/com/uiui/appstore/activity/UserAgreementActivity.java +++ b/app/src/main/java/com/uiui/zyappstore/activity/UserAgreementActivity.java @@ -1,12 +1,12 @@ -package com.uiui.appstore.activity; +package com.uiui.zyappstore.activity; import android.util.Log; import android.view.View; import android.webkit.WebSettings; import android.webkit.WebView; -import com.uiui.appstore.R; -import com.uiui.appstore.base.BaseActivity; +import com.uiui.zyappstore.R; +import com.uiui.zyappstore.base.BaseActivity; import java.io.BufferedReader; import java.io.IOException; diff --git a/app/src/main/java/com/uiui/appstore/adapter/AppAdapter.java b/app/src/main/java/com/uiui/zyappstore/adapter/AppAdapter.java similarity index 96% rename from app/src/main/java/com/uiui/appstore/adapter/AppAdapter.java rename to app/src/main/java/com/uiui/zyappstore/adapter/AppAdapter.java index 943b599..e33f5ce 100644 --- a/app/src/main/java/com/uiui/appstore/adapter/AppAdapter.java +++ b/app/src/main/java/com/uiui/zyappstore/adapter/AppAdapter.java @@ -1,8 +1,7 @@ -package com.uiui.appstore.adapter; +package com.uiui.zyappstore.adapter; import android.content.Context; import android.content.Intent; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -22,14 +21,14 @@ import com.bumptech.glide.Glide; import com.google.gson.Gson; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import com.uiui.appstore.R; -import com.uiui.appstore.activity.DetailsActivity; -import com.uiui.appstore.bean.AppInfo; -import com.uiui.appstore.bean.GlideCircleWithBorder; -import com.uiui.appstore.utils.ApkUtils; -import com.uiui.appstore.utils.FileUtils; -import com.uiui.appstore.utils.StorageUtils; -import com.uiui.appstore.utils.Utils; +import com.uiui.zyappstore.R; +import com.uiui.zyappstore.activity.DetailsActivity; +import com.uiui.zyappstore.bean.AppInfo; +import com.uiui.zyappstore.bean.GlideCircleWithBorder; +import com.uiui.zyappstore.utils.ApkUtils; +import com.uiui.zyappstore.utils.FileUtils; +import com.uiui.zyappstore.utils.StorageUtils; +import com.uiui.zyappstore.utils.Utils; import org.jetbrains.annotations.NotNull; diff --git a/app/src/main/java/com/uiui/appstore/adapter/BannerViewHolder.java b/app/src/main/java/com/uiui/zyappstore/adapter/BannerViewHolder.java similarity index 83% rename from app/src/main/java/com/uiui/appstore/adapter/BannerViewHolder.java rename to app/src/main/java/com/uiui/zyappstore/adapter/BannerViewHolder.java index ee6e3f9..6e6fd20 100644 --- a/app/src/main/java/com/uiui/appstore/adapter/BannerViewHolder.java +++ b/app/src/main/java/com/uiui/zyappstore/adapter/BannerViewHolder.java @@ -1,9 +1,9 @@ -package com.uiui.appstore.adapter; +package com.uiui.zyappstore.adapter; import android.view.View; -import com.uiui.appstore.R; -import com.uiui.appstore.view.CornerImageView; +import com.uiui.zyappstore.R; +import com.uiui.zyappstore.view.CornerImageView; import com.bumptech.glide.Glide; import com.zhpan.bannerview.holder.ViewHolder; diff --git a/app/src/main/java/com/uiui/appstore/adapter/ClassAdapter.java b/app/src/main/java/com/uiui/zyappstore/adapter/ClassAdapter.java similarity index 93% rename from app/src/main/java/com/uiui/appstore/adapter/ClassAdapter.java rename to app/src/main/java/com/uiui/zyappstore/adapter/ClassAdapter.java index a8886c5..2d37c47 100644 --- a/app/src/main/java/com/uiui/appstore/adapter/ClassAdapter.java +++ b/app/src/main/java/com/uiui/zyappstore/adapter/ClassAdapter.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.adapter; +package com.uiui.zyappstore.adapter; import android.content.Context; import android.view.LayoutInflater; @@ -10,8 +10,8 @@ import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; -import com.uiui.appstore.R; -import com.uiui.appstore.bean.AppClassBean; +import com.uiui.zyappstore.R; +import com.uiui.zyappstore.bean.AppClassBean; import java.util.List; diff --git a/app/src/main/java/com/uiui/appstore/adapter/DownloadManagerAdapter.java b/app/src/main/java/com/uiui/zyappstore/adapter/DownloadManagerAdapter.java similarity index 98% rename from app/src/main/java/com/uiui/appstore/adapter/DownloadManagerAdapter.java rename to app/src/main/java/com/uiui/zyappstore/adapter/DownloadManagerAdapter.java index a5a5932..35341a8 100644 --- a/app/src/main/java/com/uiui/appstore/adapter/DownloadManagerAdapter.java +++ b/app/src/main/java/com/uiui/zyappstore/adapter/DownloadManagerAdapter.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.adapter; +package com.uiui.zyappstore.adapter; import android.content.Context; import android.os.Handler; @@ -20,10 +20,10 @@ import com.arialyy.aria.core.task.DownloadTask; import com.bumptech.glide.Glide; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import com.uiui.appstore.R; -import com.uiui.appstore.bean.GlideCircleWithBorder; -import com.uiui.appstore.utils.FileUtils; -import com.uiui.appstore.view.NumberProgressBar; +import com.uiui.zyappstore.R; +import com.uiui.zyappstore.bean.GlideCircleWithBorder; +import com.uiui.zyappstore.utils.FileUtils; +import com.uiui.zyappstore.view.NumberProgressBar; import java.util.List; diff --git a/app/src/main/java/com/uiui/appstore/adapter/ImageAdapter.java b/app/src/main/java/com/uiui/zyappstore/adapter/ImageAdapter.java similarity index 95% rename from app/src/main/java/com/uiui/appstore/adapter/ImageAdapter.java rename to app/src/main/java/com/uiui/zyappstore/adapter/ImageAdapter.java index 6542e7a..2c743a4 100644 --- a/app/src/main/java/com/uiui/appstore/adapter/ImageAdapter.java +++ b/app/src/main/java/com/uiui/zyappstore/adapter/ImageAdapter.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.adapter; +package com.uiui.zyappstore.adapter; import android.content.Context; import android.view.LayoutInflater; @@ -8,7 +8,7 @@ import android.widget.ImageView; import androidx.recyclerview.widget.RecyclerView; -import com.uiui.appstore.R; +import com.uiui.zyappstore.R; import com.bumptech.glide.Glide; import org.jetbrains.annotations.NotNull; diff --git a/app/src/main/java/com/uiui/appstore/adapter/KindAdapter.java b/app/src/main/java/com/uiui/zyappstore/adapter/KindAdapter.java similarity index 95% rename from app/src/main/java/com/uiui/appstore/adapter/KindAdapter.java rename to app/src/main/java/com/uiui/zyappstore/adapter/KindAdapter.java index e8cb905..a7fa334 100644 --- a/app/src/main/java/com/uiui/appstore/adapter/KindAdapter.java +++ b/app/src/main/java/com/uiui/zyappstore/adapter/KindAdapter.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.adapter; +package com.uiui.zyappstore.adapter; import android.content.Context; import android.content.Intent; @@ -11,9 +11,9 @@ import android.widget.TextView; import androidx.recyclerview.widget.RecyclerView; -import com.uiui.appstore.R; -import com.uiui.appstore.activity.KindDetailActivity; -import com.uiui.appstore.bean.Kind; +import com.uiui.zyappstore.R; +import com.uiui.zyappstore.activity.KindDetailActivity; +import com.uiui.zyappstore.bean.Kind; import com.bumptech.glide.Glide; import java.util.List; diff --git a/app/src/main/java/com/uiui/appstore/adapter/LocalAppAdapter.java b/app/src/main/java/com/uiui/zyappstore/adapter/LocalAppAdapter.java similarity index 92% rename from app/src/main/java/com/uiui/appstore/adapter/LocalAppAdapter.java rename to app/src/main/java/com/uiui/zyappstore/adapter/LocalAppAdapter.java index 362c955..83db20f 100644 --- a/app/src/main/java/com/uiui/appstore/adapter/LocalAppAdapter.java +++ b/app/src/main/java/com/uiui/zyappstore/adapter/LocalAppAdapter.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.adapter; +package com.uiui.zyappstore.adapter; import android.content.Context; import android.graphics.Bitmap; @@ -13,12 +13,12 @@ import android.widget.TextView; import androidx.recyclerview.widget.RecyclerView; -import com.uiui.appstore.R; -import com.uiui.appstore.bean.GlideCircleWithBorder; -import com.uiui.appstore.bean.LocalApp; -import com.uiui.appstore.utils.ApkUtils; -import com.uiui.appstore.utils.TimeUtils; -import com.uiui.appstore.utils.Utils; +import com.uiui.zyappstore.R; +import com.uiui.zyappstore.bean.GlideCircleWithBorder; +import com.uiui.zyappstore.bean.LocalApp; +import com.uiui.zyappstore.utils.ApkUtils; +import com.uiui.zyappstore.utils.TimeUtils; +import com.uiui.zyappstore.utils.Utils; import com.bumptech.glide.Glide; import java.util.List; diff --git a/app/src/main/java/com/uiui/appstore/adapter/ShowImageAdapter.java b/app/src/main/java/com/uiui/zyappstore/adapter/ShowImageAdapter.java similarity index 92% rename from app/src/main/java/com/uiui/appstore/adapter/ShowImageAdapter.java rename to app/src/main/java/com/uiui/zyappstore/adapter/ShowImageAdapter.java index f0af7c2..3676a29 100644 --- a/app/src/main/java/com/uiui/appstore/adapter/ShowImageAdapter.java +++ b/app/src/main/java/com/uiui/zyappstore/adapter/ShowImageAdapter.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.adapter; +package com.uiui.zyappstore.adapter; import android.content.Context; import android.view.LayoutInflater; @@ -8,8 +8,8 @@ import android.widget.ImageView; import androidx.recyclerview.widget.RecyclerView; -import com.uiui.appstore.R; -import com.uiui.appstore.bean.GlideCircleWithBorder; +import com.uiui.zyappstore.R; +import com.uiui.zyappstore.bean.GlideCircleWithBorder; import com.bumptech.glide.Glide; import java.util.List; diff --git a/app/src/main/java/com/uiui/appstore/adapter/UpdateAppAdapter.java b/app/src/main/java/com/uiui/zyappstore/adapter/UpdateAppAdapter.java similarity index 98% rename from app/src/main/java/com/uiui/appstore/adapter/UpdateAppAdapter.java rename to app/src/main/java/com/uiui/zyappstore/adapter/UpdateAppAdapter.java index 5c351c8..5fd73e1 100644 --- a/app/src/main/java/com/uiui/appstore/adapter/UpdateAppAdapter.java +++ b/app/src/main/java/com/uiui/zyappstore/adapter/UpdateAppAdapter.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.adapter; +package com.uiui.zyappstore.adapter; import android.content.Context; import android.view.LayoutInflater; @@ -10,8 +10,8 @@ import android.widget.TextView; import androidx.recyclerview.widget.RecyclerView; -import com.uiui.appstore.R; -import com.uiui.appstore.bean.UpdateAppInfo; +import com.uiui.zyappstore.R; +import com.uiui.zyappstore.bean.UpdateAppInfo; import java.util.List; diff --git a/app/src/main/java/com/uiui/appstore/base/BaseActivity.java b/app/src/main/java/com/uiui/zyappstore/base/BaseActivity.java similarity index 98% rename from app/src/main/java/com/uiui/appstore/base/BaseActivity.java rename to app/src/main/java/com/uiui/zyappstore/base/BaseActivity.java index d3783ab..c682534 100644 --- a/app/src/main/java/com/uiui/appstore/base/BaseActivity.java +++ b/app/src/main/java/com/uiui/zyappstore/base/BaseActivity.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.base; +package com.uiui.zyappstore.base; import android.annotation.TargetApi; import android.app.Activity; @@ -12,7 +12,7 @@ import android.view.WindowManager; import androidx.appcompat.app.AppCompatActivity; -import com.uiui.appstore.R; +import com.uiui.zyappstore.R; import com.zackratos.ultimatebarx.ultimatebarx.java.UltimateBarX; import uk.co.chrisjenx.calligraphy.CalligraphyContextWrapper; diff --git a/app/src/main/java/com/uiui/appstore/base/BaseApplication.java b/app/src/main/java/com/uiui/zyappstore/base/BaseApplication.java similarity index 72% rename from app/src/main/java/com/uiui/appstore/base/BaseApplication.java rename to app/src/main/java/com/uiui/zyappstore/base/BaseApplication.java index 2824e77..6bb5fae 100644 --- a/app/src/main/java/com/uiui/appstore/base/BaseApplication.java +++ b/app/src/main/java/com/uiui/zyappstore/base/BaseApplication.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.base; +package com.uiui.zyappstore.base; import android.app.Application; import android.content.Context; @@ -11,6 +11,9 @@ import android.util.Log; import androidx.annotation.NonNull; +import com.alibaba.sdk.android.push.CloudPushService; +import com.alibaba.sdk.android.push.CommonCallback; +import com.alibaba.sdk.android.push.noonesdk.PushServiceFactory; import com.arialyy.aria.core.Aria; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.DefaultRefreshFooterCreator; @@ -24,14 +27,15 @@ import com.tencent.android.tpush.XGIOperateCallback; import com.tencent.android.tpush.XGPushConfig; import com.tencent.android.tpush.XGPushManager; import com.tencent.mmkv.MMKV; -import com.uiui.appstore.R; -import com.uiui.appstore.manager.ConnectManager; -import com.uiui.appstore.network.NetInterfaceManager; -import com.uiui.appstore.receiver.AppManagerReceiver; -import com.uiui.appstore.utils.JGYUtils; -import com.uiui.appstore.utils.LogUtils; -import com.uiui.appstore.utils.ToastUtil; -import com.uiui.appstore.utils.Utils; +import com.uiui.zyappstore.R; +import com.uiui.zyappstore.manager.ConnectManager; +import com.uiui.zyappstore.network.NetInterfaceManager; +import com.uiui.zyappstore.push.PushManager; +import com.uiui.zyappstore.receiver.AppManagerReceiver; +import com.uiui.zyappstore.utils.JGYUtils; +import com.uiui.zyappstore.utils.LogUtils; +import com.uiui.zyappstore.utils.ToastUtil; +import com.uiui.zyappstore.utils.Utils; import java.util.ArrayList; import java.util.List; @@ -42,17 +46,6 @@ import java.util.List; public class BaseApplication extends Application { private static final String TAG = BaseApplication.class.getSimpleName(); - private static BaseApplication app; - - public static BaseApplication getInstance() { - return app; - } - - public Context getAppContext() { - return getApplicationContext(); - } - - //static 代码段可以防止内存泄露 static { //设置全局的Header构建器 SmartRefreshLayout.setDefaultRefreshHeaderCreator(new DefaultRefreshHeaderCreator() { @@ -76,13 +69,14 @@ public class BaseApplication extends Application { @Override public void onCreate() { super.onCreate(); - app = this; String rootDir = MMKV.initialize(this); Log.i(TAG, "mmkv root: " + rootDir); - tPushInit(); - ToastUtil.init(this); JGYUtils.init(this); + PushManager.init(this); + tPushInit(); + aliyunPushInit(); + ToastUtil.init(this); ConnectManager.init(this); Aria.init(this); Aria.get(this).getDownloadConfig().setMaxTaskNum(1); @@ -134,6 +128,50 @@ public class BaseApplication extends Application { }); } + private void aliyunPushInit() { + PushServiceFactory.init(this); + final CloudPushService pushService = PushServiceFactory.getCloudPushService(); + pushService.setLogLevel(CloudPushService.LOG_DEBUG); + pushService.register(this, new CommonCallback() { + @Override + public void onSuccess(String response) { + Log.e("AliyunPush", "init cloudchannel success"); + Log.e("AliyunPush", "init cloudchannel success " + pushService.getDeviceId()); + } + + @Override + public void onFailed(String errorCode, String errorMessage) { + Log.e("AliyunPush", "init cloudchannel failed -- errorcode:" + errorCode + " -- errorMessage:" + errorMessage); + } + }); + String account = Utils.getSerial(); + pushService.bindAccount(account, new CommonCallback() { + @Override + public void onSuccess(String s) { + Log.e("AliyunPush", "bind account " + account + " success\n"); + } + + @Override + public void onFailed(String errorCode, String errorMsg) { + Log.e("AliyunPush", "bind account " + account + " failed." + + "errorCode: " + errorCode + ", errorMsg:" + errorMsg); + } + }); + String alias = Utils.getSerial(); + pushService.addAlias(account, new CommonCallback() { + @Override + public void onSuccess(String s) { + Log.e("AliyunPush", "add alias " + alias + " success\n"); + } + + @Override + public void onFailed(String errorCode, String errorMsg) { + Log.e("AliyunPush", "add alias " + alias + " failed." + + "errorCode: " + errorCode + ", errorMsg:" + errorMsg + "\n"); + } + }); + } + private AppManagerReceiver mAppManagerReceiver; diff --git a/app/src/main/java/com/uiui/appstore/base/BaseFragment.java b/app/src/main/java/com/uiui/zyappstore/base/BaseFragment.java similarity index 95% rename from app/src/main/java/com/uiui/appstore/base/BaseFragment.java rename to app/src/main/java/com/uiui/zyappstore/base/BaseFragment.java index cf0655f..47820c6 100644 --- a/app/src/main/java/com/uiui/appstore/base/BaseFragment.java +++ b/app/src/main/java/com/uiui/zyappstore/base/BaseFragment.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.base; +package com.uiui.zyappstore.base; import android.content.Context; import android.os.Bundle; @@ -8,7 +8,7 @@ import android.view.View; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; -import com.uiui.appstore.utils.LogUtils; +import com.uiui.zyappstore.utils.LogUtils; /** * Created by asus on 2017/8/4. diff --git a/app/src/main/java/com/uiui/appstore/base/BasePresenter.java b/app/src/main/java/com/uiui/zyappstore/base/BasePresenter.java similarity index 76% rename from app/src/main/java/com/uiui/appstore/base/BasePresenter.java rename to app/src/main/java/com/uiui/zyappstore/base/BasePresenter.java index 54921c8..8765812 100644 --- a/app/src/main/java/com/uiui/appstore/base/BasePresenter.java +++ b/app/src/main/java/com/uiui/zyappstore/base/BasePresenter.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.base; +package com.uiui.zyappstore.base; public interface BasePresenter { void attachView(V view); diff --git a/app/src/main/java/com/uiui/zyappstore/base/BaseView.java b/app/src/main/java/com/uiui/zyappstore/base/BaseView.java new file mode 100644 index 0000000..4d1dee8 --- /dev/null +++ b/app/src/main/java/com/uiui/zyappstore/base/BaseView.java @@ -0,0 +1,4 @@ +package com.uiui.zyappstore.base; + +public interface BaseView { +} diff --git a/app/src/main/java/com/uiui/appstore/base/LazyLoadFragment.java b/app/src/main/java/com/uiui/zyappstore/base/LazyLoadFragment.java similarity index 98% rename from app/src/main/java/com/uiui/appstore/base/LazyLoadFragment.java rename to app/src/main/java/com/uiui/zyappstore/base/LazyLoadFragment.java index d2df5dc..e9319c1 100644 --- a/app/src/main/java/com/uiui/appstore/base/LazyLoadFragment.java +++ b/app/src/main/java/com/uiui/zyappstore/base/LazyLoadFragment.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.base; +package com.uiui.zyappstore.base; import android.os.Bundle; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/uiui/appstore/base/RefreshManager.java b/app/src/main/java/com/uiui/zyappstore/base/RefreshManager.java similarity index 97% rename from app/src/main/java/com/uiui/appstore/base/RefreshManager.java rename to app/src/main/java/com/uiui/zyappstore/base/RefreshManager.java index b3700cb..f323d4a 100644 --- a/app/src/main/java/com/uiui/appstore/base/RefreshManager.java +++ b/app/src/main/java/com/uiui/zyappstore/base/RefreshManager.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.base; +package com.uiui.zyappstore.base; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/uiui/appstore/bean/AppClassBean.java b/app/src/main/java/com/uiui/zyappstore/bean/AppClassBean.java similarity index 94% rename from app/src/main/java/com/uiui/appstore/bean/AppClassBean.java rename to app/src/main/java/com/uiui/zyappstore/bean/AppClassBean.java index 2c4475a..7cbfa02 100644 --- a/app/src/main/java/com/uiui/appstore/bean/AppClassBean.java +++ b/app/src/main/java/com/uiui/zyappstore/bean/AppClassBean.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.bean; +package com.uiui.zyappstore.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/uiui/appstore/bean/AppDateInfo.java b/app/src/main/java/com/uiui/zyappstore/bean/AppDateInfo.java similarity index 99% rename from app/src/main/java/com/uiui/appstore/bean/AppDateInfo.java rename to app/src/main/java/com/uiui/zyappstore/bean/AppDateInfo.java index c9c8a9b..dae562b 100644 --- a/app/src/main/java/com/uiui/appstore/bean/AppDateInfo.java +++ b/app/src/main/java/com/uiui/zyappstore/bean/AppDateInfo.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.bean; +package com.uiui.zyappstore.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/uiui/appstore/bean/AppDownloadInfo.java b/app/src/main/java/com/uiui/zyappstore/bean/AppDownloadInfo.java similarity index 98% rename from app/src/main/java/com/uiui/appstore/bean/AppDownloadInfo.java rename to app/src/main/java/com/uiui/zyappstore/bean/AppDownloadInfo.java index 0d53be2..e2304cf 100644 --- a/app/src/main/java/com/uiui/appstore/bean/AppDownloadInfo.java +++ b/app/src/main/java/com/uiui/zyappstore/bean/AppDownloadInfo.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.bean; +package com.uiui.zyappstore.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/uiui/appstore/bean/AppInfo.java b/app/src/main/java/com/uiui/zyappstore/bean/AppInfo.java similarity index 99% rename from app/src/main/java/com/uiui/appstore/bean/AppInfo.java rename to app/src/main/java/com/uiui/zyappstore/bean/AppInfo.java index dd24d00..340e670 100644 --- a/app/src/main/java/com/uiui/appstore/bean/AppInfo.java +++ b/app/src/main/java/com/uiui/zyappstore/bean/AppInfo.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.bean; +package com.uiui.zyappstore.bean; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/uiui/appstore/bean/AppInfos.java b/app/src/main/java/com/uiui/zyappstore/bean/AppInfos.java similarity index 99% rename from app/src/main/java/com/uiui/appstore/bean/AppInfos.java rename to app/src/main/java/com/uiui/zyappstore/bean/AppInfos.java index c303b26..67d3f9b 100644 --- a/app/src/main/java/com/uiui/appstore/bean/AppInfos.java +++ b/app/src/main/java/com/uiui/zyappstore/bean/AppInfos.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.bean; +package com.uiui.zyappstore.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/uiui/appstore/bean/Banner.java b/app/src/main/java/com/uiui/zyappstore/bean/Banner.java similarity index 95% rename from app/src/main/java/com/uiui/appstore/bean/Banner.java rename to app/src/main/java/com/uiui/zyappstore/bean/Banner.java index 2e3f5a3..945db9d 100644 --- a/app/src/main/java/com/uiui/appstore/bean/Banner.java +++ b/app/src/main/java/com/uiui/zyappstore/bean/Banner.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.bean; +package com.uiui.zyappstore.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/uiui/appstore/bean/BannerImage.java b/app/src/main/java/com/uiui/zyappstore/bean/BannerImage.java similarity index 95% rename from app/src/main/java/com/uiui/appstore/bean/BannerImage.java rename to app/src/main/java/com/uiui/zyappstore/bean/BannerImage.java index c9a69e4..eb1ce4c 100644 --- a/app/src/main/java/com/uiui/appstore/bean/BannerImage.java +++ b/app/src/main/java/com/uiui/zyappstore/bean/BannerImage.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.bean; +package com.uiui.zyappstore.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/uiui/appstore/bean/BaseResponse.java b/app/src/main/java/com/uiui/zyappstore/bean/BaseResponse.java similarity index 93% rename from app/src/main/java/com/uiui/appstore/bean/BaseResponse.java rename to app/src/main/java/com/uiui/zyappstore/bean/BaseResponse.java index 4ad995f..53854f7 100644 --- a/app/src/main/java/com/uiui/appstore/bean/BaseResponse.java +++ b/app/src/main/java/com/uiui/zyappstore/bean/BaseResponse.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.bean; +package com.uiui.zyappstore.bean; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/uiui/appstore/bean/BatchID.java b/app/src/main/java/com/uiui/zyappstore/bean/BatchID.java similarity index 94% rename from app/src/main/java/com/uiui/appstore/bean/BatchID.java rename to app/src/main/java/com/uiui/zyappstore/bean/BatchID.java index 2e7ac9b..2a8eb49 100644 --- a/app/src/main/java/com/uiui/appstore/bean/BatchID.java +++ b/app/src/main/java/com/uiui/zyappstore/bean/BatchID.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.bean; +package com.uiui.zyappstore.bean; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/uiui/appstore/bean/GlideCircleWithBorder.java b/app/src/main/java/com/uiui/zyappstore/bean/GlideCircleWithBorder.java similarity index 98% rename from app/src/main/java/com/uiui/appstore/bean/GlideCircleWithBorder.java rename to app/src/main/java/com/uiui/zyappstore/bean/GlideCircleWithBorder.java index cad19fc..86113ad 100644 --- a/app/src/main/java/com/uiui/appstore/bean/GlideCircleWithBorder.java +++ b/app/src/main/java/com/uiui/zyappstore/bean/GlideCircleWithBorder.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.bean; +package com.uiui.zyappstore.bean; import android.content.Context; import android.graphics.Bitmap; @@ -12,7 +12,7 @@ import androidx.annotation.NonNull; import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; import com.bumptech.glide.load.resource.bitmap.BitmapTransformation; -import com.uiui.appstore.R; +import com.uiui.zyappstore.R; import java.security.MessageDigest; diff --git a/app/src/main/java/com/uiui/appstore/bean/ImageUrl.java b/app/src/main/java/com/uiui/zyappstore/bean/ImageUrl.java similarity index 85% rename from app/src/main/java/com/uiui/appstore/bean/ImageUrl.java rename to app/src/main/java/com/uiui/zyappstore/bean/ImageUrl.java index 4d3c4ff..073b467 100644 --- a/app/src/main/java/com/uiui/appstore/bean/ImageUrl.java +++ b/app/src/main/java/com/uiui/zyappstore/bean/ImageUrl.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.bean; +package com.uiui.zyappstore.bean; public class ImageUrl { String img_url; diff --git a/app/src/main/java/com/uiui/appstore/bean/Kind.java b/app/src/main/java/com/uiui/zyappstore/bean/Kind.java similarity index 96% rename from app/src/main/java/com/uiui/appstore/bean/Kind.java rename to app/src/main/java/com/uiui/zyappstore/bean/Kind.java index e1da6ee..cab70c8 100644 --- a/app/src/main/java/com/uiui/appstore/bean/Kind.java +++ b/app/src/main/java/com/uiui/zyappstore/bean/Kind.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.bean; +package com.uiui.zyappstore.bean; /** * Created by asus on 2017/10/25. diff --git a/app/src/main/java/com/uiui/appstore/bean/LocalApp.java b/app/src/main/java/com/uiui/zyappstore/bean/LocalApp.java similarity index 98% rename from app/src/main/java/com/uiui/appstore/bean/LocalApp.java rename to app/src/main/java/com/uiui/zyappstore/bean/LocalApp.java index 48ca6a1..d48eea0 100644 --- a/app/src/main/java/com/uiui/appstore/bean/LocalApp.java +++ b/app/src/main/java/com/uiui/zyappstore/bean/LocalApp.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.bean; +package com.uiui.zyappstore.bean; import android.graphics.drawable.Drawable; diff --git a/app/src/main/java/com/uiui/appstore/bean/UpdateAppInfo.java b/app/src/main/java/com/uiui/zyappstore/bean/UpdateAppInfo.java similarity index 98% rename from app/src/main/java/com/uiui/appstore/bean/UpdateAppInfo.java rename to app/src/main/java/com/uiui/zyappstore/bean/UpdateAppInfo.java index 5009776..72f2b8e 100644 --- a/app/src/main/java/com/uiui/appstore/bean/UpdateAppInfo.java +++ b/app/src/main/java/com/uiui/zyappstore/bean/UpdateAppInfo.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.bean; +package com.uiui.zyappstore.bean; import android.graphics.drawable.Drawable; diff --git a/app/src/main/java/com/uiui/appstore/bean/UserInfo.java b/app/src/main/java/com/uiui/zyappstore/bean/UserInfo.java similarity index 98% rename from app/src/main/java/com/uiui/appstore/bean/UserInfo.java rename to app/src/main/java/com/uiui/zyappstore/bean/UserInfo.java index 9262e86..9b5e2bd 100644 --- a/app/src/main/java/com/uiui/appstore/bean/UserInfo.java +++ b/app/src/main/java/com/uiui/zyappstore/bean/UserInfo.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.bean; +package com.uiui.zyappstore.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/uiui/appstore/common/BuikdConf.java b/app/src/main/java/com/uiui/zyappstore/common/BuikdConf.java similarity index 67% rename from app/src/main/java/com/uiui/appstore/common/BuikdConf.java rename to app/src/main/java/com/uiui/zyappstore/common/BuikdConf.java index c720b5e..2859b96 100644 --- a/app/src/main/java/com/uiui/appstore/common/BuikdConf.java +++ b/app/src/main/java/com/uiui/zyappstore/common/BuikdConf.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.common; +package com.uiui.zyappstore.common; public class BuikdConf { public static final boolean Isdebug = true; diff --git a/app/src/main/java/com/uiui/appstore/common/CommonDatas.java b/app/src/main/java/com/uiui/zyappstore/common/CommonDatas.java similarity index 88% rename from app/src/main/java/com/uiui/appstore/common/CommonDatas.java rename to app/src/main/java/com/uiui/zyappstore/common/CommonDatas.java index 2bca2f5..193bf50 100644 --- a/app/src/main/java/com/uiui/appstore/common/CommonDatas.java +++ b/app/src/main/java/com/uiui/zyappstore/common/CommonDatas.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.common; +package com.uiui.zyappstore.common; public class CommonDatas { diff --git a/app/src/main/java/com/uiui/appstore/disklrucache/CacheHelper.java b/app/src/main/java/com/uiui/zyappstore/disklrucache/CacheHelper.java similarity index 99% rename from app/src/main/java/com/uiui/appstore/disklrucache/CacheHelper.java rename to app/src/main/java/com/uiui/zyappstore/disklrucache/CacheHelper.java index 0b83d99..69eb96e 100644 --- a/app/src/main/java/com/uiui/appstore/disklrucache/CacheHelper.java +++ b/app/src/main/java/com/uiui/zyappstore/disklrucache/CacheHelper.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.disklrucache; +package com.uiui.zyappstore.disklrucache; import android.content.Context; import android.graphics.Bitmap; diff --git a/app/src/main/java/com/uiui/appstore/disklrucache/Utils.java b/app/src/main/java/com/uiui/zyappstore/disklrucache/Utils.java similarity index 98% rename from app/src/main/java/com/uiui/appstore/disklrucache/Utils.java rename to app/src/main/java/com/uiui/zyappstore/disklrucache/Utils.java index da0171b..1f26f38 100644 --- a/app/src/main/java/com/uiui/appstore/disklrucache/Utils.java +++ b/app/src/main/java/com/uiui/zyappstore/disklrucache/Utils.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.disklrucache; +package com.uiui.zyappstore.disklrucache; import android.content.Context; import android.content.pm.PackageInfo; diff --git a/app/src/main/java/com/uiui/appstore/fragment/FeaturedFragment.java b/app/src/main/java/com/uiui/zyappstore/fragment/FeaturedFragment.java similarity index 97% rename from app/src/main/java/com/uiui/appstore/fragment/FeaturedFragment.java rename to app/src/main/java/com/uiui/zyappstore/fragment/FeaturedFragment.java index e5c7fc1..598fc48 100644 --- a/app/src/main/java/com/uiui/appstore/fragment/FeaturedFragment.java +++ b/app/src/main/java/com/uiui/zyappstore/fragment/FeaturedFragment.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.fragment; +package com.uiui.zyappstore.fragment; import android.content.BroadcastReceiver; import android.content.Context; @@ -32,25 +32,25 @@ import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions; import com.bumptech.glide.request.target.CustomTarget; import com.bumptech.glide.request.transition.Transition; import com.scwang.smartrefresh.layout.SmartRefreshLayout; -import com.uiui.appstore.R; -import com.uiui.appstore.activity.ClassAppActivity; -import com.uiui.appstore.activity.ManagerAppActivity; -import com.uiui.appstore.activity.MoreAppActivity; -import com.uiui.appstore.adapter.AppAdapter; -import com.uiui.appstore.adapter.BannerViewHolder; -import com.uiui.appstore.base.LazyLoadFragment; -import com.uiui.appstore.base.RefreshManager; -import com.uiui.appstore.bean.AppClassBean; -import com.uiui.appstore.bean.AppInfo; -import com.uiui.appstore.bean.Banner; -import com.uiui.appstore.bean.BaseResponse; -import com.uiui.appstore.bean.ImageUrl; -import com.uiui.appstore.common.CommonDatas; -import com.uiui.appstore.network.NetInterfaceManager; -import com.uiui.appstore.utils.DensityUtil; -import com.uiui.appstore.utils.LogUtils; -import com.uiui.appstore.utils.ToastUtil; -import com.uiui.appstore.utils.Utils; +import com.uiui.zyappstore.R; +import com.uiui.zyappstore.activity.ClassAppActivity; +import com.uiui.zyappstore.activity.ManagerAppActivity; +import com.uiui.zyappstore.activity.MoreAppActivity; +import com.uiui.zyappstore.adapter.AppAdapter; +import com.uiui.zyappstore.adapter.BannerViewHolder; +import com.uiui.zyappstore.base.LazyLoadFragment; +import com.uiui.zyappstore.base.RefreshManager; +import com.uiui.zyappstore.bean.AppClassBean; +import com.uiui.zyappstore.bean.AppInfo; +import com.uiui.zyappstore.bean.Banner; +import com.uiui.zyappstore.bean.BaseResponse; +import com.uiui.zyappstore.bean.ImageUrl; +import com.uiui.zyappstore.common.CommonDatas; +import com.uiui.zyappstore.network.NetInterfaceManager; +import com.uiui.zyappstore.utils.DensityUtil; +import com.uiui.zyappstore.utils.LogUtils; +import com.uiui.zyappstore.utils.ToastUtil; +import com.uiui.zyappstore.utils.Utils; import com.zhpan.bannerview.BannerViewPager; import com.zhpan.bannerview.constants.IndicatorSlideMode; import com.zhpan.bannerview.constants.PageStyle; diff --git a/app/src/main/java/com/uiui/appstore/fragment/KindFragment.java b/app/src/main/java/com/uiui/zyappstore/fragment/KindFragment.java similarity index 94% rename from app/src/main/java/com/uiui/appstore/fragment/KindFragment.java rename to app/src/main/java/com/uiui/zyappstore/fragment/KindFragment.java index 6ce0dbf..d29d8df 100644 --- a/app/src/main/java/com/uiui/appstore/fragment/KindFragment.java +++ b/app/src/main/java/com/uiui/zyappstore/fragment/KindFragment.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.fragment; +package com.uiui.zyappstore.fragment; import android.os.Bundle; @@ -14,11 +14,11 @@ import androidx.annotation.Nullable; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.uiui.appstore.R; -import com.uiui.appstore.adapter.KindAdapter; -import com.uiui.appstore.base.BaseFragment; -import com.uiui.appstore.base.RefreshManager; -import com.uiui.appstore.bean.Kind; +import com.uiui.zyappstore.R; +import com.uiui.zyappstore.adapter.KindAdapter; +import com.uiui.zyappstore.base.BaseFragment; +import com.uiui.zyappstore.base.RefreshManager; +import com.uiui.zyappstore.bean.Kind; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; import com.scwang.smartrefresh.layout.listener.OnRefreshListener; diff --git a/app/src/main/java/com/uiui/appstore/fragment/ManageFragment.java b/app/src/main/java/com/uiui/zyappstore/fragment/ManageFragment.java similarity index 86% rename from app/src/main/java/com/uiui/appstore/fragment/ManageFragment.java rename to app/src/main/java/com/uiui/zyappstore/fragment/ManageFragment.java index ec0be79..de379b4 100644 --- a/app/src/main/java/com/uiui/appstore/fragment/ManageFragment.java +++ b/app/src/main/java/com/uiui/zyappstore/fragment/ManageFragment.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.fragment; +package com.uiui.zyappstore.fragment; import android.content.Context; import android.content.Intent; @@ -12,16 +12,16 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.arialyy.aria.core.Aria; -import com.uiui.appstore.BuildConfig; -import com.uiui.appstore.R; -import com.uiui.appstore.activity.DownloadManagerActivity; -import com.uiui.appstore.activity.LocalManagerActivity; -import com.uiui.appstore.adapter.UpdateAppAdapter; -import com.uiui.appstore.base.LazyLoadFragment; -import com.uiui.appstore.bean.AppInfo; -import com.uiui.appstore.bean.LocalApp; -import com.uiui.appstore.bean.UpdateAppInfo; -import com.uiui.appstore.utils.ApkUtils; +import com.uiui.zyappstore.BuildConfig; +import com.uiui.zyappstore.R; +import com.uiui.zyappstore.activity.DownloadManagerActivity; +import com.uiui.zyappstore.activity.LocalManagerActivity; +import com.uiui.zyappstore.adapter.UpdateAppAdapter; +import com.uiui.zyappstore.base.LazyLoadFragment; +import com.uiui.zyappstore.bean.AppInfo; +import com.uiui.zyappstore.bean.LocalApp; +import com.uiui.zyappstore.bean.UpdateAppInfo; +import com.uiui.zyappstore.utils.ApkUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/uiui/appstore/fragment/RankFragment.java b/app/src/main/java/com/uiui/zyappstore/fragment/RankFragment.java similarity index 85% rename from app/src/main/java/com/uiui/appstore/fragment/RankFragment.java rename to app/src/main/java/com/uiui/zyappstore/fragment/RankFragment.java index 71cd650..88beba0 100644 --- a/app/src/main/java/com/uiui/appstore/fragment/RankFragment.java +++ b/app/src/main/java/com/uiui/zyappstore/fragment/RankFragment.java @@ -1,29 +1,22 @@ -package com.uiui.appstore.fragment; +package com.uiui.zyappstore.fragment; import android.os.Bundle; -import android.os.Handler; -import android.os.Message; import android.view.View; -import androidx.annotation.NonNull; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.uiui.appstore.R; -import com.uiui.appstore.adapter.AppAdapter; -import com.uiui.appstore.base.LazyLoadFragment; -import com.uiui.appstore.base.RefreshManager; -import com.uiui.appstore.bean.AppInfo; -import com.uiui.appstore.utils.LogUtils; +import com.uiui.zyappstore.R; +import com.uiui.zyappstore.adapter.AppAdapter; +import com.uiui.zyappstore.base.LazyLoadFragment; +import com.uiui.zyappstore.base.RefreshManager; +import com.uiui.zyappstore.utils.LogUtils; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; import com.scwang.smartrefresh.layout.listener.OnRefreshListener; -import java.util.ArrayList; -import java.util.List; - /** * Created by asus on 2017/10/23. diff --git a/app/src/main/java/com/uiui/appstore/gson/GsonUtils.java b/app/src/main/java/com/uiui/zyappstore/gson/GsonUtils.java similarity index 99% rename from app/src/main/java/com/uiui/appstore/gson/GsonUtils.java rename to app/src/main/java/com/uiui/zyappstore/gson/GsonUtils.java index f4fc637..2973b0b 100644 --- a/app/src/main/java/com/uiui/appstore/gson/GsonUtils.java +++ b/app/src/main/java/com/uiui/zyappstore/gson/GsonUtils.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.gson; +package com.uiui.zyappstore.gson; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/app/src/main/java/com/uiui/appstore/gson/IntegerDefault0Adapter.java b/app/src/main/java/com/uiui/zyappstore/gson/IntegerDefault0Adapter.java similarity index 96% rename from app/src/main/java/com/uiui/appstore/gson/IntegerDefault0Adapter.java rename to app/src/main/java/com/uiui/zyappstore/gson/IntegerDefault0Adapter.java index 91eb4dc..b14cbdf 100644 --- a/app/src/main/java/com/uiui/appstore/gson/IntegerDefault0Adapter.java +++ b/app/src/main/java/com/uiui/zyappstore/gson/IntegerDefault0Adapter.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.gson; +package com.uiui.zyappstore.gson; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; diff --git a/app/src/main/java/com/uiui/appstore/gson/NullStringToEmptyAdapterFactory.java b/app/src/main/java/com/uiui/zyappstore/gson/NullStringToEmptyAdapterFactory.java similarity index 97% rename from app/src/main/java/com/uiui/appstore/gson/NullStringToEmptyAdapterFactory.java rename to app/src/main/java/com/uiui/zyappstore/gson/NullStringToEmptyAdapterFactory.java index 0fdfae8..4353925 100644 --- a/app/src/main/java/com/uiui/appstore/gson/NullStringToEmptyAdapterFactory.java +++ b/app/src/main/java/com/uiui/zyappstore/gson/NullStringToEmptyAdapterFactory.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.gson; +package com.uiui.zyappstore.gson; import com.google.gson.Gson; import com.google.gson.TypeAdapter; diff --git a/app/src/main/java/com/uiui/appstore/helper/CustomSnapHelper.java b/app/src/main/java/com/uiui/zyappstore/helper/CustomSnapHelper.java similarity index 98% rename from app/src/main/java/com/uiui/appstore/helper/CustomSnapHelper.java rename to app/src/main/java/com/uiui/zyappstore/helper/CustomSnapHelper.java index 20baa45..abdc7d2 100644 --- a/app/src/main/java/com/uiui/appstore/helper/CustomSnapHelper.java +++ b/app/src/main/java/com/uiui/zyappstore/helper/CustomSnapHelper.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.helper; +package com.uiui.zyappstore.helper; import android.view.View; diff --git a/app/src/main/java/com/uiui/appstore/image/ImageLoader.java b/app/src/main/java/com/uiui/zyappstore/image/ImageLoader.java similarity index 98% rename from app/src/main/java/com/uiui/appstore/image/ImageLoader.java rename to app/src/main/java/com/uiui/zyappstore/image/ImageLoader.java index eeda65a..0def115 100644 --- a/app/src/main/java/com/uiui/appstore/image/ImageLoader.java +++ b/app/src/main/java/com/uiui/zyappstore/image/ImageLoader.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.image; +package com.uiui.zyappstore.image; import android.app.Activity; import android.content.Context; @@ -15,7 +15,7 @@ import com.bumptech.glide.request.RequestOptions; import com.bumptech.glide.request.target.SimpleTarget; import com.bumptech.glide.request.target.Target; import com.bumptech.glide.request.transition.Transition; -import com.uiui.appstore.R; +import com.uiui.zyappstore.R; // ImageLoader 加载图片 清除缓存 diff --git a/app/src/main/java/com/uiui/appstore/manager/ConnectManager.java b/app/src/main/java/com/uiui/zyappstore/manager/ConnectManager.java similarity index 98% rename from app/src/main/java/com/uiui/appstore/manager/ConnectManager.java rename to app/src/main/java/com/uiui/zyappstore/manager/ConnectManager.java index b59a29f..12a879d 100644 --- a/app/src/main/java/com/uiui/appstore/manager/ConnectManager.java +++ b/app/src/main/java/com/uiui/zyappstore/manager/ConnectManager.java @@ -1,11 +1,11 @@ -package com.uiui.appstore.manager; +package com.uiui.zyappstore.manager; import android.annotation.SuppressLint; import android.content.Context; import android.util.Log; import com.tencent.mmkv.MMKV; -import com.uiui.appstore.utils.TimeUtils; +import com.uiui.zyappstore.utils.TimeUtils; public class ConnectManager { private static final String TAG = ConnectManager.class.getSimpleName(); diff --git a/app/src/main/java/com/uiui/appstore/manager/ConnectMode.java b/app/src/main/java/com/uiui/zyappstore/manager/ConnectMode.java similarity index 80% rename from app/src/main/java/com/uiui/appstore/manager/ConnectMode.java rename to app/src/main/java/com/uiui/zyappstore/manager/ConnectMode.java index 937474b..237aa01 100644 --- a/app/src/main/java/com/uiui/appstore/manager/ConnectMode.java +++ b/app/src/main/java/com/uiui/zyappstore/manager/ConnectMode.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.manager; +package com.uiui.zyappstore.manager; public enum ConnectMode { DEFAULT, diff --git a/app/src/main/java/com/uiui/appstore/network/HTTPInterface.java b/app/src/main/java/com/uiui/zyappstore/network/HTTPInterface.java similarity index 93% rename from app/src/main/java/com/uiui/appstore/network/HTTPInterface.java rename to app/src/main/java/com/uiui/zyappstore/network/HTTPInterface.java index e2a56c8..7c1095a 100644 --- a/app/src/main/java/com/uiui/appstore/network/HTTPInterface.java +++ b/app/src/main/java/com/uiui/zyappstore/network/HTTPInterface.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.network; +package com.uiui.zyappstore.network; import android.content.Context; import android.content.pm.PackageInfo; @@ -9,11 +9,11 @@ import android.util.Log; import com.google.gson.Gson; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import com.uiui.appstore.BuildConfig; -import com.uiui.appstore.bean.AppInfo; -import com.uiui.appstore.bean.BaseResponse; -import com.uiui.appstore.utils.FileUtils; -import com.uiui.appstore.utils.JGYUtils; +import com.uiui.zyappstore.BuildConfig; +import com.uiui.zyappstore.bean.AppInfo; +import com.uiui.zyappstore.bean.BaseResponse; +import com.uiui.zyappstore.utils.FileUtils; +import com.uiui.zyappstore.utils.JGYUtils; import io.reactivex.rxjava3.core.Observer; import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; diff --git a/app/src/main/java/com/uiui/appstore/network/NetInterfaceManager.java b/app/src/main/java/com/uiui/zyappstore/network/NetInterfaceManager.java similarity index 76% rename from app/src/main/java/com/uiui/appstore/network/NetInterfaceManager.java rename to app/src/main/java/com/uiui/zyappstore/network/NetInterfaceManager.java index 78cca4f..fc71fbf 100644 --- a/app/src/main/java/com/uiui/appstore/network/NetInterfaceManager.java +++ b/app/src/main/java/com/uiui/zyappstore/network/NetInterfaceManager.java @@ -1,35 +1,40 @@ -package com.uiui.appstore.network; +package com.uiui.zyappstore.network; import android.annotation.SuppressLint; import android.content.Context; import android.os.Environment; import android.util.Log; +import com.alibaba.sdk.android.push.CloudPushService; +import com.alibaba.sdk.android.push.CommonCallback; +import com.alibaba.sdk.android.push.noonesdk.PushServiceFactory; import com.tencent.android.tpush.XGIOperateCallback; import com.tencent.android.tpush.XGPushManager; import com.tencent.mmkv.MMKV; -import com.uiui.appstore.bean.AppClassBean; -import com.uiui.appstore.bean.AppInfo; -import com.uiui.appstore.bean.Banner; -import com.uiui.appstore.bean.BaseResponse; -import com.uiui.appstore.disklrucache.CacheHelper; -import com.uiui.appstore.network.api.AdminAppApi; -import com.uiui.appstore.network.api.AdminAppClassApi; -import com.uiui.appstore.network.api.BannerImage; -import com.uiui.appstore.network.api.ClassAppApi; -import com.uiui.appstore.network.api.DownloadApp; -import com.uiui.appstore.network.api.GetBanner; -import com.uiui.appstore.network.api.NewestAppUpdate; -import com.uiui.appstore.network.api.QueryAllApp; -import com.uiui.appstore.network.api.QueryPackageApp; -import com.uiui.appstore.network.api.SNInfo; -import com.uiui.appstore.network.api.SearchAdminAppApi; -import com.uiui.appstore.network.api.SearchAppApi; -import com.uiui.appstore.network.interceptor.RepeatRequestInterceptor; -import com.uiui.appstore.utils.JGYUtils; -import com.uiui.appstore.utils.Utils; +import com.uiui.zyappstore.bean.AppClassBean; +import com.uiui.zyappstore.bean.AppInfo; +import com.uiui.zyappstore.bean.Banner; +import com.uiui.zyappstore.bean.BaseResponse; +import com.uiui.zyappstore.disklrucache.CacheHelper; +import com.uiui.zyappstore.network.api.AdminAppApi; +import com.uiui.zyappstore.network.api.AdminAppClassApi; +import com.uiui.zyappstore.network.api.BannerImage; +import com.uiui.zyappstore.network.api.ClassAppApi; +import com.uiui.zyappstore.network.api.DownloadApp; +import com.uiui.zyappstore.network.api.GetBanner; +import com.uiui.zyappstore.network.api.NewestAppUpdate; +import com.uiui.zyappstore.network.api.QueryAllApp; +import com.uiui.zyappstore.network.api.QueryPackageApp; +import com.uiui.zyappstore.network.api.SNInfo; +import com.uiui.zyappstore.network.api.SearchAdminAppApi; +import com.uiui.zyappstore.network.api.SearchAppApi; +import com.uiui.zyappstore.network.interceptor.RepeatRequestInterceptor; +import com.uiui.zyappstore.utils.JGYUtils; +import com.uiui.zyappstore.utils.Utils; import java.io.File; +import java.util.ArrayList; +import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -191,7 +196,7 @@ public class NetInterfaceManager { } public void setPushTags(onCompleteCallback callback) { - Set set = new HashSet(); + Set set = new HashSet<>(); JGYUtils.getInstance().getAppPlatform(platform -> { if (platform == JGYUtils.MTKPlatform) { set.add(JGYUtils.MTKTag); @@ -201,13 +206,17 @@ public class NetInterfaceManager { set.add(JGYUtils.NewZhanruiTag); } else if (platform == JGYUtils.UMTK11Platform) { set.add(JGYUtils.UMTK11Tag); + } else if (platform == JGYUtils.UZY12Platform) { + set.add(JGYUtils.UZY12Tag); + } else if (platform == JGYUtils.TeclastMTK12Platform) { + set.add(JGYUtils.TeclastMTK12Tag); } }); - clearAndAppendTags(set); + setpushTag(set); callback.onComplete(); } - private void clearAndAppendTags(Set tagSets) { + private void setpushTag(Set tagSets) { XGPushManager.clearAndAppendTags(mContext, "clearAndAppendTags :" + System.currentTimeMillis(), tagSets, new XGIOperateCallback() { @Override public void onSuccess(Object o, int i) { @@ -219,6 +228,19 @@ public class NetInterfaceManager { Log.e("setPushTags", "onFail: " + o); } }); - } + String[] tag = new ArrayList<>(tagSets).toArray(new String[tagSets.size()]); + CloudPushService pushService = PushServiceFactory.getCloudPushService(); + pushService.bindTag(CloudPushService.DEVICE_TARGET, tag, null, new CommonCallback() { + @Override + public void onSuccess(String s) { + Log.e("bindTag","bind tag " + Arrays.toString(tag) + " success\n"); + } -} + @Override + public void onFailed(String errorCode, String errorMsg) { + Log.e("bindTag","bind tag " + Arrays.toString(tag) + " failed." + + "errorCode: " + errorCode + ", errorMsg:" + errorMsg + "\n"); + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/uiui/appstore/network/UrlAddress.java b/app/src/main/java/com/uiui/zyappstore/network/UrlAddress.java similarity index 87% rename from app/src/main/java/com/uiui/appstore/network/UrlAddress.java rename to app/src/main/java/com/uiui/zyappstore/network/UrlAddress.java index a5dd3d4..ad92c67 100644 --- a/app/src/main/java/com/uiui/appstore/network/UrlAddress.java +++ b/app/src/main/java/com/uiui/zyappstore/network/UrlAddress.java @@ -1,7 +1,7 @@ -package com.uiui.appstore.network; +package com.uiui.zyappstore.network; public class UrlAddress { - final static String ROOT_URL = "https://led.zuoyepad.com/android/"; + public static final String ROOT_URL = "https://led.aolelearn.com/android/"; //获取所有应用 public final static String GET_ALL_APPINFO = "app/queryAllApp"; diff --git a/app/src/main/java/com/uiui/appstore/network/api/AdminAppApi.java b/app/src/main/java/com/uiui/zyappstore/network/api/AdminAppApi.java similarity index 56% rename from app/src/main/java/com/uiui/appstore/network/api/AdminAppApi.java rename to app/src/main/java/com/uiui/zyappstore/network/api/AdminAppApi.java index e5e2648..3bc28c6 100644 --- a/app/src/main/java/com/uiui/appstore/network/api/AdminAppApi.java +++ b/app/src/main/java/com/uiui/zyappstore/network/api/AdminAppApi.java @@ -1,8 +1,8 @@ -package com.uiui.appstore.network.api; +package com.uiui.zyappstore.network.api; -import com.uiui.appstore.bean.AppInfo; -import com.uiui.appstore.bean.BaseResponse; -import com.uiui.appstore.network.UrlAddress; +import com.uiui.zyappstore.bean.AppInfo; +import com.uiui.zyappstore.bean.BaseResponse; +import com.uiui.zyappstore.network.UrlAddress; import java.util.List; diff --git a/app/src/main/java/com/uiui/appstore/network/api/AdminAppClassApi.java b/app/src/main/java/com/uiui/zyappstore/network/api/AdminAppClassApi.java similarity index 58% rename from app/src/main/java/com/uiui/appstore/network/api/AdminAppClassApi.java rename to app/src/main/java/com/uiui/zyappstore/network/api/AdminAppClassApi.java index f81e47d..2735239 100644 --- a/app/src/main/java/com/uiui/appstore/network/api/AdminAppClassApi.java +++ b/app/src/main/java/com/uiui/zyappstore/network/api/AdminAppClassApi.java @@ -1,8 +1,8 @@ -package com.uiui.appstore.network.api; +package com.uiui.zyappstore.network.api; -import com.uiui.appstore.bean.AppClassBean; -import com.uiui.appstore.bean.BaseResponse; -import com.uiui.appstore.network.UrlAddress; +import com.uiui.zyappstore.bean.AppClassBean; +import com.uiui.zyappstore.bean.BaseResponse; +import com.uiui.zyappstore.network.UrlAddress; import java.util.List; diff --git a/app/src/main/java/com/uiui/appstore/network/api/BannerImage.java b/app/src/main/java/com/uiui/zyappstore/network/api/BannerImage.java similarity index 62% rename from app/src/main/java/com/uiui/appstore/network/api/BannerImage.java rename to app/src/main/java/com/uiui/zyappstore/network/api/BannerImage.java index 46f3f96..3b0d043 100644 --- a/app/src/main/java/com/uiui/appstore/network/api/BannerImage.java +++ b/app/src/main/java/com/uiui/zyappstore/network/api/BannerImage.java @@ -1,8 +1,8 @@ -package com.uiui.appstore.network.api; +package com.uiui.zyappstore.network.api; -import com.uiui.appstore.bean.BaseResponse; -import com.uiui.appstore.bean.ImageUrl; -import com.uiui.appstore.network.UrlAddress; +import com.uiui.zyappstore.bean.BaseResponse; +import com.uiui.zyappstore.bean.ImageUrl; +import com.uiui.zyappstore.network.UrlAddress; import java.util.List; diff --git a/app/src/main/java/com/uiui/appstore/network/api/ClassAppApi.java b/app/src/main/java/com/uiui/zyappstore/network/api/ClassAppApi.java similarity index 63% rename from app/src/main/java/com/uiui/appstore/network/api/ClassAppApi.java rename to app/src/main/java/com/uiui/zyappstore/network/api/ClassAppApi.java index 7debda6..31a4af6 100644 --- a/app/src/main/java/com/uiui/appstore/network/api/ClassAppApi.java +++ b/app/src/main/java/com/uiui/zyappstore/network/api/ClassAppApi.java @@ -1,8 +1,8 @@ -package com.uiui.appstore.network.api; +package com.uiui.zyappstore.network.api; -import com.uiui.appstore.bean.AppInfo; -import com.uiui.appstore.bean.BaseResponse; -import com.uiui.appstore.network.UrlAddress; +import com.uiui.zyappstore.bean.AppInfo; +import com.uiui.zyappstore.bean.BaseResponse; +import com.uiui.zyappstore.network.UrlAddress; import java.util.List; diff --git a/app/src/main/java/com/uiui/appstore/network/api/DownloadApp.java b/app/src/main/java/com/uiui/zyappstore/network/api/DownloadApp.java similarity index 77% rename from app/src/main/java/com/uiui/appstore/network/api/DownloadApp.java rename to app/src/main/java/com/uiui/zyappstore/network/api/DownloadApp.java index 1658596..a4f3575 100644 --- a/app/src/main/java/com/uiui/appstore/network/api/DownloadApp.java +++ b/app/src/main/java/com/uiui/zyappstore/network/api/DownloadApp.java @@ -1,7 +1,7 @@ -package com.uiui.appstore.network.api; +package com.uiui.zyappstore.network.api; -import com.uiui.appstore.bean.BaseResponse; -import com.uiui.appstore.network.UrlAddress; +import com.uiui.zyappstore.bean.BaseResponse; +import com.uiui.zyappstore.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/uiui/appstore/network/api/GetBanner.java b/app/src/main/java/com/uiui/zyappstore/network/api/GetBanner.java similarity index 52% rename from app/src/main/java/com/uiui/appstore/network/api/GetBanner.java rename to app/src/main/java/com/uiui/zyappstore/network/api/GetBanner.java index 082cc0f..d93b853 100644 --- a/app/src/main/java/com/uiui/appstore/network/api/GetBanner.java +++ b/app/src/main/java/com/uiui/zyappstore/network/api/GetBanner.java @@ -1,8 +1,8 @@ -package com.uiui.appstore.network.api; +package com.uiui.zyappstore.network.api; -import com.uiui.appstore.bean.Banner; -import com.uiui.appstore.bean.BaseResponse; -import com.uiui.appstore.network.UrlAddress; +import com.uiui.zyappstore.bean.Banner; +import com.uiui.zyappstore.bean.BaseResponse; +import com.uiui.zyappstore.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/uiui/appstore/network/api/NewestAppUpdate.java b/app/src/main/java/com/uiui/zyappstore/network/api/NewestAppUpdate.java similarity index 68% rename from app/src/main/java/com/uiui/appstore/network/api/NewestAppUpdate.java rename to app/src/main/java/com/uiui/zyappstore/network/api/NewestAppUpdate.java index 90fbf97..bbe7785 100644 --- a/app/src/main/java/com/uiui/appstore/network/api/NewestAppUpdate.java +++ b/app/src/main/java/com/uiui/zyappstore/network/api/NewestAppUpdate.java @@ -1,10 +1,10 @@ -package com.uiui.appstore.network.api; +package com.uiui.zyappstore.network.api; -import com.uiui.appstore.bean.AppInfo; -import com.uiui.appstore.bean.BaseResponse; -import com.uiui.appstore.network.UrlAddress; +import com.uiui.zyappstore.bean.AppInfo; +import com.uiui.zyappstore.bean.BaseResponse; +import com.uiui.zyappstore.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/uiui/appstore/network/api/QueryAllApp.java b/app/src/main/java/com/uiui/zyappstore/network/api/QueryAllApp.java similarity index 62% rename from app/src/main/java/com/uiui/appstore/network/api/QueryAllApp.java rename to app/src/main/java/com/uiui/zyappstore/network/api/QueryAllApp.java index eff8fb0..fad2815 100644 --- a/app/src/main/java/com/uiui/appstore/network/api/QueryAllApp.java +++ b/app/src/main/java/com/uiui/zyappstore/network/api/QueryAllApp.java @@ -1,8 +1,8 @@ -package com.uiui.appstore.network.api; +package com.uiui.zyappstore.network.api; -import com.uiui.appstore.bean.AppInfo; -import com.uiui.appstore.bean.BaseResponse; -import com.uiui.appstore.network.UrlAddress; +import com.uiui.zyappstore.bean.AppInfo; +import com.uiui.zyappstore.bean.BaseResponse; +import com.uiui.zyappstore.network.UrlAddress; import java.util.List; diff --git a/app/src/main/java/com/uiui/appstore/network/api/QueryPackageApp.java b/app/src/main/java/com/uiui/zyappstore/network/api/QueryPackageApp.java similarity index 66% rename from app/src/main/java/com/uiui/appstore/network/api/QueryPackageApp.java rename to app/src/main/java/com/uiui/zyappstore/network/api/QueryPackageApp.java index 527297d..b2322fd 100644 --- a/app/src/main/java/com/uiui/appstore/network/api/QueryPackageApp.java +++ b/app/src/main/java/com/uiui/zyappstore/network/api/QueryPackageApp.java @@ -1,8 +1,8 @@ -package com.uiui.appstore.network.api; +package com.uiui.zyappstore.network.api; -import com.uiui.appstore.bean.AppInfo; -import com.uiui.appstore.bean.BaseResponse; -import com.uiui.appstore.network.UrlAddress; +import com.uiui.zyappstore.bean.AppInfo; +import com.uiui.zyappstore.bean.BaseResponse; +import com.uiui.zyappstore.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/uiui/appstore/network/api/SNInfo.java b/app/src/main/java/com/uiui/zyappstore/network/api/SNInfo.java similarity index 60% rename from app/src/main/java/com/uiui/appstore/network/api/SNInfo.java rename to app/src/main/java/com/uiui/zyappstore/network/api/SNInfo.java index 943b3ea..97b1c47 100644 --- a/app/src/main/java/com/uiui/appstore/network/api/SNInfo.java +++ b/app/src/main/java/com/uiui/zyappstore/network/api/SNInfo.java @@ -1,8 +1,8 @@ -package com.uiui.appstore.network.api; +package com.uiui.zyappstore.network.api; -import com.uiui.appstore.bean.BaseResponse; -import com.uiui.appstore.bean.UserInfo; -import com.uiui.appstore.network.UrlAddress; +import com.uiui.zyappstore.bean.BaseResponse; +import com.uiui.zyappstore.bean.UserInfo; +import com.uiui.zyappstore.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/uiui/appstore/network/api/SearchAdminAppApi.java b/app/src/main/java/com/uiui/zyappstore/network/api/SearchAdminAppApi.java similarity index 64% rename from app/src/main/java/com/uiui/appstore/network/api/SearchAdminAppApi.java rename to app/src/main/java/com/uiui/zyappstore/network/api/SearchAdminAppApi.java index f28778e..2eb5aa9 100644 --- a/app/src/main/java/com/uiui/appstore/network/api/SearchAdminAppApi.java +++ b/app/src/main/java/com/uiui/zyappstore/network/api/SearchAdminAppApi.java @@ -1,8 +1,8 @@ -package com.uiui.appstore.network.api; +package com.uiui.zyappstore.network.api; -import com.uiui.appstore.bean.AppInfo; -import com.uiui.appstore.bean.BaseResponse; -import com.uiui.appstore.network.UrlAddress; +import com.uiui.zyappstore.bean.AppInfo; +import com.uiui.zyappstore.bean.BaseResponse; +import com.uiui.zyappstore.network.UrlAddress; import java.util.List; diff --git a/app/src/main/java/com/uiui/appstore/network/api/SearchAppApi.java b/app/src/main/java/com/uiui/zyappstore/network/api/SearchAppApi.java similarity index 66% rename from app/src/main/java/com/uiui/appstore/network/api/SearchAppApi.java rename to app/src/main/java/com/uiui/zyappstore/network/api/SearchAppApi.java index 00e2ece..3f02384 100644 --- a/app/src/main/java/com/uiui/appstore/network/api/SearchAppApi.java +++ b/app/src/main/java/com/uiui/zyappstore/network/api/SearchAppApi.java @@ -1,8 +1,8 @@ -package com.uiui.appstore.network.api; +package com.uiui.zyappstore.network.api; -import com.uiui.appstore.bean.AppInfo; -import com.uiui.appstore.bean.BaseResponse; -import com.uiui.appstore.network.UrlAddress; +import com.uiui.zyappstore.bean.AppInfo; +import com.uiui.zyappstore.bean.BaseResponse; +import com.uiui.zyappstore.network.UrlAddress; import java.util.List; diff --git a/app/src/main/java/com/uiui/appstore/network/interceptor/RepeatRequestInterceptor.java b/app/src/main/java/com/uiui/zyappstore/network/interceptor/RepeatRequestInterceptor.java similarity index 96% rename from app/src/main/java/com/uiui/appstore/network/interceptor/RepeatRequestInterceptor.java rename to app/src/main/java/com/uiui/zyappstore/network/interceptor/RepeatRequestInterceptor.java index 5b69268..3b1eca7 100644 --- a/app/src/main/java/com/uiui/appstore/network/interceptor/RepeatRequestInterceptor.java +++ b/app/src/main/java/com/uiui/zyappstore/network/interceptor/RepeatRequestInterceptor.java @@ -1,10 +1,10 @@ -package com.uiui.appstore.network.interceptor; +package com.uiui.zyappstore.network.interceptor; import android.util.Log; -import com.uiui.appstore.BuildConfig; -import com.uiui.appstore.utils.MD5Util; +import com.uiui.zyappstore.BuildConfig; +import com.uiui.zyappstore.utils.MD5Util; import org.jetbrains.annotations.NotNull; diff --git a/app/src/main/java/com/uiui/zyappstore/push/PushManager.java b/app/src/main/java/com/uiui/zyappstore/push/PushManager.java new file mode 100644 index 0000000..de90ba9 --- /dev/null +++ b/app/src/main/java/com/uiui/zyappstore/push/PushManager.java @@ -0,0 +1,85 @@ +package com.uiui.zyappstore.push; + +import android.annotation.SuppressLint; +import android.content.ContentResolver; +import android.content.Context; +import android.text.TextUtils; + +import com.arialyy.aria.core.Aria; +import com.arialyy.aria.core.download.DownloadEntity; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import com.uiui.zyappstore.disklrucache.CacheHelper; +import com.uiui.zyappstore.utils.FileUtils; +import com.uiui.zyappstore.utils.JGYUtils; +import com.uiui.zyappstore.utils.ToastUtil; + +import java.io.File; +import java.util.List; + +public class PushManager { + private static final String TAG = PushManager.class.getSimpleName(); + + @SuppressLint("StaticFieldLeak") + private static PushManager sInstance; + private Context mContext; + private ContentResolver mResolver; + private CacheHelper mCacheHelper; + + private PushManager(Context context) { + if (context == null) { + throw new RuntimeException("Context is NULL"); + } + this.mContext = context; + this.mResolver = context.getContentResolver(); + this.mCacheHelper = new CacheHelper(context); + } + + public static void init(Context context) { + if (sInstance == null) { + sInstance = new PushManager(context); + } + } + + public static PushManager getInstance() { + if (sInstance == null) { + throw new IllegalStateException("You must be init PushManager first"); + } + return sInstance; + } + + // 9.强制安装应用 + private static final String ACTION_FORCE_INSTALLAPK = "9"; + + public void setPushContent(String title, String extras) { + switch (title) { + case ACTION_FORCE_INSTALLAPK: + forceInstallApk( extras); + break; + default: + } + } + + private void forceInstallApk(String jsonString) { + if (TextUtils.isEmpty(jsonString)) { + return; + } + JsonObject jsonObject = JsonParser.parseString(jsonString).getAsJsonObject(); + final String packages = jsonObject.get("package").getAsString(); + ToastUtil.debugShow("收到应用安装消息：包名" + packages); + String url = jsonObject.get("url").getAsString(); + if (TextUtils.isEmpty(url)) { + return; + } + if (Aria.download(this).taskExists(url)) { + List entity = Aria.download(this).getDownloadEntity(url); + for (DownloadEntity downloadEntity : entity) { + Aria.download(this).load(downloadEntity.getId()).cancel(true); + } + } + File file = new File(JGYUtils.getInstance().getDownLoadPath()); + file.mkdirs(); + FileUtils.ariaDownload(mContext, url, jsonObject); + Aria.download(this).resumeAllTask(); + } +} diff --git a/app/src/main/java/com/uiui/zyappstore/push/alipush/AliMessageIntentService.java b/app/src/main/java/com/uiui/zyappstore/push/alipush/AliMessageIntentService.java new file mode 100644 index 0000000..58e371b --- /dev/null +++ b/app/src/main/java/com/uiui/zyappstore/push/alipush/AliMessageIntentService.java @@ -0,0 +1,99 @@ +package com.uiui.zyappstore.push.alipush; + +import android.content.Context; +import android.util.Log; + +import com.alibaba.sdk.android.push.AliyunMessageIntentService; +import com.alibaba.sdk.android.push.notification.CPushMessage; + +import java.util.Map; + +/** + * Created by liyazhou on 17/8/22. + * 为避免推送广播被系统拦截的小概率事件,我们推荐用户通过IntentService处理消息互调,接入步骤: + * 1. 创建IntentService并继承AliyunMessageIntentService + * 2. 覆写相关方法,并在Manifest的注册该Service + * 3. 调用接口CloudPushService.setPushIntentService + * 详细用户可参考:https://help.aliyun.com/document_detail/30066.html#h2-2-messagereceiver-aliyunmessageintentservice + */ + +public class AliMessageIntentService extends AliyunMessageIntentService { + private static final String TAG = AliyunMessageIntentService.class.getSimpleName(); + + /** + * 推送通知的回调方法 + * + * @param context + * @param title + * @param summary + * @param extraMap + */ + @Override + protected void onNotification(Context context, String title, String summary, Map extraMap) { + Log.i(TAG, "收到一条推送通知 ： " + title + ", summary:" + summary); + } + + /** + * 推送消息的回调方法 + * + * @param context + * @param cPushMessage + */ + @Override + protected void onMessage(Context context, CPushMessage cPushMessage) { + Log.i(TAG, "收到一条推送消息 ： " + cPushMessage.getTitle() + ", content:" + cPushMessage.getContent()); + } + + /** + * 从通知栏打开通知的扩展处理 + * + * @param context + * @param title + * @param summary + * @param extraMap + */ + @Override + protected void onNotificationOpened(Context context, String title, String summary, String extraMap) { + Log.i(TAG, "onNotificationOpened ： " + " : " + title + " : " + summary + " : " + extraMap); + } + + /** + * 无动作通知点击回调。当在后台或阿里云控制台指定的通知动作为无逻辑跳转时,通知点击回调为onNotificationClickedWithNoAction而不是onNotificationOpened + * + * @param context + * @param title + * @param summary + * @param extraMap + */ + @Override + protected void onNotificationClickedWithNoAction(Context context, String title, String summary, String extraMap) { + Log.i(TAG, "onNotificationClickedWithNoAction ： " + " : " + title + " : " + summary + " : " + extraMap); + } + + /** + * 通知删除回调 + * + * @param context + * @param messageId + */ + @Override + protected void onNotificationRemoved(Context context, String messageId) { + Log.i(TAG, "onNotificationRemoved ： " + messageId); + } + + /** + * 应用处于前台时通知到达回调。注意:该方法仅对自定义样式通知有效,相关详情请参考https://help.aliyun.com/document_detail/30066.html#h3-3-4-basiccustompushnotification-api + * + * @param context + * @param title + * @param summary + * @param extraMap + * @param openType + * @param openActivity + * @param openUrl + */ + @Override + protected void onNotificationReceivedInApp(Context context, String title, String summary, Map extraMap, int openType, String openActivity, String openUrl) { + Log.i(TAG, "onNotificationReceivedInApp ： " + " : " + title + " : " + summary + " " + extraMap + " : " + openType + " : " + openActivity + " : " + openUrl); + } +} diff --git a/app/src/main/java/com/uiui/zyappstore/push/alipush/AliyunMessageReceiver.java b/app/src/main/java/com/uiui/zyappstore/push/alipush/AliyunMessageReceiver.java new file mode 100644 index 0000000..37a04d0 --- /dev/null +++ b/app/src/main/java/com/uiui/zyappstore/push/alipush/AliyunMessageReceiver.java @@ -0,0 +1,116 @@ +package com.uiui.zyappstore.push.alipush; + +import android.content.Context; +import android.util.Log; + +import com.alibaba.sdk.android.push.MessageReceiver; +import com.alibaba.sdk.android.push.notification.CPushMessage; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import com.uiui.zyappstore.push.PushManager; + +import java.util.Map; + +/** + * @author: 正纬 + * @since: 15/4/9 + * @version: 1.1 + * @feature: 用于接收推送的通知和消息 + */ +public class AliyunMessageReceiver extends MessageReceiver { + // 消息接收部分的LOG_TAG + public static final String TAG = AliyunMessageReceiver.class.getSimpleName(); + + /** + * 推送通知的回调方法 + * + * @param context + * @param title + * @param summary + * @param extraMap + */ + @Override + public void onNotification(Context context, String title, String summary, Map extraMap) { + // TODO 处理推送通知 + if (null != extraMap) { + for (Map.Entry entry : extraMap.entrySet()) { + Log.i(TAG, "@Get diy param : Key=" + entry.getKey() + " , Value=" + entry.getValue()); + } + } else { + Log.i(TAG, "@收到通知 && 自定义消息为空"); + } + Log.i(TAG, "收到一条推送通知 ： " + title + ", summary:" + summary); + } + + /** + * 应用处于前台时通知到达回调。注意:该方法仅对自定义样式通知有效,相关详情请参考https://help.aliyun.com/document_detail/30066.html?spm=5176.product30047.6.620.wjcC87#h3-3-4-basiccustompushnotification-api + * + * @param context + * @param title + * @param summary + * @param extraMap + * @param openType + * @param openActivity + * @param openUrl + */ + @Override + protected void onNotificationReceivedInApp(Context context, String title, String summary, Map extraMap, int openType, String openActivity, String openUrl) { + Log.i(TAG, "onNotificationReceivedInApp ： " + " : " + title + " : " + summary + " " + extraMap + " : " + openType + " : " + openActivity + " : " + openUrl); + } + + /** + * 推送消息的回调方法 + * + * @param context + * @param cPushMessage + */ + @Override + public void onMessage(Context context, CPushMessage cPushMessage) { + Log.e(TAG, "收到一条推送消息 ： " + cPushMessage.getTitle() + ", content:" + cPushMessage.getContent()); + String title = cPushMessage.getTitle(); + String content = cPushMessage.getContent(); + JsonObject extrasJson = JsonParser.parseString(content).getAsJsonObject(); + String extras = ""; + if (extrasJson.get("extras") != null) { + extras = extrasJson.get("extras").toString(); + } + PushManager.getInstance().setPushContent(title, extras); + } + + /** + * 从通知栏打开通知的扩展处理 + * + * @param context + * @param title + * @param summary + * @param extraMap + */ + @Override + public void onNotificationOpened(Context context, String title, String summary, String extraMap) { + Log.i(TAG, "onNotificationOpened ： " + " : " + title + " : " + summary + " : " + extraMap); + } + + /** + * 通知删除回调 + * + * @param context + * @param messageId + */ + @Override + public void onNotificationRemoved(Context context, String messageId) { + Log.i(TAG, "onNotificationRemoved ： " + messageId); + } + + /** + * 无动作通知点击回调。当在后台或阿里云控制台指定的通知动作为无逻辑跳转时,通知点击回调为onNotificationClickedWithNoAction而不是onNotificationOpened + * + * @param context + * @param title + * @param summary + * @param extraMap + */ + @Override + protected void onNotificationClickedWithNoAction(Context context, String title, String summary, String extraMap) { + Log.i(TAG, "onNotificationClickedWithNoAction ： " + " : " + title + " : " + summary + " : " + extraMap); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/uiui/appstore/tpush/Constants.java b/app/src/main/java/com/uiui/zyappstore/push/tpush/Constants.java similarity index 92% rename from app/src/main/java/com/uiui/appstore/tpush/Constants.java rename to app/src/main/java/com/uiui/zyappstore/push/tpush/Constants.java index f1800dc..8984373 100644 --- a/app/src/main/java/com/uiui/appstore/tpush/Constants.java +++ b/app/src/main/java/com/uiui/zyappstore/push/tpush/Constants.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.tpush; +package com.uiui.zyappstore.push.tpush; /** * Created by chacewang on 2019/7/5. diff --git a/app/src/main/java/com/uiui/appstore/tpush/MessageReceiver.java b/app/src/main/java/com/uiui/zyappstore/push/tpush/MessageReceiver.java similarity index 87% rename from app/src/main/java/com/uiui/appstore/tpush/MessageReceiver.java rename to app/src/main/java/com/uiui/zyappstore/push/tpush/MessageReceiver.java index a148706..393806e 100644 --- a/app/src/main/java/com/uiui/appstore/tpush/MessageReceiver.java +++ b/app/src/main/java/com/uiui/zyappstore/push/tpush/MessageReceiver.java @@ -1,10 +1,9 @@ -package com.uiui.appstore.tpush; +package com.uiui.zyappstore.push.tpush; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; -import android.os.Environment; import android.text.TextUtils; import android.util.Log; import android.widget.Toast; @@ -19,11 +18,12 @@ import com.tencent.android.tpush.XGPushClickedResult; import com.tencent.android.tpush.XGPushRegisterResult; import com.tencent.android.tpush.XGPushShowedResult; import com.tencent.android.tpush.XGPushTextMessage; -import com.uiui.appstore.tpush.common.NotificationService; -import com.uiui.appstore.tpush.po.XGNotification; -import com.uiui.appstore.utils.FileUtils; -import com.uiui.appstore.utils.JGYUtils; -import com.uiui.appstore.utils.ToastUtil; +import com.uiui.zyappstore.push.PushManager; +import com.uiui.zyappstore.push.tpush.common.NotificationService; +import com.uiui.zyappstore.push.tpush.po.XGNotification; +import com.uiui.zyappstore.utils.FileUtils; +import com.uiui.zyappstore.utils.JGYUtils; +import com.uiui.zyappstore.utils.ToastUtil; import java.io.File; import java.text.SimpleDateFormat; @@ -295,9 +295,6 @@ public class MessageReceiver extends XGPushBaseReceiver { // Toast.makeText(context, text, Toast.LENGTH_SHORT).show(); } - // 9.强制安装应用 - private static final String ACTION_FORCE_INSTALLAPK = "9"; - private void processCustomMessage(Context context, XGPushTextMessage message) { if (context == null || message == null) { return; @@ -311,36 +308,6 @@ public class MessageReceiver extends XGPushBaseReceiver { if (extrasJson.get("extras") != null) { extras = extrasJson.get("extras").toString(); } - - switch (title) { - case ACTION_FORCE_INSTALLAPK: - forceInstallApk(context, extras); - break; - default: - } - - } - - private void forceInstallApk(Context context, String jsonString) { - if (TextUtils.isEmpty(jsonString)) { - return; - } - JsonObject jsonObject = JsonParser.parseString(jsonString).getAsJsonObject(); - final String packages = jsonObject.get("package").getAsString(); - ToastUtil.debugShow("收到应用安装消息：包名" + packages); - String url = jsonObject.get("url").getAsString(); - if (TextUtils.isEmpty(url)) { - return; - } - if (Aria.download(this).taskExists(url)) { - List entity = Aria.download(this).getDownloadEntity(url); - for (DownloadEntity downloadEntity : entity) { - Aria.download(this).load(downloadEntity.getId()).cancel(true); - } - } - File file = new File(JGYUtils.getInstance().getDownLoadPath()); - file.mkdirs(); - FileUtils.ariaDownload(context, url, jsonObject); - Aria.download(this).resumeAllTask(); + PushManager.getInstance().setPushContent(title, extras); } } diff --git a/app/src/main/java/com/uiui/appstore/tpush/common/DBOpenHelper.java b/app/src/main/java/com/uiui/zyappstore/push/tpush/common/DBOpenHelper.java similarity index 93% rename from app/src/main/java/com/uiui/appstore/tpush/common/DBOpenHelper.java rename to app/src/main/java/com/uiui/zyappstore/push/tpush/common/DBOpenHelper.java index 70d5b53..5bd3d59 100644 --- a/app/src/main/java/com/uiui/appstore/tpush/common/DBOpenHelper.java +++ b/app/src/main/java/com/uiui/zyappstore/push/tpush/common/DBOpenHelper.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.tpush.common; +package com.uiui.zyappstore.push.tpush.common; import android.content.Context; import android.database.sqlite.SQLiteDatabase; diff --git a/app/src/main/java/com/uiui/appstore/tpush/common/NotificationService.java b/app/src/main/java/com/uiui/zyappstore/push/tpush/common/NotificationService.java similarity index 97% rename from app/src/main/java/com/uiui/appstore/tpush/common/NotificationService.java rename to app/src/main/java/com/uiui/zyappstore/push/tpush/common/NotificationService.java index fa2c565..323bd58 100644 --- a/app/src/main/java/com/uiui/appstore/tpush/common/NotificationService.java +++ b/app/src/main/java/com/uiui/zyappstore/push/tpush/common/NotificationService.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.tpush.common; +package com.uiui.zyappstore.push.tpush.common; import android.content.ContentValues; import android.content.Context; @@ -6,7 +6,7 @@ import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; -import com.uiui.appstore.tpush.po.XGNotification; +import com.uiui.zyappstore.push.tpush.po.XGNotification; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/uiui/appstore/tpush/po/XGNotification.java b/app/src/main/java/com/uiui/zyappstore/push/tpush/po/XGNotification.java similarity index 97% rename from app/src/main/java/com/uiui/appstore/tpush/po/XGNotification.java rename to app/src/main/java/com/uiui/zyappstore/push/tpush/po/XGNotification.java index bf4be2a..8c239e7 100644 --- a/app/src/main/java/com/uiui/appstore/tpush/po/XGNotification.java +++ b/app/src/main/java/com/uiui/zyappstore/push/tpush/po/XGNotification.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.tpush.po; +package com.uiui.zyappstore.push.tpush.po; public class XGNotification { private Integer id; diff --git a/app/src/main/java/com/uiui/appstore/receiver/AppManagerReceiver.java b/app/src/main/java/com/uiui/zyappstore/receiver/AppManagerReceiver.java similarity index 84% rename from app/src/main/java/com/uiui/appstore/receiver/AppManagerReceiver.java rename to app/src/main/java/com/uiui/zyappstore/receiver/AppManagerReceiver.java index 705718d..4ec2f3b 100644 --- a/app/src/main/java/com/uiui/appstore/receiver/AppManagerReceiver.java +++ b/app/src/main/java/com/uiui/zyappstore/receiver/AppManagerReceiver.java @@ -1,14 +1,14 @@ -package com.uiui.appstore.receiver; +package com.uiui.zyappstore.receiver; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.util.Log; -import com.uiui.appstore.utils.ApkUtils; -import com.uiui.appstore.utils.LogUtils; -import com.uiui.appstore.utils.SPUtils; -import com.uiui.appstore.utils.ToastUtil; +import com.uiui.zyappstore.utils.ApkUtils; +import com.uiui.zyappstore.utils.LogUtils; +import com.uiui.zyappstore.utils.SPUtils; +import com.uiui.zyappstore.utils.ToastUtil; import java.util.Arrays; @@ -28,11 +28,11 @@ public class AppManagerReceiver extends BroadcastReceiver { if (action.equals(Intent.ACTION_PACKAGE_ADDED) || action.equals(Intent.ACTION_PACKAGE_REPLACED)) { String packageName = intent.getDataString().replace("package:", ""); if (action.equals(Intent.ACTION_PACKAGE_ADDED)) { - Intent intents = new Intent("com.uiui.appstore.PACKAGE_ADDED"); + Intent intents = new Intent("com.uiui.zyappstore.PACKAGE_ADDED"); intents.putExtra("package", packageName); context.sendBroadcast(intents); } else { - Intent intents = new Intent("com.uiui.appstore.PACKAGE_REPLACED"); + Intent intents = new Intent("com.uiui.zyappstore.PACKAGE_REPLACED"); intents.putExtra("package", packageName); context.sendBroadcast(intents); } @@ -53,7 +53,7 @@ public class AppManagerReceiver extends BroadcastReceiver { if (action.equals(Intent.ACTION_PACKAGE_REMOVED)) { String packageName = intent.getDataString().replace("package:", ""); LogUtils.e(TAG, "卸载了:" + packageName + "包名的程序"); - Intent intents = new Intent("com.uiui.appstore.PACKAGE_REMOVED"); + Intent intents = new Intent("com.uiui.zyappstore.PACKAGE_REMOVED"); context.sendBroadcast(intents); if (!packageName.equals(context.getPackageName()) && !Arrays.asList(packages).contains(packageName)) { if (admin_id == -1 || sn_id == -1) { @@ -71,7 +71,7 @@ public class AppManagerReceiver extends BroadcastReceiver { } String[] packages = { - "com.uiui.appstore", + "com.uiui.zyappstore", "com.uiuios.updatetools", "com.uiui.sn", "com.android.uiuios", diff --git a/app/src/main/java/com/uiui/appstore/receiver/BootReceiver.java b/app/src/main/java/com/uiui/zyappstore/receiver/BootReceiver.java similarity index 78% rename from app/src/main/java/com/uiui/appstore/receiver/BootReceiver.java rename to app/src/main/java/com/uiui/zyappstore/receiver/BootReceiver.java index c9906af..982b474 100644 --- a/app/src/main/java/com/uiui/appstore/receiver/BootReceiver.java +++ b/app/src/main/java/com/uiui/zyappstore/receiver/BootReceiver.java @@ -1,15 +1,15 @@ -package com.uiui.appstore.receiver; +package com.uiui.zyappstore.receiver; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.util.Log; -import com.uiui.appstore.service.GuardService; -import com.uiui.appstore.service.main.MainService; -import com.uiui.appstore.service.StepService; -import com.uiui.appstore.utils.JGYUtils; -import com.uiui.appstore.utils.LogUtils; +import com.uiui.zyappstore.service.GuardService; +import com.uiui.zyappstore.service.main.MainService; +import com.uiui.zyappstore.service.StepService; +import com.uiui.zyappstore.utils.JGYUtils; +import com.uiui.zyappstore.utils.LogUtils; public class BootReceiver extends BroadcastReceiver { public static final String BOOT_COMPLETED = "zuoyeos.action.BOOT_COMPLETED"; diff --git a/app/src/main/java/com/uiui/appstore/receiver/InstallResultReceiver.java b/app/src/main/java/com/uiui/zyappstore/receiver/InstallResultReceiver.java similarity index 96% rename from app/src/main/java/com/uiui/appstore/receiver/InstallResultReceiver.java rename to app/src/main/java/com/uiui/zyappstore/receiver/InstallResultReceiver.java index da1d53e..ab1035f 100644 --- a/app/src/main/java/com/uiui/appstore/receiver/InstallResultReceiver.java +++ b/app/src/main/java/com/uiui/zyappstore/receiver/InstallResultReceiver.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.receiver; +package com.uiui.zyappstore.receiver; import android.content.BroadcastReceiver; import android.content.Context; @@ -9,7 +9,7 @@ import android.util.Log; import androidx.annotation.RequiresApi; -import com.uiui.appstore.utils.ToastUtil; +import com.uiui.zyappstore.utils.ToastUtil; public class InstallResultReceiver extends BroadcastReceiver { diff --git a/app/src/main/java/com/uiui/appstore/receiver/NewAppReceiver.java b/app/src/main/java/com/uiui/zyappstore/receiver/NewAppReceiver.java similarity index 96% rename from app/src/main/java/com/uiui/appstore/receiver/NewAppReceiver.java rename to app/src/main/java/com/uiui/zyappstore/receiver/NewAppReceiver.java index 98cca4e..49a0642 100644 --- a/app/src/main/java/com/uiui/appstore/receiver/NewAppReceiver.java +++ b/app/src/main/java/com/uiui/zyappstore/receiver/NewAppReceiver.java @@ -1,14 +1,13 @@ -package com.uiui.appstore.receiver; +package com.uiui.zyappstore.receiver; import android.annotation.SuppressLint; import android.content.BroadcastReceiver; -import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.text.TextUtils; import android.util.Log; -import com.uiui.appstore.utils.JGYUtils; +import com.uiui.zyappstore.utils.JGYUtils; import java.util.concurrent.TimeUnit; diff --git a/app/src/main/java/com/uiui/appstore/service/MyDownloadService.java b/app/src/main/java/com/uiui/zyappstore/service/DownloadService.java similarity index 90% rename from app/src/main/java/com/uiui/appstore/service/MyDownloadService.java rename to app/src/main/java/com/uiui/zyappstore/service/DownloadService.java index d41a1a8..e9646a5 100644 --- a/app/src/main/java/com/uiui/appstore/service/MyDownloadService.java +++ b/app/src/main/java/com/uiui/zyappstore/service/DownloadService.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.service; +package com.uiui.zyappstore.service; import android.app.Service; import android.content.Intent; @@ -7,7 +7,7 @@ import android.os.IBinder; import androidx.annotation.Nullable; // 下载管理服务 -public class MyDownloadService extends Service { +public class DownloadService extends Service { @Override diff --git a/app/src/main/java/com/uiui/appstore/service/GuardService.java b/app/src/main/java/com/uiui/zyappstore/service/GuardService.java similarity index 90% rename from app/src/main/java/com/uiui/appstore/service/GuardService.java rename to app/src/main/java/com/uiui/zyappstore/service/GuardService.java index c156557..2624205 100644 --- a/app/src/main/java/com/uiui/appstore/service/GuardService.java +++ b/app/src/main/java/com/uiui/zyappstore/service/GuardService.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.service; +package com.uiui.zyappstore.service; /** * 作者 mjsheng @@ -23,15 +23,15 @@ import com.arialyy.aria.core.Aria; import com.arialyy.aria.core.task.DownloadTask; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import com.uiui.appstore.KeepAliveConnection; -import com.uiui.appstore.bean.BaseResponse; -import com.uiui.appstore.network.NetInterfaceManager; -import com.uiui.appstore.receiver.NewAppReceiver; -import com.uiui.appstore.utils.ApkUtils; -import com.uiui.appstore.utils.LogUtils; -import com.uiui.appstore.utils.SPUtils; -import com.uiui.appstore.utils.ServiceAliveUtils; -import com.uiui.appstore.utils.Utils; +import com.uiui.zyappstore.KeepAliveConnection; +import com.uiui.zyappstore.bean.BaseResponse; +import com.uiui.zyappstore.network.NetInterfaceManager; +import com.uiui.zyappstore.receiver.NewAppReceiver; +import com.uiui.zyappstore.utils.ApkUtils; +import com.uiui.zyappstore.utils.LogUtils; +import com.uiui.zyappstore.utils.SPUtils; +import com.uiui.zyappstore.utils.ServiceAliveUtils; +import com.uiui.zyappstore.utils.Utils; import java.io.File; @@ -54,9 +54,9 @@ public class GuardService extends Service { @Override public void onServiceConnected(ComponentName componentName, IBinder iBinder) { LogUtils.e(TAG, "GuardService:建立链接"); - boolean isServiceRunning = ServiceAliveUtils.isServiceAlice(); + boolean isServiceRunning = ServiceAliveUtils.isServiceAlice(GuardService.this); if (!isServiceRunning) { - Intent i = new Intent(GuardService.this, MyDownloadService.class); + Intent i = new Intent(GuardService.this, DownloadService.class); startService(i); } } diff --git a/app/src/main/java/com/uiui/appstore/service/StepService.java b/app/src/main/java/com/uiui/zyappstore/service/StepService.java similarity index 85% rename from app/src/main/java/com/uiui/appstore/service/StepService.java rename to app/src/main/java/com/uiui/zyappstore/service/StepService.java index 39afbdf..1986662 100644 --- a/app/src/main/java/com/uiui/appstore/service/StepService.java +++ b/app/src/main/java/com/uiui/zyappstore/service/StepService.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.service; +package com.uiui.zyappstore.service; /** * 作者 mjsheng @@ -16,9 +16,9 @@ import android.os.IBinder; import androidx.annotation.Nullable; -import com.uiui.appstore.KeepAliveConnection; -import com.uiui.appstore.utils.LogUtils; -import com.uiui.appstore.utils.ServiceAliveUtils; +import com.uiui.zyappstore.KeepAliveConnection; +import com.uiui.zyappstore.utils.LogUtils; +import com.uiui.zyappstore.utils.ServiceAliveUtils; /** * 主进程 双进程通讯 @@ -33,9 +33,9 @@ public class StepService extends Service { @Override public void onServiceConnected(ComponentName componentName, IBinder iBinder) { LogUtils.e(TAG, "StepService:建立链接"); - boolean isServiceRunning = ServiceAliveUtils.isServiceAlice(); + boolean isServiceRunning = ServiceAliveUtils.isServiceAlice(StepService.this); if (!isServiceRunning) { - Intent i = new Intent(StepService.this, MyDownloadService.class); + Intent i = new Intent(StepService.this, DownloadService.class); startService(i); } } diff --git a/app/src/main/java/com/uiui/appstore/service/main/MainSContact.java b/app/src/main/java/com/uiui/zyappstore/service/main/MainSContact.java similarity index 63% rename from app/src/main/java/com/uiui/appstore/service/main/MainSContact.java rename to app/src/main/java/com/uiui/zyappstore/service/main/MainSContact.java index 5b70c78..9fe4df3 100644 --- a/app/src/main/java/com/uiui/appstore/service/main/MainSContact.java +++ b/app/src/main/java/com/uiui/zyappstore/service/main/MainSContact.java @@ -1,7 +1,7 @@ -package com.uiui.appstore.service.main; +package com.uiui.zyappstore.service.main; -import com.uiui.appstore.base.BasePresenter; -import com.uiui.appstore.base.BaseView; +import com.uiui.zyappstore.base.BasePresenter; +import com.uiui.zyappstore.base.BaseView; public class MainSContact { public interface MainView extends BaseView { diff --git a/app/src/main/java/com/uiui/appstore/service/main/MainSPresenter.java b/app/src/main/java/com/uiui/zyappstore/service/main/MainSPresenter.java similarity index 92% rename from app/src/main/java/com/uiui/appstore/service/main/MainSPresenter.java rename to app/src/main/java/com/uiui/zyappstore/service/main/MainSPresenter.java index 1985013..9b0352d 100644 --- a/app/src/main/java/com/uiui/appstore/service/main/MainSPresenter.java +++ b/app/src/main/java/com/uiui/zyappstore/service/main/MainSPresenter.java @@ -1,9 +1,9 @@ -package com.uiui.appstore.service.main; +package com.uiui.zyappstore.service.main; import android.content.Context; import com.trello.rxlifecycle4.android.ActivityEvent; -import com.uiui.appstore.network.NetInterfaceManager; +import com.uiui.zyappstore.network.NetInterfaceManager; import io.reactivex.rxjava3.subjects.BehaviorSubject; diff --git a/app/src/main/java/com/uiui/appstore/service/main/MainService.java b/app/src/main/java/com/uiui/zyappstore/service/main/MainService.java similarity index 85% rename from app/src/main/java/com/uiui/appstore/service/main/MainService.java rename to app/src/main/java/com/uiui/zyappstore/service/main/MainService.java index df46575..8cabc2b 100644 --- a/app/src/main/java/com/uiui/appstore/service/main/MainService.java +++ b/app/src/main/java/com/uiui/zyappstore/service/main/MainService.java @@ -1,8 +1,7 @@ -package com.uiui.appstore.service.main; +package com.uiui.zyappstore.service.main; import android.app.Service; import android.content.Intent; -import android.os.Environment; import android.os.IBinder; import android.util.Log; @@ -12,22 +11,15 @@ import com.trello.rxlifecycle4.LifecycleTransformer; import com.trello.rxlifecycle4.RxLifecycle; import com.trello.rxlifecycle4.android.ActivityEvent; import com.trello.rxlifecycle4.android.RxLifecycleAndroid; -import com.uiui.appstore.KeepAliveConnection; -import com.uiui.appstore.network.HTTPInterface; -import com.uiui.appstore.utils.JGYUtils; -import com.uiui.appstore.utils.SPUtils; -import com.uiui.appstore.utils.ToastUtil; +import com.uiui.zyappstore.KeepAliveConnection; +import com.uiui.zyappstore.network.HTTPInterface; +import com.uiui.zyappstore.utils.JGYUtils; import org.jetbrains.annotations.NotNull; import java.io.File; -import java.util.concurrent.TimeUnit; import io.reactivex.rxjava3.core.Observable; -import io.reactivex.rxjava3.core.ObservableEmitter; -import io.reactivex.rxjava3.core.ObservableOnSubscribe; -import io.reactivex.rxjava3.core.Observer; -import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.subjects.BehaviorSubject; public class MainService extends Service implements MainSContact.MainView, NetworkUtils.OnNetworkStatusChangedListener, LifecycleProvider { diff --git a/app/src/main/java/com/uiui/appstore/utils/ApkUtils.java b/app/src/main/java/com/uiui/zyappstore/utils/ApkUtils.java similarity index 98% rename from app/src/main/java/com/uiui/appstore/utils/ApkUtils.java rename to app/src/main/java/com/uiui/zyappstore/utils/ApkUtils.java index 4f1dfd2..5579ef0 100644 --- a/app/src/main/java/com/uiui/appstore/utils/ApkUtils.java +++ b/app/src/main/java/com/uiui/zyappstore/utils/ApkUtils.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.utils; +package com.uiui.zyappstore.utils; import android.app.PendingIntent; import android.content.Context; @@ -12,8 +12,6 @@ import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Binder; import android.os.Build; -import android.provider.Settings; -import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.Toast; @@ -21,10 +19,10 @@ import android.widget.Toast; import androidx.annotation.RequiresApi; import androidx.core.content.FileProvider; -import com.uiui.appstore.BuildConfig; -import com.uiui.appstore.R; -import com.uiui.appstore.bean.LocalApp; -import com.uiui.appstore.receiver.InstallResultReceiver; +import com.uiui.zyappstore.BuildConfig; +import com.uiui.zyappstore.R; +import com.uiui.zyappstore.bean.LocalApp; +import com.uiui.zyappstore.receiver.InstallResultReceiver; import java.io.BufferedReader; import java.io.DataOutputStream; @@ -36,11 +34,9 @@ import java.io.OutputStream; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.ArrayList; -import java.util.Arrays; import java.util.Enumeration; import java.util.HashSet; import java.util.List; -import java.util.Set; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; @@ -106,7 +102,7 @@ public class ApkUtils { if (Build.VERSION.SDK_INT >= 24) { //判读版本是否在7.0以上 //参数1 上下文, 参数2 Provider主机地址 和配置文件中保持一致 参数3 共享的文件 Uri apkUri = - FileProvider.getUriForFile(context, "com.uiui.appstore.fileprovider", uriFile); + FileProvider.getUriForFile(context, "com.uiui.zyappstore.fileprovider", uriFile); //添加这一句表示对目标应用临时授权该Uri所代表的文件 intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); intent.setDataAndType(apkUri, "application/vnd.android.package-archive"); diff --git a/app/src/main/java/com/uiui/appstore/utils/DensityUtil.java b/app/src/main/java/com/uiui/zyappstore/utils/DensityUtil.java similarity index 95% rename from app/src/main/java/com/uiui/appstore/utils/DensityUtil.java rename to app/src/main/java/com/uiui/zyappstore/utils/DensityUtil.java index 38d8a0d..d1c36ef 100644 --- a/app/src/main/java/com/uiui/appstore/utils/DensityUtil.java +++ b/app/src/main/java/com/uiui/zyappstore/utils/DensityUtil.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.utils; +package com.uiui.zyappstore.utils; import android.content.Context; diff --git a/app/src/main/java/com/uiui/appstore/utils/FileUtils.java b/app/src/main/java/com/uiui/zyappstore/utils/FileUtils.java similarity index 99% rename from app/src/main/java/com/uiui/appstore/utils/FileUtils.java rename to app/src/main/java/com/uiui/zyappstore/utils/FileUtils.java index 4ae2d55..d844cb8 100644 --- a/app/src/main/java/com/uiui/appstore/utils/FileUtils.java +++ b/app/src/main/java/com/uiui/zyappstore/utils/FileUtils.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.utils; +package com.uiui.zyappstore.utils; import android.content.Context; import android.util.Log; diff --git a/app/src/main/java/com/uiui/appstore/utils/JGYUtils.java b/app/src/main/java/com/uiui/zyappstore/utils/JGYUtils.java similarity index 90% rename from app/src/main/java/com/uiui/appstore/utils/JGYUtils.java rename to app/src/main/java/com/uiui/zyappstore/utils/JGYUtils.java index 9fca034..aa13bec 100644 --- a/app/src/main/java/com/uiui/appstore/utils/JGYUtils.java +++ b/app/src/main/java/com/uiui/zyappstore/utils/JGYUtils.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.utils; +package com.uiui.zyappstore.utils; import android.annotation.SuppressLint; import android.content.ComponentName; @@ -20,8 +20,8 @@ import android.util.Log; import androidx.core.content.ContextCompat; -import com.uiui.appstore.BuildConfig; -import com.uiui.appstore.receiver.BootReceiver; +import com.uiui.zyappstore.BuildConfig; +import com.uiui.zyappstore.receiver.BootReceiver; import java.io.File; import java.lang.reflect.Constructor; @@ -42,12 +42,16 @@ public class JGYUtils { public static final int CubePlatform = 2; public static final int ZhanruiPlatform = 3; public static final int UMTK11Platform = 4; + public static final int UZY12Platform = 7; + public static final int TeclastMTK12Platform = 8; public static final int UnknowPlatform = 0; public static final String MTKTag = "MTK"; public static final String ZhanruiTag = "展锐";//酷比展睿 public static final String NewZhanruiTag = "新展锐"; public static final String UMTK11Tag = "UMTK11"; + public static final String UZY12Tag = "UZY12"; + public static final String TeclastMTK12Tag = "TeclastMTK12"; private JGYUtils(Context context) { @@ -297,19 +301,25 @@ public class JGYUtils { public int checkAppPlatform() { String platform = BuildConfig.platform; - if ("MTK".equalsIgnoreCase(platform)) { + if (MTKTag.equalsIgnoreCase(platform)) { Log.i(TAG, "checkAppPlatform: " + "MTK平台"); return MTKPlatform; - } else if ("展锐".equalsIgnoreCase(platform)) { + } else if (ZhanruiTag.equalsIgnoreCase(platform)) { Log.i(TAG, "checkAppPlatform: " + "展锐平台"); return CubePlatform; - } else if ("新展锐".equalsIgnoreCase(platform)) { + } else if (NewZhanruiTag.equalsIgnoreCase(platform)) { Log.i(TAG, "checkAppPlatform: " + "新展锐平台"); return ZhanruiPlatform; - }else if ("UMTK11".equalsIgnoreCase(platform)) { + } else if (UMTK11Tag.equalsIgnoreCase(platform)) { Log.i(TAG, "checkAppPlatform: " + "UMTK11"); return UMTK11Platform; - } else { + } else if (UZY12Tag.equalsIgnoreCase(platform)) { + Log.i(TAG, "checkAppPlatform: " + "UZY12"); + return UZY12Platform; + }else if (TeclastMTK12Tag.equalsIgnoreCase(platform)) { + Log.i(TAG, "checkAppPlatform: " + "TeclastMTK12"); + return TeclastMTK12Platform; + } else { Log.i(TAG, "checkAppPlatform: " + "没有数据"); return UnknowPlatform; } @@ -330,24 +340,28 @@ public class JGYUtils { public void getAppPlatform(GetAppPlatformCallback getAppPlatformCallback) { String platform = BuildConfig.platform; - if ("MTK".equalsIgnoreCase(platform)) { + if (MTKTag.equalsIgnoreCase(platform)) { getAppPlatformCallback.AppPlatform(MTKPlatform); - } else if ("展锐".equalsIgnoreCase(platform)) { + } else if (ZhanruiTag.equalsIgnoreCase(platform)) { getAppPlatformCallback.AppPlatform(CubePlatform); - } else if ("新展锐".equalsIgnoreCase(platform)) { + } else if (NewZhanruiTag.equalsIgnoreCase(platform)) { getAppPlatformCallback.AppPlatform(ZhanruiPlatform); - } else if ("UMTK11".equalsIgnoreCase(platform)) { + } else if (UMTK11Tag.equalsIgnoreCase(platform)) { getAppPlatformCallback.AppPlatform(UMTK11Platform); + } else if (UZY12Tag.equalsIgnoreCase(platform)) { + getAppPlatformCallback.AppPlatform(UZY12Platform); + } else if (TeclastMTK12Tag.equalsIgnoreCase(platform)) { + getAppPlatformCallback.AppPlatform(TeclastMTK12Platform); } else { getAppPlatformCallback.AppPlatform(UnknowPlatform); } } public static final String PACKAGE_DEVICEINFO = "com.uiui.sn"; - public static final String PACKAGE_APPSTORE = "com.uiui.appstore"; + public static final String PACKAGE_APPSTORE = "com.uiui.zyappstore"; public static final String PACKAGE_UPDATETOOLS = "com.uiui.updatetools"; public static final String CLASS_DEVICEINFO = "com.uiui.sn.receiver.BootReceiver"; - public static final String CLASS_APPSTORE = "com.uiui.appstore.receiver.BootReceiver"; + public static final String CLASS_APPSTORE = "com.uiui.zyappstore.receiver.BootReceiver"; public static final String CLASS_UPDATETOOLS = "com.uiui.updatetools.receiver.BootReceiver"; public void wakeUpDeviceInfo() { @@ -400,6 +414,11 @@ public class JGYUtils { } } + public String getPushMac() { + String macaddr = Utils.getAndroid10MAC(mContext); + return macaddr.replace(":", ""); + } + public boolean isScreenOn() { PowerManager powerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE); //true为打开，false为关闭 diff --git a/app/src/main/java/com/uiui/appstore/utils/LogUtils.java b/app/src/main/java/com/uiui/zyappstore/utils/LogUtils.java similarity index 90% rename from app/src/main/java/com/uiui/appstore/utils/LogUtils.java rename to app/src/main/java/com/uiui/zyappstore/utils/LogUtils.java index 62f9b95..8653b30 100644 --- a/app/src/main/java/com/uiui/appstore/utils/LogUtils.java +++ b/app/src/main/java/com/uiui/zyappstore/utils/LogUtils.java @@ -1,8 +1,8 @@ -package com.uiui.appstore.utils; +package com.uiui.zyappstore.utils; import android.util.Log; -import com.uiui.appstore.BuildConfig; +import com.uiui.zyappstore.BuildConfig; public class LogUtils { public static void v(String tag, String msg) { diff --git a/app/src/main/java/com/uiui/appstore/utils/MD5Util.java b/app/src/main/java/com/uiui/zyappstore/utils/MD5Util.java similarity index 98% rename from app/src/main/java/com/uiui/appstore/utils/MD5Util.java rename to app/src/main/java/com/uiui/zyappstore/utils/MD5Util.java index cb7c754..f9d2360 100644 --- a/app/src/main/java/com/uiui/appstore/utils/MD5Util.java +++ b/app/src/main/java/com/uiui/zyappstore/utils/MD5Util.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.utils; +package com.uiui.zyappstore.utils; import android.annotation.SuppressLint; diff --git a/app/src/main/java/com/uiui/appstore/utils/SPUtils.java b/app/src/main/java/com/uiui/zyappstore/utils/SPUtils.java similarity index 98% rename from app/src/main/java/com/uiui/appstore/utils/SPUtils.java rename to app/src/main/java/com/uiui/zyappstore/utils/SPUtils.java index c13ab81..7bff828 100644 --- a/app/src/main/java/com/uiui/appstore/utils/SPUtils.java +++ b/app/src/main/java/com/uiui/zyappstore/utils/SPUtils.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.utils; +package com.uiui.zyappstore.utils; import android.content.Context; import android.content.SharedPreferences; @@ -9,7 +9,7 @@ import android.util.Base64; import android.widget.ImageView; -import com.uiui.appstore.common.CommonDatas; +import com.uiui.zyappstore.common.CommonDatas; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/app/src/main/java/com/uiui/appstore/utils/ServiceAliveUtils.java b/app/src/main/java/com/uiui/zyappstore/utils/ServiceAliveUtils.java similarity index 69% rename from app/src/main/java/com/uiui/appstore/utils/ServiceAliveUtils.java rename to app/src/main/java/com/uiui/zyappstore/utils/ServiceAliveUtils.java index cea3bca..f9a902f 100644 --- a/app/src/main/java/com/uiui/appstore/utils/ServiceAliveUtils.java +++ b/app/src/main/java/com/uiui/zyappstore/utils/ServiceAliveUtils.java @@ -1,16 +1,16 @@ -package com.uiui.appstore.utils; +package com.uiui.zyappstore.utils; import android.app.ActivityManager; import android.content.Context; -import com.uiui.appstore.base.BaseApplication; +import com.uiui.zyappstore.base.BaseApplication; public class ServiceAliveUtils { - public static boolean isServiceAlice() { + public static boolean isServiceAlice(Context context) { boolean isServiceRunning = false; ActivityManager manager = - (ActivityManager) BaseApplication.getInstance().getAppContext().getSystemService(Context.ACTIVITY_SERVICE); + (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE); if (manager == null) { return true; } diff --git a/app/src/main/java/com/uiui/appstore/utils/StatusBarUtil.java b/app/src/main/java/com/uiui/zyappstore/utils/StatusBarUtil.java similarity index 99% rename from app/src/main/java/com/uiui/appstore/utils/StatusBarUtil.java rename to app/src/main/java/com/uiui/zyappstore/utils/StatusBarUtil.java index 8f90d22..259d66d 100644 --- a/app/src/main/java/com/uiui/appstore/utils/StatusBarUtil.java +++ b/app/src/main/java/com/uiui/zyappstore/utils/StatusBarUtil.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.utils; +package com.uiui.zyappstore.utils; import android.app.Activity; import android.content.Context; diff --git a/app/src/main/java/com/uiui/appstore/utils/StorageUtils.java b/app/src/main/java/com/uiui/zyappstore/utils/StorageUtils.java similarity index 99% rename from app/src/main/java/com/uiui/appstore/utils/StorageUtils.java rename to app/src/main/java/com/uiui/zyappstore/utils/StorageUtils.java index 1ed0e34..b21e5aa 100644 --- a/app/src/main/java/com/uiui/appstore/utils/StorageUtils.java +++ b/app/src/main/java/com/uiui/zyappstore/utils/StorageUtils.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.utils; +package com.uiui.zyappstore.utils; import android.content.Context; import android.os.Build; diff --git a/app/src/main/java/com/uiui/appstore/utils/TimeUtils.java b/app/src/main/java/com/uiui/zyappstore/utils/TimeUtils.java similarity index 96% rename from app/src/main/java/com/uiui/appstore/utils/TimeUtils.java rename to app/src/main/java/com/uiui/zyappstore/utils/TimeUtils.java index c14bce2..19eae5e 100644 --- a/app/src/main/java/com/uiui/appstore/utils/TimeUtils.java +++ b/app/src/main/java/com/uiui/zyappstore/utils/TimeUtils.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.utils; +package com.uiui.zyappstore.utils; import android.os.Build; diff --git a/app/src/main/java/com/uiui/appstore/utils/ToastUtil.java b/app/src/main/java/com/uiui/zyappstore/utils/ToastUtil.java similarity index 95% rename from app/src/main/java/com/uiui/appstore/utils/ToastUtil.java rename to app/src/main/java/com/uiui/zyappstore/utils/ToastUtil.java index 412fc2a..e14169c 100644 --- a/app/src/main/java/com/uiui/appstore/utils/ToastUtil.java +++ b/app/src/main/java/com/uiui/zyappstore/utils/ToastUtil.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.utils; +package com.uiui.zyappstore.utils; import android.annotation.SuppressLint; import android.content.Context; @@ -6,7 +6,7 @@ import android.os.Handler; import android.os.Looper; import android.widget.Toast; -import com.uiui.appstore.BuildConfig; +import com.uiui.zyappstore.BuildConfig; /** * Created by haoge on 2017/3/2. diff --git a/app/src/main/java/com/uiui/appstore/utils/Utils.java b/app/src/main/java/com/uiui/zyappstore/utils/Utils.java similarity index 87% rename from app/src/main/java/com/uiui/appstore/utils/Utils.java rename to app/src/main/java/com/uiui/zyappstore/utils/Utils.java index 5616511..ff49a8f 100644 --- a/app/src/main/java/com/uiui/appstore/utils/Utils.java +++ b/app/src/main/java/com/uiui/zyappstore/utils/Utils.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.utils; +package com.uiui.zyappstore.utils; import android.annotation.SuppressLint; import android.app.admin.DevicePolicyManager; @@ -22,6 +22,7 @@ import android.graphics.PorterDuffXfermode; import android.graphics.drawable.Drawable; import android.net.ConnectivityManager; import android.net.NetworkInfo; +import android.net.wifi.WifiManager; import android.os.Build; import android.provider.Settings; import android.telephony.TelephonyManager; @@ -33,9 +34,15 @@ import android.view.inputmethod.InputMethodManager; import android.widget.EditText; import android.widget.Toast; -import com.uiui.appstore.R; +import androidx.annotation.VisibleForTesting; +import com.uiui.zyappstore.R; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileNotFoundException; import java.io.FileReader; +import java.io.IOException; import java.io.InputStreamReader; import java.io.LineNumberReader; import java.io.Reader; @@ -50,8 +57,11 @@ import java.util.Date; import java.util.HashSet; import java.util.List; +import static android.content.Context.WIFI_SERVICE; + public class Utils { + private static final String TAG = Utils.class.getSimpleName(); protected static Toast toast = null; private static String oldMsg; private static long oneTime = 0; @@ -80,6 +90,63 @@ public class Utils { // } // } +// @SuppressLint("HardwareIds") +// @VisibleForTesting +// public static String getMacAddress(Context mContext) { +// WifiManager mWifiManager = (WifiManager) mContext.getSystemService(WIFI_SERVICE); +// final String[] macAddresses = mWifiManager.getFactoryMacAddresses(); +// String macAddress = null; +// if (macAddresses != null && macAddresses.length > 0) { +// macAddress = macAddresses[0]; +// } +// +// if (TextUtils.isEmpty(macAddress)) { +// String mac = getMacFromFile(); +// // Add for CTCC Feature:WIFI MAC should be gotten while wifi disabled. +// // Get Wifi MAC from file since we can not get it with WifiManager. +// if (!TextUtils.isEmpty(mac)) { +// macAddress = mac; +// } else { +// macAddress = ""; +// } +// } +// return macAddress.toUpperCase(); +// } + + /** + * Add for CTCC Feature:WIFI MAC should be gotten while wifi disabled. + * get Wifi MAC from /mnt/vendor/wifimac.txt + * + * @{ + */ + private static String MACID_FILE_PATH = "/mnt/vendor/wifimac.txt"; + + private static String getMacFromFile() { + File file = new File(MACID_FILE_PATH); + BufferedReader reader = null; + String macAddress = null; + try { + reader = new BufferedReader(new FileReader(file)); + String line; + while ((line = reader.readLine()) != null) { + macAddress = line; + break; + } + } catch (FileNotFoundException e) { + Log.w(TAG, "Mac file not exist", e); + } catch (Exception e) { + Log.w(TAG, "get mac from file caught exception", e); + } finally { + try { + if (reader != null) + reader.close(); + } catch (IOException e) { + Log.w(TAG, "reader close exception"); + } + } + return macAddress; + } + /** * 获取手机的MAC地址 * @@ -582,30 +649,46 @@ public class Utils { context.startActivity(intent); } + public static String getSerial() { + String mac = JGYUtils.getInstance().getPushMac(); + return mac; + } + +// /** +// * 获取设备序列号 +// * +// * @return +// */ +// @SuppressLint({"MissingPermission", "NewApi"}) +// public static String getSerial() { +// String serial = "unknow"; +// try { +// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {//9.0+ +// serial = Build.getSerial(); +// } else if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N) {//8.0+ +// serial = Build.SERIAL; +// } else {//8.0- +// Class c = Class.forName("android.os.SystemProperties"); +// Method get = c.getMethod("get", String.class); +// serial = (String) get.invoke(c, "ro.serialno"); +// } +// } catch (Exception e) { +// e.printStackTrace(); +// Log.e("e", "读取设备序列号异常：" + e.toString()); +// } +// return serial; +// } + /** - * 获取设备序列号 - * + * @param context 获取真实的MAC地址 * @return */ - @SuppressLint({"MissingPermission", "NewApi"}) - public static String getSerial() { -// return JGYUtils.getInstance().getIMEI(); - String serial = "unknow"; - try { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {//9.0+ - serial = Build.getSerial(); - } else if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N) {//8.0+ - serial = Build.SERIAL; - } else {//8.0- - Class c = Class.forName("android.os.SystemProperties"); - Method get = c.getMethod("get", String.class); - serial = (String) get.invoke(c, "ro.serialno"); - } - } catch (Exception e) { - e.printStackTrace(); - Log.e("e", "读取设备序列号异常：" + e.toString()); + public static String getAndroid10MAC(Context context) { + if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N_MR1) { + return getMac(); + } else { + return getAndroid7MAC(); } - return serial; } public static final long A_GB = 1073741824; diff --git a/app/src/main/java/com/uiui/appstore/view/CornerImageView.kt b/app/src/main/java/com/uiui/zyappstore/view/CornerImageView.kt similarity index 94% rename from app/src/main/java/com/uiui/appstore/view/CornerImageView.kt rename to app/src/main/java/com/uiui/zyappstore/view/CornerImageView.kt index 46227a0..3418fdc 100644 --- a/app/src/main/java/com/uiui/appstore/view/CornerImageView.kt +++ b/app/src/main/java/com/uiui/zyappstore/view/CornerImageView.kt @@ -1,4 +1,4 @@ -package com.uiui.appstore.view +package com.uiui.zyappstore.view import android.content.Context import android.os.Build diff --git a/app/src/main/java/com/uiui/appstore/view/HorizontalItemDecoration.java b/app/src/main/java/com/uiui/zyappstore/view/HorizontalItemDecoration.java similarity index 97% rename from app/src/main/java/com/uiui/appstore/view/HorizontalItemDecoration.java rename to app/src/main/java/com/uiui/zyappstore/view/HorizontalItemDecoration.java index e612417..488fed5 100644 --- a/app/src/main/java/com/uiui/appstore/view/HorizontalItemDecoration.java +++ b/app/src/main/java/com/uiui/zyappstore/view/HorizontalItemDecoration.java @@ -1,4 +1,4 @@ -package com.uiui.appstore.view; +package com.uiui.zyappstore.view; import android.content.Context; import android.graphics.Rect; diff --git a/app/src/main/java/com/uiui/appstore/view/NumberProgressBar.java b/app/src/main/java/com/uiui/zyappstore/view/NumberProgressBar.java similarity index 99% rename from app/src/main/java/com/uiui/appstore/view/NumberProgressBar.java rename to app/src/main/java/com/uiui/zyappstore/view/NumberProgressBar.java index 4256e19..6961ea8 100644 --- a/app/src/main/java/com/uiui/appstore/view/NumberProgressBar.java +++ b/app/src/main/java/com/uiui/zyappstore/view/NumberProgressBar.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.uiui.appstore.view; +package com.uiui.zyappstore.view; import android.content.Context; import android.content.res.TypedArray; @@ -26,7 +26,7 @@ import android.os.Parcelable; import android.util.AttributeSet; import android.view.View; -import com.uiui.appstore.R; +import com.uiui.zyappstore.R; /** * ================================================ diff --git a/app/src/main/res/layout-land/item_download_manager.xml b/app/src/main/res/layout-land/item_download_manager.xml index 033d956..a7e783b 100644 --- a/app/src/main/res/layout-land/item_download_manager.xml +++ b/app/src/main/res/layout-land/item_download_manager.xml @@ -41,7 +41,7 @@ android:textSize="@dimen/sp_11" android:textStyle="bold" /> - - - -