From e218fc0c68a8f6c7e21ed898128ffccac6791228 Mon Sep 17 00:00:00 2001 From: Fanhuitong <981964879@qq.com> Date: Mon, 1 Nov 2021 15:33:08 +0800 Subject: [PATCH] =?UTF-8?q?update:1.7.7=20date:2021-11-01=2015:31:57=20fix?= =?UTF-8?q?:=E6=9B=B4=E6=8D=A2=E6=8A=A5=E5=90=8D=EF=BC=8C=E6=9B=B4?= =?UTF-8?q?=E6=8D=A2=E6=8E=A8=E9=80=81=E4=BF=A1=E6=81=AF=20add:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 40 ++++-- app/release/output.json | 1 + .../market/ExampleInstrumentedTest.java | 27 ++++ app/src/main/AndroidManifest.xml | 80 ++++++----- .../market}/KeepAliveConnection.aidl | 2 +- .../com/appstore/uiui/common/BuikdConf.java | 9 -- .../appstore/uiui/receiver/BootReceiver.java | 23 --- .../market}/TextCode/MessageWhat.java | 2 +- .../market}/activity/AboutActivity.java | 8 +- .../market}/activity/CopyrightActivity.java | 10 +- .../market}/activity/DetailsActivity.java | 36 +++-- .../activity/DownloadManagerActivity.java | 9 +- .../market}/activity/HintActivity.java | 8 +- .../market}/activity/KindDetailActivity.java | 14 +- .../activity/LocalManagerActivity.java | 16 +-- .../market}/activity/MainActivity.java | 56 ++++---- .../market}/activity/SearcherActivity.java | 18 ++- .../market}/adapter/AppAdapter.java | 15 +- .../market}/adapter/BannerViewHolder.java | 6 +- .../adapter/DownloadManagerAdapter.java | 12 +- .../market}/adapter/ImageAdapter.java | 4 +- .../market}/adapter/KindAdapter.java | 11 +- .../market}/adapter/LocalAppAdapter.java | 12 +- .../market}/adapter/ShowImageAdapter.java | 6 +- .../market}/adapter/UpdateAppAdapter.java | 6 +- .../market}/base/BaseActivity.java | 6 +- .../market}/base/BaseApplication.java | 16 +-- .../market}/base/BaseFragment.java | 5 +- .../uiui => jgyapp/market}/base/FilePath.java | 2 +- .../market}/base/LazyLoadFragment.java | 5 +- .../market}/base/RefreshManager.java | 2 +- .../market}/bean/AppDateInfo.java | 2 +- .../market}/bean/AppDownloadInfo.java | 2 +- .../uiui => jgyapp/market}/bean/AppInfo.java | 2 +- .../uiui => jgyapp/market}/bean/AppInfos.java | 2 +- .../uiui => jgyapp/market}/bean/Banner.java | 2 +- .../market}/bean/BannerImage.java | 2 +- .../market}/bean/BaseResponse.java | 2 +- .../market}/bean/GlideCircleWithBorder.java | 8 +- .../uiui => jgyapp/market}/bean/ImageUrl.java | 2 +- .../uiui => jgyapp/market}/bean/Kind.java | 2 +- .../uiui => jgyapp/market}/bean/LocalApp.java | 2 +- .../market}/bean/UpdateAppInfo.java | 2 +- .../uiui => jgyapp/market}/bean/UserInfo.java | 2 +- .../com/jgyapp/market/common/BuikdConf.java | 5 + .../market}/common/CommonDatas.java | 4 +- .../market}/fragment/FeaturedFragment.java | 34 ++--- .../market}/fragment/KindFragment.java | 12 +- .../market}/fragment/ManageFragment.java | 26 ++-- .../market}/fragment/RankFragment.java | 14 +- .../market}/helper/CustomSnapHelper.java | 2 +- .../market}/jpush/ExampleUtil.java | 3 +- .../jpush/Invalid/ExampleApplication.java | 4 +- .../market}/jpush/Invalid/MainActivity.java | 20 +-- .../jpush/Invalid/PushSetActivity.java | 2 +- .../jpush/Invalid/SettingActivity.java | 22 +-- .../market}/jpush/Invalid/TestActivity.java | 2 +- .../market}/jpush/LocalBroadcastManager.java | 2 +- .../uiui => jgyapp/market}/jpush/Logger.java | 2 +- .../market}/jpush/MyJPushMessageReceiver.java | 4 +- .../market}/jpush/MyReceiver.java | 4 +- .../market}/jpush/PushService.java | 2 +- .../market}/jpush/TagAliasOperatorHelper.java | 2 +- .../market}/network/HTTPInterface.java | 13 +- .../market}/network/NetInterfaceManager.java | 25 ++-- .../market}/network/URLs/UrlAddress.java | 2 +- .../market}/network/api/BannerImage.java | 8 +- .../market}/network/api/DownloadApp.java | 6 +- .../market}/network/api/GetBanner.java | 8 +- .../market}/network/api/NewestAppUpdate.java | 8 +- .../market}/network/api/QueryAllApp.java | 9 +- .../market}/network/api/QueryPackageApp.java | 10 +- .../market}/network/api/SNInfo.java | 8 +- .../market}/network/api/SearchApp.java | 8 +- .../market}/receiver/AppManagerReceiver.java | 18 +-- .../jgyapp/market/receiver/BootReceiver.java | 37 +++++ .../receiver/InstallResultReceiver.java | 4 +- .../market/receiver/NewAppReceiver.java | 103 +++++++++++++ .../market}/service/GuardService.java | 135 ++++++------------ .../market}/service/InitJpushServer.java | 6 +- .../market}/service/MyDownloadService.java | 2 +- .../market}/service/StepService.java | 8 +- .../market}/utils/ApkUtils.java | 10 +- .../market}/utils/FileUtils.java | 4 +- .../market}/utils/JGYUtils.java | 4 +- .../market}/utils/LogUtils.java | 4 +- .../uiui => jgyapp/market}/utils/SPUtils.java | 4 +- .../market}/utils/ServiceAliveUtils.java | 4 +- .../market}/utils/StatusBarUtil.java | 2 +- .../market}/utils/StorageUtils.java | 2 +- .../market}/utils/ToastUtil.java | 4 +- .../uiui => jgyapp/market}/utils/Utils.java | 7 +- .../market}/view/CornerImageView.kt | 2 +- .../market}/view/NumberProgressBar.java | 4 +- .../res/layout-land/item_download_manager.xml | 4 +- app/src/main/res/layout-land/item_net.xml | 2 +- .../res/layout-port/item_download_manager.xml | 4 +- app/src/main/res/layout-port/item_net.xml | 2 +- .../com/jgyapp/market/ExampleUnitTest.java | 17 +++ settings.gradle | 2 +- 100 files changed, 609 insertions(+), 556 deletions(-) create mode 100644 app/release/output.json create mode 100644 app/src/androidTest/java/com/jgyapp/market/ExampleInstrumentedTest.java rename app/src/main/aidl/com/{appstore/uiui => jgyapp/market}/KeepAliveConnection.aidl (82%) delete mode 100644 app/src/main/java/com/appstore/uiui/common/BuikdConf.java delete mode 100644 app/src/main/java/com/appstore/uiui/receiver/BootReceiver.java rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/TextCode/MessageWhat.java (67%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/activity/AboutActivity.java (91%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/activity/CopyrightActivity.java (64%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/activity/DetailsActivity.java (94%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/activity/DownloadManagerActivity.java (92%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/activity/HintActivity.java (91%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/activity/KindDetailActivity.java (92%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/activity/LocalManagerActivity.java (93%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/activity/MainActivity.java (92%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/activity/SearcherActivity.java (94%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/adapter/AppAdapter.java (97%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/adapter/BannerViewHolder.java (84%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/adapter/DownloadManagerAdapter.java (98%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/adapter/ImageAdapter.java (96%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/adapter/KindAdapter.java (92%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/adapter/LocalAppAdapter.java (93%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/adapter/ShowImageAdapter.java (93%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/adapter/UpdateAppAdapter.java (98%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/base/BaseActivity.java (97%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/base/BaseApplication.java (98%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/base/BaseFragment.java (94%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/base/FilePath.java (86%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/base/LazyLoadFragment.java (93%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/base/RefreshManager.java (97%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/bean/AppDateInfo.java (99%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/bean/AppDownloadInfo.java (98%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/bean/AppInfo.java (99%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/bean/AppInfos.java (99%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/bean/Banner.java (95%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/bean/BannerImage.java (95%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/bean/BaseResponse.java (94%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/bean/GlideCircleWithBorder.java (95%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/bean/ImageUrl.java (85%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/bean/Kind.java (96%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/bean/LocalApp.java (98%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/bean/UpdateAppInfo.java (98%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/bean/UserInfo.java (98%) create mode 100644 app/src/main/java/com/jgyapp/market/common/BuikdConf.java rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/common/CommonDatas.java (57%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/fragment/FeaturedFragment.java (95%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/fragment/KindFragment.java (94%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/fragment/ManageFragment.java (93%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/fragment/RankFragment.java (91%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/helper/CustomSnapHelper.java (98%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/jpush/ExampleUtil.java (98%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/jpush/Invalid/ExampleApplication.java (88%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/jpush/Invalid/MainActivity.java (90%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/jpush/Invalid/PushSetActivity.java (99%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/jpush/Invalid/SettingActivity.java (88%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/jpush/Invalid/TestActivity.java (96%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/jpush/LocalBroadcastManager.java (99%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/jpush/Logger.java (95%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/jpush/MyJPushMessageReceiver.java (95%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/jpush/MyReceiver.java (98%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/jpush/PushService.java (75%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/jpush/TagAliasOperatorHelper.java (99%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/network/HTTPInterface.java (92%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/network/NetInterfaceManager.java (86%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/network/URLs/UrlAddress.java (97%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/network/api/BannerImage.java (62%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/network/api/DownloadApp.java (77%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/network/api/GetBanner.java (51%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/network/api/NewestAppUpdate.java (68%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/network/api/QueryAllApp.java (57%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/network/api/QueryPackageApp.java (62%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/network/api/SNInfo.java (59%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/network/api/SearchApp.java (65%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/receiver/AppManagerReceiver.java (86%) create mode 100644 app/src/main/java/com/jgyapp/market/receiver/BootReceiver.java rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/receiver/InstallResultReceiver.java (96%) create mode 100644 app/src/main/java/com/jgyapp/market/receiver/NewAppReceiver.java rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/service/GuardService.java (52%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/service/InitJpushServer.java (89%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/service/MyDownloadService.java (96%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/service/StepService.java (91%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/utils/ApkUtils.java (99%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/utils/FileUtils.java (98%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/utils/JGYUtils.java (99%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/utils/LogUtils.java (90%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/utils/SPUtils.java (98%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/utils/ServiceAliveUtils.java (90%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/utils/StatusBarUtil.java (99%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/utils/StorageUtils.java (99%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/utils/ToastUtil.java (95%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/utils/Utils.java (99%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/view/CornerImageView.kt (95%) rename app/src/main/java/com/{appstore/uiui => jgyapp/market}/view/NumberProgressBar.java (99%) create mode 100644 app/src/test/java/com/jgyapp/market/ExampleUnitTest.java diff --git a/app/build.gradle b/app/build.gradle index b4e05dc..6e2dd12 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,31 +6,24 @@ def appName() { } def releaseTime() { - return new Date().format("yyyyMMdd", TimeZone.getDefault()) + return new Date().format("yyyyMMdd-HHmmss", TimeZone.getDefault()) } android { compileSdkVersion 29 buildToolsVersion "29.0.3" defaultConfig { - applicationId "com.appstore.uiui" + applicationId "com.jgyapp.market" minSdkVersion 26 targetSdkVersion 29 - versionCode 74 - versionName "1.7.4" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - //极光 + ndk { //选择要添加的对应 cpu 类型的 .so 库。 abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a' // 还可以添加 'x86', 'x86_64', 'mips', 'mips64' } - - manifestPlaceholders = [ - JPUSH_PKGNAME: applicationId, - JPUSH_APPKEY : "d7ad4da7d65687b32cacbdb1", //JPush 上注册的包名对应的 Appkey. - JPUSH_CHANNEL: "developer-default", //暂时填写默认值即可. - ] } compileOptions{ @@ -42,6 +35,31 @@ android { checkReleaseBuilds false } + //多版本 + productFlavors { + beta { + flavorDimensions "default" + versionCode 77 + versionName "1.7.7" + manifestPlaceholders = [ + JPUSH_PKGNAME: "com.jgyapp.market", + JPUSH_APPKEY : "141f3b392c07314f02079afe", //JPush 上注册的包名对应的 Appkey. + JPUSH_CHANNEL: "developer-default", //暂时填写默认值即可. + ] + } + + official { + flavorDimensions "default" + versionCode 75 + versionName "1.7.5" + manifestPlaceholders = [ + JPUSH_PKGNAME: "com.jgyapp.market", + JPUSH_APPKEY : "8e98bf42995556e6d0c3ca6a", //JPush 上注册的包名对应的 Appkey. + JPUSH_CHANNEL: "developer-default", //暂时填写默认值即可. + ] + } + } + //签名 signingConfigs { zhanRui { diff --git a/app/release/output.json b/app/release/output.json new file mode 100644 index 0000000..f043638 --- /dev/null +++ b/app/release/output.json @@ -0,0 +1 @@ +[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":24,"versionName":"1.2.4","enabled":true,"outputFile":"\\UIUIAPPStore-24-V1.2.4-20201021185409.apk","fullName":"release","baseName":"release"},"path":"UIUIAPPStore-24-V1.2.4-20201021185409.apk","properties":{}}] \ No newline at end of file diff --git a/app/src/androidTest/java/com/jgyapp/market/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/jgyapp/market/ExampleInstrumentedTest.java new file mode 100644 index 0000000..48e04da --- /dev/null +++ b/app/src/androidTest/java/com/jgyapp/market/ExampleInstrumentedTest.java @@ -0,0 +1,27 @@ +package com.jgyapp.market; + +import android.content.Context; + +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumented test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); + + assertEquals("com.jgyapp.market", appContext.getPackageName()); + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index fa37fb1..6da3b9c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ @@ -22,10 +22,10 @@ - + @@ -45,43 +45,43 @@ - - - + + + @@ -89,7 +89,7 @@ @@ -106,7 +106,7 @@ - + @@ -145,7 +145,7 @@ @@ -157,12 +157,12 @@ - + - + @@ -196,20 +196,20 @@ - + @@ -218,26 +218,40 @@ - + - + - + + android:exported="true" /> + + + + + + + + + + + android:value="${JPUSH_APPKEY}" /> \ No newline at end of file diff --git a/app/src/main/aidl/com/appstore/uiui/KeepAliveConnection.aidl b/app/src/main/aidl/com/jgyapp/market/KeepAliveConnection.aidl similarity index 82% rename from app/src/main/aidl/com/appstore/uiui/KeepAliveConnection.aidl rename to app/src/main/aidl/com/jgyapp/market/KeepAliveConnection.aidl index 06d1fa9..2d7803b 100644 --- a/app/src/main/aidl/com/appstore/uiui/KeepAliveConnection.aidl +++ b/app/src/main/aidl/com/jgyapp/market/KeepAliveConnection.aidl @@ -1,5 +1,5 @@ // KeepAliveConnection.aidl -package com.appstore.uiui; +package com.jgyapp.market; // Declare any non-default types here with import statements diff --git a/app/src/main/java/com/appstore/uiui/common/BuikdConf.java b/app/src/main/java/com/appstore/uiui/common/BuikdConf.java deleted file mode 100644 index 3413d26..0000000 --- a/app/src/main/java/com/appstore/uiui/common/BuikdConf.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.appstore.uiui.common; - -import android.os.Debug; - -import com.appstore.uiui.BuildConfig; - -public class BuikdConf { - public static final boolean Isdebug = true; -} diff --git a/app/src/main/java/com/appstore/uiui/receiver/BootReceiver.java b/app/src/main/java/com/appstore/uiui/receiver/BootReceiver.java deleted file mode 100644 index 9bc7ce1..0000000 --- a/app/src/main/java/com/appstore/uiui/receiver/BootReceiver.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.appstore.uiui.receiver; - -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; - -import com.appstore.uiui.service.GuardService; -import com.appstore.uiui.service.InitJpushServer; -import com.appstore.uiui.service.StepService; -import com.appstore.uiui.utils.LogUtils; - -public class BootReceiver extends BroadcastReceiver { - @Override - public void onReceive(Context context, Intent intent) { - if (intent.getAction().equals("android.intent.action.BOOT_COMPLETED")) { - context.startService(new Intent(context, InitJpushServer.class)); - context.startService(new Intent(context, StepService.class)); - context.startService(new Intent(context, GuardService.class)); -// OKGO.getUserInfo(context); - LogUtils.e("fht", "booting BootReceiver"); - } - } -} diff --git a/app/src/main/java/com/appstore/uiui/TextCode/MessageWhat.java b/app/src/main/java/com/jgyapp/market/TextCode/MessageWhat.java similarity index 67% rename from app/src/main/java/com/appstore/uiui/TextCode/MessageWhat.java rename to app/src/main/java/com/jgyapp/market/TextCode/MessageWhat.java index e2d2427..90ba969 100644 --- a/app/src/main/java/com/appstore/uiui/TextCode/MessageWhat.java +++ b/app/src/main/java/com/jgyapp/market/TextCode/MessageWhat.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.TextCode; +package com.jgyapp.market.TextCode; public class MessageWhat { public static int CODE_SUCCESSFUL = 200; diff --git a/app/src/main/java/com/appstore/uiui/activity/AboutActivity.java b/app/src/main/java/com/jgyapp/market/activity/AboutActivity.java similarity index 91% rename from app/src/main/java/com/appstore/uiui/activity/AboutActivity.java rename to app/src/main/java/com/jgyapp/market/activity/AboutActivity.java index 891d1d6..261db3b 100644 --- a/app/src/main/java/com/appstore/uiui/activity/AboutActivity.java +++ b/app/src/main/java/com/jgyapp/market/activity/AboutActivity.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.activity; +package com.jgyapp.market.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.appstore.uiui.BuildConfig; -import com.appstore.uiui.R; -import com.appstore.uiui.base.BaseActivity; +import com.jgyapp.market.BuildConfig; +import com.jgyapp.market.R; +import com.jgyapp.market.base.BaseActivity; public class AboutActivity extends BaseActivity { private ImageView iv_exit; diff --git a/app/src/main/java/com/appstore/uiui/activity/CopyrightActivity.java b/app/src/main/java/com/jgyapp/market/activity/CopyrightActivity.java similarity index 64% rename from app/src/main/java/com/appstore/uiui/activity/CopyrightActivity.java rename to app/src/main/java/com/jgyapp/market/activity/CopyrightActivity.java index c4b7a09..21b1cc5 100644 --- a/app/src/main/java/com/appstore/uiui/activity/CopyrightActivity.java +++ b/app/src/main/java/com/jgyapp/market/activity/CopyrightActivity.java @@ -1,11 +1,7 @@ -package com.appstore.uiui.activity; +package com.jgyapp.market.activity; -import androidx.appcompat.app.AppCompatActivity; - -import android.os.Bundle; - -import com.appstore.uiui.R; -import com.appstore.uiui.base.BaseActivity; +import com.jgyapp.market.R; +import com.jgyapp.market.base.BaseActivity; public class CopyrightActivity extends BaseActivity { diff --git a/app/src/main/java/com/appstore/uiui/activity/DetailsActivity.java b/app/src/main/java/com/jgyapp/market/activity/DetailsActivity.java similarity index 94% rename from app/src/main/java/com/appstore/uiui/activity/DetailsActivity.java rename to app/src/main/java/com/jgyapp/market/activity/DetailsActivity.java index 85cf6c6..4de9ce2 100644 --- a/app/src/main/java/com/appstore/uiui/activity/DetailsActivity.java +++ b/app/src/main/java/com/jgyapp/market/activity/DetailsActivity.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.activity; +package com.jgyapp.market.activity; import android.content.BroadcastReceiver; import android.content.Context; @@ -18,19 +18,18 @@ import androidx.recyclerview.widget.RecyclerView; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.appstore.uiui.R; -import com.appstore.uiui.adapter.ImageAdapter; -import com.appstore.uiui.base.BaseActivity; -import com.appstore.uiui.bean.AppInfo; -import com.appstore.uiui.bean.BaseResponse; -import com.appstore.uiui.bean.GlideCircleWithBorder; -import com.appstore.uiui.helper.CustomSnapHelper; -import com.appstore.uiui.network.NetInterfaceManager; -import com.appstore.uiui.utils.ApkUtils; -import com.appstore.uiui.utils.FileUtils; -import com.appstore.uiui.utils.StorageUtils; -import com.appstore.uiui.utils.ToastUtil; -import com.appstore.uiui.utils.Utils; +import com.jgyapp.market.R; +import com.jgyapp.market.adapter.ImageAdapter; +import com.jgyapp.market.base.BaseActivity; +import com.jgyapp.market.bean.AppInfo; +import com.jgyapp.market.bean.BaseResponse; +import com.jgyapp.market.bean.GlideCircleWithBorder; +import com.jgyapp.market.helper.CustomSnapHelper; +import com.jgyapp.market.network.NetInterfaceManager; +import com.jgyapp.market.utils.ApkUtils; +import com.jgyapp.market.utils.FileUtils; +import com.jgyapp.market.utils.StorageUtils; +import com.jgyapp.market.utils.ToastUtil; import com.arialyy.annotations.Download; import com.arialyy.aria.core.Aria; import com.arialyy.aria.core.download.DownloadEntity; @@ -43,7 +42,6 @@ import java.util.ArrayList; import java.util.List; import io.reactivex.Observer; -import io.reactivex.Scheduler; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.Disposable; import io.reactivex.schedulers.Schedulers; @@ -269,9 +267,9 @@ public class DetailsActivity extends BaseActivity { if (myReceiver == null) { myReceiver = new installReceiver(); IntentFilter filter = new IntentFilter(); - filter.addAction("com.appstore.uiui.PACKAGE_ADDED"); - filter.addAction("com.appstore.uiui.PACKAGE_REPLACED"); - filter.addAction("com.appstore.uiui.PACKAGE_REMOVED"); + filter.addAction("com.jgyapp.market.PACKAGE_ADDED"); + filter.addAction("com.jgyapp.market.PACKAGE_REPLACED"); + filter.addAction("com.jgyapp.market.PACKAGE_REMOVED"); filter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY); registerReceiver(myReceiver, filter); } @@ -352,7 +350,7 @@ public class DetailsActivity extends BaseActivity { public void onReceive(Context context, Intent intent) { String action = intent.getAction(); //接收安装广播 - if (action.equals("com.appstore.uiui.PACKAGE_ADDED") || action.equals("com.appstore.uiui.PACKAGE_REPLACED")) { + if (action.equals("com.jgyapp.market.PACKAGE_ADDED") || action.equals("com.jgyapp.market.PACKAGE_REPLACED")) { String packageName = intent.getStringExtra("package"); if (packageName.equalsIgnoreCase(appInfo.getApp_package())) { tv_download.setText("打开"); diff --git a/app/src/main/java/com/appstore/uiui/activity/DownloadManagerActivity.java b/app/src/main/java/com/jgyapp/market/activity/DownloadManagerActivity.java similarity index 92% rename from app/src/main/java/com/appstore/uiui/activity/DownloadManagerActivity.java rename to app/src/main/java/com/jgyapp/market/activity/DownloadManagerActivity.java index 0fa03f4..52f494d 100644 --- a/app/src/main/java/com/appstore/uiui/activity/DownloadManagerActivity.java +++ b/app/src/main/java/com/jgyapp/market/activity/DownloadManagerActivity.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.activity; +package com.jgyapp.market.activity; import android.os.Handler; import android.os.Message; @@ -9,10 +9,9 @@ import androidx.annotation.NonNull; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.appstore.uiui.R; -import com.appstore.uiui.adapter.DownloadManagerAdapter; -import com.appstore.uiui.base.BaseActivity; -import com.appstore.uiui.utils.ToastUtil; +import com.jgyapp.market.R; +import com.jgyapp.market.adapter.DownloadManagerAdapter; +import com.jgyapp.market.base.BaseActivity; public class DownloadManagerActivity extends BaseActivity /*implements XExecutor.OnAllTaskEndListener*/ { private RecyclerView recyclerView; diff --git a/app/src/main/java/com/appstore/uiui/activity/HintActivity.java b/app/src/main/java/com/jgyapp/market/activity/HintActivity.java similarity index 91% rename from app/src/main/java/com/appstore/uiui/activity/HintActivity.java rename to app/src/main/java/com/jgyapp/market/activity/HintActivity.java index f345c1f..69fb673 100644 --- a/app/src/main/java/com/appstore/uiui/activity/HintActivity.java +++ b/app/src/main/java/com/jgyapp/market/activity/HintActivity.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.activity; +package com.jgyapp.market.activity; import android.content.Intent; import android.text.TextUtils; @@ -9,9 +9,9 @@ import android.widget.TextView; import androidx.constraintlayout.widget.ConstraintLayout; -import com.appstore.uiui.R; -import com.appstore.uiui.base.BaseActivity; -import com.appstore.uiui.utils.ApkUtils; +import com.jgyapp.market.R; +import com.jgyapp.market.base.BaseActivity; +import com.jgyapp.market.utils.ApkUtils; public class HintActivity extends BaseActivity { private ConstraintLayout root; diff --git a/app/src/main/java/com/appstore/uiui/activity/KindDetailActivity.java b/app/src/main/java/com/jgyapp/market/activity/KindDetailActivity.java similarity index 92% rename from app/src/main/java/com/appstore/uiui/activity/KindDetailActivity.java rename to app/src/main/java/com/jgyapp/market/activity/KindDetailActivity.java index 20f073c..93499fc 100644 --- a/app/src/main/java/com/appstore/uiui/activity/KindDetailActivity.java +++ b/app/src/main/java/com/jgyapp/market/activity/KindDetailActivity.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.activity; +package com.jgyapp.market.activity; import android.os.Handler; import android.os.Message; @@ -10,12 +10,12 @@ import androidx.annotation.NonNull; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.appstore.uiui.R; -import com.appstore.uiui.adapter.AppAdapter; -import com.appstore.uiui.base.BaseActivity; -import com.appstore.uiui.base.RefreshManager; -import com.appstore.uiui.bean.AppInfo; -import com.appstore.uiui.utils.SPUtils; +import com.jgyapp.market.R; +import com.jgyapp.market.adapter.AppAdapter; +import com.jgyapp.market.base.BaseActivity; +import com.jgyapp.market.base.RefreshManager; +import com.jgyapp.market.bean.AppInfo; +import com.jgyapp.market.utils.SPUtils; 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/appstore/uiui/activity/LocalManagerActivity.java b/app/src/main/java/com/jgyapp/market/activity/LocalManagerActivity.java similarity index 93% rename from app/src/main/java/com/appstore/uiui/activity/LocalManagerActivity.java rename to app/src/main/java/com/jgyapp/market/activity/LocalManagerActivity.java index cd97bb8..bd0d596 100644 --- a/app/src/main/java/com/appstore/uiui/activity/LocalManagerActivity.java +++ b/app/src/main/java/com/jgyapp/market/activity/LocalManagerActivity.java @@ -1,6 +1,5 @@ -package com.appstore.uiui.activity; +package com.jgyapp.market.activity; -import androidx.appcompat.app.AppCompatActivity; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -10,17 +9,16 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.graphics.drawable.Drawable; -import android.os.Bundle; import android.provider.Settings; import android.view.View; import android.widget.ImageView; -import com.appstore.uiui.R; -import com.appstore.uiui.adapter.LocalAppAdapter; -import com.appstore.uiui.base.BaseActivity; -import com.appstore.uiui.base.RefreshManager; -import com.appstore.uiui.bean.LocalApp; -import com.appstore.uiui.utils.ApkUtils; +import com.jgyapp.market.R; +import com.jgyapp.market.adapter.LocalAppAdapter; +import com.jgyapp.market.base.BaseActivity; +import com.jgyapp.market.base.RefreshManager; +import com.jgyapp.market.bean.LocalApp; +import com.jgyapp.market.utils.ApkUtils; 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/appstore/uiui/activity/MainActivity.java b/app/src/main/java/com/jgyapp/market/activity/MainActivity.java similarity index 92% rename from app/src/main/java/com/appstore/uiui/activity/MainActivity.java rename to app/src/main/java/com/jgyapp/market/activity/MainActivity.java index 44f19c4..e2a89e9 100644 --- a/app/src/main/java/com/appstore/uiui/activity/MainActivity.java +++ b/app/src/main/java/com/jgyapp/market/activity/MainActivity.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.activity; +package com.jgyapp.market.activity; import android.content.BroadcastReceiver; import android.content.Context; @@ -22,25 +22,25 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentPagerAdapter; import androidx.viewpager.widget.ViewPager; -import com.appstore.uiui.R; -import com.appstore.uiui.base.BaseActivity; -import com.appstore.uiui.bean.AppInfo; -import com.appstore.uiui.bean.BaseResponse; -import com.appstore.uiui.bean.UserInfo; -import com.appstore.uiui.fragment.FeaturedFragment; -import com.appstore.uiui.fragment.ManageFragment; -import com.appstore.uiui.jpush.ExampleUtil; -import com.appstore.uiui.jpush.LocalBroadcastManager; -import com.appstore.uiui.jpush.TagAliasOperatorHelper; -import com.appstore.uiui.network.NetInterfaceManager; -import com.appstore.uiui.service.GuardService; -import com.appstore.uiui.service.InitJpushServer; -import com.appstore.uiui.service.MyDownloadService; -import com.appstore.uiui.service.StepService; -import com.appstore.uiui.utils.LogUtils; -import com.appstore.uiui.utils.SPUtils; -import com.appstore.uiui.utils.ToastUtil; -import com.appstore.uiui.utils.Utils; +import com.jgyapp.market.R; +import com.jgyapp.market.base.BaseActivity; +import com.jgyapp.market.bean.AppInfo; +import com.jgyapp.market.bean.BaseResponse; +import com.jgyapp.market.bean.UserInfo; +import com.jgyapp.market.fragment.FeaturedFragment; +import com.jgyapp.market.fragment.ManageFragment; +import com.jgyapp.market.jpush.ExampleUtil; +import com.jgyapp.market.jpush.LocalBroadcastManager; +import com.jgyapp.market.jpush.TagAliasOperatorHelper; +import com.jgyapp.market.network.NetInterfaceManager; +import com.jgyapp.market.service.GuardService; +import com.jgyapp.market.service.InitJpushServer; +import com.jgyapp.market.service.MyDownloadService; +import com.jgyapp.market.service.StepService; +import com.jgyapp.market.utils.LogUtils; +import com.jgyapp.market.utils.SPUtils; +import com.jgyapp.market.utils.ToastUtil; +import com.jgyapp.market.utils.Utils; import com.flyco.tablayout.SlidingTabLayout; import com.hjq.permissions.OnPermission; import com.hjq.permissions.Permission; @@ -57,14 +57,14 @@ import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.Disposable; import io.reactivex.schedulers.Schedulers; -import static com.appstore.uiui.jpush.TagAliasOperatorHelper.ACTION_ADD; -import static com.appstore.uiui.jpush.TagAliasOperatorHelper.ACTION_CHECK; -import static com.appstore.uiui.jpush.TagAliasOperatorHelper.ACTION_CLEAN; -import static com.appstore.uiui.jpush.TagAliasOperatorHelper.ACTION_DELETE; -import static com.appstore.uiui.jpush.TagAliasOperatorHelper.ACTION_GET; -import static com.appstore.uiui.jpush.TagAliasOperatorHelper.ACTION_SET; -import static com.appstore.uiui.jpush.TagAliasOperatorHelper.TagAliasBean; -import static com.appstore.uiui.jpush.TagAliasOperatorHelper.sequence; +import static com.jgyapp.market.jpush.TagAliasOperatorHelper.ACTION_ADD; +import static com.jgyapp.market.jpush.TagAliasOperatorHelper.ACTION_CHECK; +import static com.jgyapp.market.jpush.TagAliasOperatorHelper.ACTION_CLEAN; +import static com.jgyapp.market.jpush.TagAliasOperatorHelper.ACTION_DELETE; +import static com.jgyapp.market.jpush.TagAliasOperatorHelper.ACTION_GET; +import static com.jgyapp.market.jpush.TagAliasOperatorHelper.ACTION_SET; +import static com.jgyapp.market.jpush.TagAliasOperatorHelper.TagAliasBean; +import static com.jgyapp.market.jpush.TagAliasOperatorHelper.sequence; public class MainActivity extends BaseActivity { private static final String TAG = MainActivity.class.getSimpleName(); diff --git a/app/src/main/java/com/appstore/uiui/activity/SearcherActivity.java b/app/src/main/java/com/jgyapp/market/activity/SearcherActivity.java similarity index 94% rename from app/src/main/java/com/appstore/uiui/activity/SearcherActivity.java rename to app/src/main/java/com/jgyapp/market/activity/SearcherActivity.java index 8669b98..cdaa8c1 100644 --- a/app/src/main/java/com/appstore/uiui/activity/SearcherActivity.java +++ b/app/src/main/java/com/jgyapp/market/activity/SearcherActivity.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.activity; +package com.jgyapp.market.activity; import android.os.Handler; import android.os.Message; @@ -15,15 +15,13 @@ import androidx.annotation.NonNull; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.appstore.uiui.R; -import com.appstore.uiui.adapter.AppAdapter; -import com.appstore.uiui.base.BaseActivity; -import com.appstore.uiui.bean.AppInfo; -import com.appstore.uiui.bean.BaseResponse; -import com.appstore.uiui.network.NetInterfaceManager; -import com.appstore.uiui.network.api.QueryAllApp; -import com.appstore.uiui.network.api.SearchApp; -import com.appstore.uiui.utils.Utils; +import com.jgyapp.market.R; +import com.jgyapp.market.adapter.AppAdapter; +import com.jgyapp.market.base.BaseActivity; +import com.jgyapp.market.bean.AppInfo; +import com.jgyapp.market.bean.BaseResponse; +import com.jgyapp.market.network.NetInterfaceManager; +import com.jgyapp.market.utils.Utils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/appstore/uiui/adapter/AppAdapter.java b/app/src/main/java/com/jgyapp/market/adapter/AppAdapter.java similarity index 97% rename from app/src/main/java/com/appstore/uiui/adapter/AppAdapter.java rename to app/src/main/java/com/jgyapp/market/adapter/AppAdapter.java index f3ebf9c..a4f4f9c 100644 --- a/app/src/main/java/com/appstore/uiui/adapter/AppAdapter.java +++ b/app/src/main/java/com/jgyapp/market/adapter/AppAdapter.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.adapter; +package com.jgyapp.market.adapter; import android.content.Context; import android.content.Intent; @@ -14,13 +14,12 @@ import androidx.recyclerview.widget.RecyclerView; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.appstore.uiui.R; -import com.appstore.uiui.activity.DetailsActivity; -import com.appstore.uiui.base.FilePath; -import com.appstore.uiui.bean.AppInfo; -import com.appstore.uiui.utils.ApkUtils; -import com.appstore.uiui.utils.FileUtils; -import com.appstore.uiui.utils.StorageUtils; +import com.jgyapp.market.R; +import com.jgyapp.market.activity.DetailsActivity; +import com.jgyapp.market.bean.AppInfo; +import com.jgyapp.market.utils.ApkUtils; +import com.jgyapp.market.utils.FileUtils; +import com.jgyapp.market.utils.StorageUtils; import com.arialyy.annotations.Download; import com.arialyy.aria.core.Aria; import com.arialyy.aria.core.download.DownloadEntity; diff --git a/app/src/main/java/com/appstore/uiui/adapter/BannerViewHolder.java b/app/src/main/java/com/jgyapp/market/adapter/BannerViewHolder.java similarity index 84% rename from app/src/main/java/com/appstore/uiui/adapter/BannerViewHolder.java rename to app/src/main/java/com/jgyapp/market/adapter/BannerViewHolder.java index 38e89c2..e5c39c4 100644 --- a/app/src/main/java/com/appstore/uiui/adapter/BannerViewHolder.java +++ b/app/src/main/java/com/jgyapp/market/adapter/BannerViewHolder.java @@ -1,9 +1,9 @@ -package com.appstore.uiui.adapter; +package com.jgyapp.market.adapter; import android.view.View; -import com.appstore.uiui.R; -import com.appstore.uiui.view.CornerImageView; +import com.jgyapp.market.R; +import com.jgyapp.market.view.CornerImageView; import com.bumptech.glide.Glide; import com.zhpan.bannerview.holder.ViewHolder; diff --git a/app/src/main/java/com/appstore/uiui/adapter/DownloadManagerAdapter.java b/app/src/main/java/com/jgyapp/market/adapter/DownloadManagerAdapter.java similarity index 98% rename from app/src/main/java/com/appstore/uiui/adapter/DownloadManagerAdapter.java rename to app/src/main/java/com/jgyapp/market/adapter/DownloadManagerAdapter.java index 26c8087..557a8b9 100644 --- a/app/src/main/java/com/appstore/uiui/adapter/DownloadManagerAdapter.java +++ b/app/src/main/java/com/jgyapp/market/adapter/DownloadManagerAdapter.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.adapter; +package com.jgyapp.market.adapter; import android.content.Context; import android.os.Handler; @@ -12,13 +12,10 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.appstore.uiui.R; -import com.appstore.uiui.utils.ApkUtils; -import com.appstore.uiui.utils.FileUtils; -import com.appstore.uiui.utils.Utils; -import com.appstore.uiui.view.NumberProgressBar; +import com.jgyapp.market.R; +import com.jgyapp.market.utils.FileUtils; +import com.jgyapp.market.view.NumberProgressBar; import com.arialyy.annotations.Download; import com.arialyy.aria.core.Aria; import com.arialyy.aria.core.download.DownloadEntity; @@ -26,7 +23,6 @@ import com.arialyy.aria.core.inf.IEntity; import com.arialyy.aria.core.task.DownloadTask; import com.bumptech.glide.Glide; -import java.io.File; import java.util.List; diff --git a/app/src/main/java/com/appstore/uiui/adapter/ImageAdapter.java b/app/src/main/java/com/jgyapp/market/adapter/ImageAdapter.java similarity index 96% rename from app/src/main/java/com/appstore/uiui/adapter/ImageAdapter.java rename to app/src/main/java/com/jgyapp/market/adapter/ImageAdapter.java index 3754315..c2d0ab9 100644 --- a/app/src/main/java/com/appstore/uiui/adapter/ImageAdapter.java +++ b/app/src/main/java/com/jgyapp/market/adapter/ImageAdapter.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.adapter; +package com.jgyapp.market.adapter; import android.content.Context; import android.view.LayoutInflater; @@ -8,7 +8,7 @@ import android.widget.ImageView; import androidx.recyclerview.widget.RecyclerView; -import com.appstore.uiui.R; +import com.jgyapp.market.R; import com.bumptech.glide.Glide; import java.util.List; diff --git a/app/src/main/java/com/appstore/uiui/adapter/KindAdapter.java b/app/src/main/java/com/jgyapp/market/adapter/KindAdapter.java similarity index 92% rename from app/src/main/java/com/appstore/uiui/adapter/KindAdapter.java rename to app/src/main/java/com/jgyapp/market/adapter/KindAdapter.java index e16e1d2..d6e7601 100644 --- a/app/src/main/java/com/appstore/uiui/adapter/KindAdapter.java +++ b/app/src/main/java/com/jgyapp/market/adapter/KindAdapter.java @@ -1,22 +1,19 @@ -package com.appstore.uiui.adapter; +package com.jgyapp.market.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; import android.widget.ImageView; import android.widget.LinearLayout; -import android.widget.RelativeLayout; import android.widget.TextView; import androidx.recyclerview.widget.RecyclerView; -import com.appstore.uiui.R; -import com.appstore.uiui.activity.KindDetailActivity; -import com.appstore.uiui.bean.GlideCircleWithBorder; -import com.appstore.uiui.bean.Kind; +import com.jgyapp.market.R; +import com.jgyapp.market.activity.KindDetailActivity; +import com.jgyapp.market.bean.Kind; import com.bumptech.glide.Glide; import java.util.List; diff --git a/app/src/main/java/com/appstore/uiui/adapter/LocalAppAdapter.java b/app/src/main/java/com/jgyapp/market/adapter/LocalAppAdapter.java similarity index 93% rename from app/src/main/java/com/appstore/uiui/adapter/LocalAppAdapter.java rename to app/src/main/java/com/jgyapp/market/adapter/LocalAppAdapter.java index 475beae..45c0c0c 100644 --- a/app/src/main/java/com/appstore/uiui/adapter/LocalAppAdapter.java +++ b/app/src/main/java/com/jgyapp/market/adapter/LocalAppAdapter.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.adapter; +package com.jgyapp.market.adapter; import android.content.Context; import android.graphics.Bitmap; @@ -13,11 +13,11 @@ import android.widget.TextView; import androidx.recyclerview.widget.RecyclerView; -import com.appstore.uiui.R; -import com.appstore.uiui.bean.GlideCircleWithBorder; -import com.appstore.uiui.bean.LocalApp; -import com.appstore.uiui.utils.ApkUtils; -import com.appstore.uiui.utils.Utils; +import com.jgyapp.market.R; +import com.jgyapp.market.bean.GlideCircleWithBorder; +import com.jgyapp.market.bean.LocalApp; +import com.jgyapp.market.utils.ApkUtils; +import com.jgyapp.market.utils.Utils; import com.bumptech.glide.Glide; import java.util.List; diff --git a/app/src/main/java/com/appstore/uiui/adapter/ShowImageAdapter.java b/app/src/main/java/com/jgyapp/market/adapter/ShowImageAdapter.java similarity index 93% rename from app/src/main/java/com/appstore/uiui/adapter/ShowImageAdapter.java rename to app/src/main/java/com/jgyapp/market/adapter/ShowImageAdapter.java index 1a13fd0..3e6a710 100644 --- a/app/src/main/java/com/appstore/uiui/adapter/ShowImageAdapter.java +++ b/app/src/main/java/com/jgyapp/market/adapter/ShowImageAdapter.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.adapter; +package com.jgyapp.market.adapter; import android.content.Context; import android.view.LayoutInflater; @@ -8,8 +8,8 @@ import android.widget.ImageView; import androidx.recyclerview.widget.RecyclerView; -import com.appstore.uiui.R; -import com.appstore.uiui.bean.GlideCircleWithBorder; +import com.jgyapp.market.R; +import com.jgyapp.market.bean.GlideCircleWithBorder; import com.bumptech.glide.Glide; import java.util.List; diff --git a/app/src/main/java/com/appstore/uiui/adapter/UpdateAppAdapter.java b/app/src/main/java/com/jgyapp/market/adapter/UpdateAppAdapter.java similarity index 98% rename from app/src/main/java/com/appstore/uiui/adapter/UpdateAppAdapter.java rename to app/src/main/java/com/jgyapp/market/adapter/UpdateAppAdapter.java index a8674d2..f1fd05c 100644 --- a/app/src/main/java/com/appstore/uiui/adapter/UpdateAppAdapter.java +++ b/app/src/main/java/com/jgyapp/market/adapter/UpdateAppAdapter.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.adapter; +package com.jgyapp.market.adapter; import android.content.Context; import android.view.LayoutInflater; @@ -10,8 +10,8 @@ import android.widget.TextView; import androidx.recyclerview.widget.RecyclerView; -import com.appstore.uiui.R; -import com.appstore.uiui.bean.UpdateAppInfo; +import com.jgyapp.market.R; +import com.jgyapp.market.bean.UpdateAppInfo; import java.util.List; diff --git a/app/src/main/java/com/appstore/uiui/base/BaseActivity.java b/app/src/main/java/com/jgyapp/market/base/BaseActivity.java similarity index 97% rename from app/src/main/java/com/appstore/uiui/base/BaseActivity.java rename to app/src/main/java/com/jgyapp/market/base/BaseActivity.java index 498770a..ccf950f 100644 --- a/app/src/main/java/com/appstore/uiui/base/BaseActivity.java +++ b/app/src/main/java/com/jgyapp/market/base/BaseActivity.java @@ -1,9 +1,8 @@ -package com.appstore.uiui.base; +package com.jgyapp.market.base; import android.annotation.TargetApi; import android.app.Activity; import android.content.Context; -import android.content.pm.ActivityInfo; import android.graphics.Color; import android.os.Build; import android.os.Bundle; @@ -12,9 +11,8 @@ import android.view.ViewGroup; import android.view.WindowManager; import androidx.appcompat.app.AppCompatActivity; -import androidx.fragment.app.FragmentActivity; -import com.appstore.uiui.R; +import com.jgyapp.market.R; import com.zackratos.ultimatebarx.ultimatebarx.java.UltimateBarX; import uk.co.chrisjenx.calligraphy.CalligraphyContextWrapper; diff --git a/app/src/main/java/com/appstore/uiui/base/BaseApplication.java b/app/src/main/java/com/jgyapp/market/base/BaseApplication.java similarity index 98% rename from app/src/main/java/com/appstore/uiui/base/BaseApplication.java rename to app/src/main/java/com/jgyapp/market/base/BaseApplication.java index 5242741..2df4149 100644 --- a/app/src/main/java/com/appstore/uiui/base/BaseApplication.java +++ b/app/src/main/java/com/jgyapp/market/base/BaseApplication.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.base; +package com.jgyapp.market.base; import android.app.Application; import android.content.Context; @@ -12,13 +12,13 @@ import android.provider.Settings; import androidx.annotation.NonNull; -import com.appstore.uiui.R; -import com.appstore.uiui.jpush.Logger; -import com.appstore.uiui.network.NetInterfaceManager; -import com.appstore.uiui.receiver.AppManagerReceiver; -import com.appstore.uiui.utils.JGYUtils; -import com.appstore.uiui.utils.LogUtils; -import com.appstore.uiui.utils.ToastUtil; +import com.jgyapp.market.R; +import com.jgyapp.market.jpush.Logger; +import com.jgyapp.market.network.NetInterfaceManager; +import com.jgyapp.market.receiver.AppManagerReceiver; +import com.jgyapp.market.utils.JGYUtils; +import com.jgyapp.market.utils.LogUtils; +import com.jgyapp.market.utils.ToastUtil; import com.arialyy.aria.core.Aria; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.DefaultRefreshFooterCreator; diff --git a/app/src/main/java/com/appstore/uiui/base/BaseFragment.java b/app/src/main/java/com/jgyapp/market/base/BaseFragment.java similarity index 94% rename from app/src/main/java/com/appstore/uiui/base/BaseFragment.java rename to app/src/main/java/com/jgyapp/market/base/BaseFragment.java index 15eb209..43139bf 100644 --- a/app/src/main/java/com/appstore/uiui/base/BaseFragment.java +++ b/app/src/main/java/com/jgyapp/market/base/BaseFragment.java @@ -1,15 +1,14 @@ -package com.appstore.uiui.base; +package com.jgyapp.market.base; import android.content.Context; import android.os.Bundle; -import android.util.Log; import android.view.View; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; -import com.appstore.uiui.utils.LogUtils; +import com.jgyapp.market.utils.LogUtils; /** * Created by asus on 2017/8/4. diff --git a/app/src/main/java/com/appstore/uiui/base/FilePath.java b/app/src/main/java/com/jgyapp/market/base/FilePath.java similarity index 86% rename from app/src/main/java/com/appstore/uiui/base/FilePath.java rename to app/src/main/java/com/jgyapp/market/base/FilePath.java index 6d582a3..112e09e 100644 --- a/app/src/main/java/com/appstore/uiui/base/FilePath.java +++ b/app/src/main/java/com/jgyapp/market/base/FilePath.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.base; +package com.jgyapp.market.base; import android.os.Environment; diff --git a/app/src/main/java/com/appstore/uiui/base/LazyLoadFragment.java b/app/src/main/java/com/jgyapp/market/base/LazyLoadFragment.java similarity index 93% rename from app/src/main/java/com/appstore/uiui/base/LazyLoadFragment.java rename to app/src/main/java/com/jgyapp/market/base/LazyLoadFragment.java index 43ca17f..4a27153 100644 --- a/app/src/main/java/com/appstore/uiui/base/LazyLoadFragment.java +++ b/app/src/main/java/com/jgyapp/market/base/LazyLoadFragment.java @@ -1,6 +1,5 @@ -package com.appstore.uiui.base; +package com.jgyapp.market.base; -import android.content.Context; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; @@ -9,8 +8,6 @@ import android.view.ViewGroup; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; -import uk.co.chrisjenx.calligraphy.CalligraphyContextWrapper; - /** * Created by asus on 2017/11/1. */ diff --git a/app/src/main/java/com/appstore/uiui/base/RefreshManager.java b/app/src/main/java/com/jgyapp/market/base/RefreshManager.java similarity index 97% rename from app/src/main/java/com/appstore/uiui/base/RefreshManager.java rename to app/src/main/java/com/jgyapp/market/base/RefreshManager.java index 1deb727..bfbbc2d 100644 --- a/app/src/main/java/com/appstore/uiui/base/RefreshManager.java +++ b/app/src/main/java/com/jgyapp/market/base/RefreshManager.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.base; +package com.jgyapp.market.base; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/appstore/uiui/bean/AppDateInfo.java b/app/src/main/java/com/jgyapp/market/bean/AppDateInfo.java similarity index 99% rename from app/src/main/java/com/appstore/uiui/bean/AppDateInfo.java rename to app/src/main/java/com/jgyapp/market/bean/AppDateInfo.java index 29c234c..ad7ed07 100644 --- a/app/src/main/java/com/appstore/uiui/bean/AppDateInfo.java +++ b/app/src/main/java/com/jgyapp/market/bean/AppDateInfo.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.bean; +package com.jgyapp.market.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/appstore/uiui/bean/AppDownloadInfo.java b/app/src/main/java/com/jgyapp/market/bean/AppDownloadInfo.java similarity index 98% rename from app/src/main/java/com/appstore/uiui/bean/AppDownloadInfo.java rename to app/src/main/java/com/jgyapp/market/bean/AppDownloadInfo.java index 3daa045..73fd8b5 100644 --- a/app/src/main/java/com/appstore/uiui/bean/AppDownloadInfo.java +++ b/app/src/main/java/com/jgyapp/market/bean/AppDownloadInfo.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.bean; +package com.jgyapp.market.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/appstore/uiui/bean/AppInfo.java b/app/src/main/java/com/jgyapp/market/bean/AppInfo.java similarity index 99% rename from app/src/main/java/com/appstore/uiui/bean/AppInfo.java rename to app/src/main/java/com/jgyapp/market/bean/AppInfo.java index f36b5cd..9c79679 100644 --- a/app/src/main/java/com/appstore/uiui/bean/AppInfo.java +++ b/app/src/main/java/com/jgyapp/market/bean/AppInfo.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.bean; +package com.jgyapp.market.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/appstore/uiui/bean/AppInfos.java b/app/src/main/java/com/jgyapp/market/bean/AppInfos.java similarity index 99% rename from app/src/main/java/com/appstore/uiui/bean/AppInfos.java rename to app/src/main/java/com/jgyapp/market/bean/AppInfos.java index c7016b8..888b52f 100644 --- a/app/src/main/java/com/appstore/uiui/bean/AppInfos.java +++ b/app/src/main/java/com/jgyapp/market/bean/AppInfos.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.bean; +package com.jgyapp.market.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/appstore/uiui/bean/Banner.java b/app/src/main/java/com/jgyapp/market/bean/Banner.java similarity index 95% rename from app/src/main/java/com/appstore/uiui/bean/Banner.java rename to app/src/main/java/com/jgyapp/market/bean/Banner.java index 69bc9f6..78ed848 100644 --- a/app/src/main/java/com/appstore/uiui/bean/Banner.java +++ b/app/src/main/java/com/jgyapp/market/bean/Banner.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.bean; +package com.jgyapp.market.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/appstore/uiui/bean/BannerImage.java b/app/src/main/java/com/jgyapp/market/bean/BannerImage.java similarity index 95% rename from app/src/main/java/com/appstore/uiui/bean/BannerImage.java rename to app/src/main/java/com/jgyapp/market/bean/BannerImage.java index 0c96337..22c4832 100644 --- a/app/src/main/java/com/appstore/uiui/bean/BannerImage.java +++ b/app/src/main/java/com/jgyapp/market/bean/BannerImage.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.bean; +package com.jgyapp.market.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/appstore/uiui/bean/BaseResponse.java b/app/src/main/java/com/jgyapp/market/bean/BaseResponse.java similarity index 94% rename from app/src/main/java/com/appstore/uiui/bean/BaseResponse.java rename to app/src/main/java/com/jgyapp/market/bean/BaseResponse.java index 40af88e..e0fd493 100644 --- a/app/src/main/java/com/appstore/uiui/bean/BaseResponse.java +++ b/app/src/main/java/com/jgyapp/market/bean/BaseResponse.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.bean; +package com.jgyapp.market.bean; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/appstore/uiui/bean/GlideCircleWithBorder.java b/app/src/main/java/com/jgyapp/market/bean/GlideCircleWithBorder.java similarity index 95% rename from app/src/main/java/com/appstore/uiui/bean/GlideCircleWithBorder.java rename to app/src/main/java/com/jgyapp/market/bean/GlideCircleWithBorder.java index db44f7c..e4914bb 100644 --- a/app/src/main/java/com/appstore/uiui/bean/GlideCircleWithBorder.java +++ b/app/src/main/java/com/jgyapp/market/bean/GlideCircleWithBorder.java @@ -1,18 +1,14 @@ -package com.appstore.uiui.bean; +package com.jgyapp.market.bean; import android.content.Context; -import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.BitmapFactory; -import android.graphics.BitmapShader; import android.graphics.Canvas; -import android.graphics.Color; import android.graphics.Paint; import android.graphics.PorterDuff; import android.graphics.PorterDuffXfermode; -import android.graphics.RectF; -import com.appstore.uiui.R; +import com.jgyapp.market.R; import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; import com.bumptech.glide.load.resource.bitmap.BitmapTransformation; diff --git a/app/src/main/java/com/appstore/uiui/bean/ImageUrl.java b/app/src/main/java/com/jgyapp/market/bean/ImageUrl.java similarity index 85% rename from app/src/main/java/com/appstore/uiui/bean/ImageUrl.java rename to app/src/main/java/com/jgyapp/market/bean/ImageUrl.java index 12b285b..8f546ba 100644 --- a/app/src/main/java/com/appstore/uiui/bean/ImageUrl.java +++ b/app/src/main/java/com/jgyapp/market/bean/ImageUrl.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.bean; +package com.jgyapp.market.bean; public class ImageUrl { String img_url; diff --git a/app/src/main/java/com/appstore/uiui/bean/Kind.java b/app/src/main/java/com/jgyapp/market/bean/Kind.java similarity index 96% rename from app/src/main/java/com/appstore/uiui/bean/Kind.java rename to app/src/main/java/com/jgyapp/market/bean/Kind.java index 147cc2c..deea934 100644 --- a/app/src/main/java/com/appstore/uiui/bean/Kind.java +++ b/app/src/main/java/com/jgyapp/market/bean/Kind.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.bean; +package com.jgyapp.market.bean; /** * Created by asus on 2017/10/25. diff --git a/app/src/main/java/com/appstore/uiui/bean/LocalApp.java b/app/src/main/java/com/jgyapp/market/bean/LocalApp.java similarity index 98% rename from app/src/main/java/com/appstore/uiui/bean/LocalApp.java rename to app/src/main/java/com/jgyapp/market/bean/LocalApp.java index 0158247..8fac00a 100644 --- a/app/src/main/java/com/appstore/uiui/bean/LocalApp.java +++ b/app/src/main/java/com/jgyapp/market/bean/LocalApp.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.bean; +package com.jgyapp.market.bean; import android.graphics.drawable.Drawable; diff --git a/app/src/main/java/com/appstore/uiui/bean/UpdateAppInfo.java b/app/src/main/java/com/jgyapp/market/bean/UpdateAppInfo.java similarity index 98% rename from app/src/main/java/com/appstore/uiui/bean/UpdateAppInfo.java rename to app/src/main/java/com/jgyapp/market/bean/UpdateAppInfo.java index d2d702d..284c9d1 100644 --- a/app/src/main/java/com/appstore/uiui/bean/UpdateAppInfo.java +++ b/app/src/main/java/com/jgyapp/market/bean/UpdateAppInfo.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.bean; +package com.jgyapp.market.bean; import android.graphics.drawable.Drawable; diff --git a/app/src/main/java/com/appstore/uiui/bean/UserInfo.java b/app/src/main/java/com/jgyapp/market/bean/UserInfo.java similarity index 98% rename from app/src/main/java/com/appstore/uiui/bean/UserInfo.java rename to app/src/main/java/com/jgyapp/market/bean/UserInfo.java index 25201b6..b3209b5 100644 --- a/app/src/main/java/com/appstore/uiui/bean/UserInfo.java +++ b/app/src/main/java/com/jgyapp/market/bean/UserInfo.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.bean; +package com.jgyapp.market.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/jgyapp/market/common/BuikdConf.java b/app/src/main/java/com/jgyapp/market/common/BuikdConf.java new file mode 100644 index 0000000..3bec831 --- /dev/null +++ b/app/src/main/java/com/jgyapp/market/common/BuikdConf.java @@ -0,0 +1,5 @@ +package com.jgyapp.market.common; + +public class BuikdConf { + public static final boolean Isdebug = true; +} diff --git a/app/src/main/java/com/appstore/uiui/common/CommonDatas.java b/app/src/main/java/com/jgyapp/market/common/CommonDatas.java similarity index 57% rename from app/src/main/java/com/appstore/uiui/common/CommonDatas.java rename to app/src/main/java/com/jgyapp/market/common/CommonDatas.java index 5b4c64c..d0d8037 100644 --- a/app/src/main/java/com/appstore/uiui/common/CommonDatas.java +++ b/app/src/main/java/com/jgyapp/market/common/CommonDatas.java @@ -1,8 +1,6 @@ -package com.appstore.uiui.common; +package com.jgyapp.market.common; -import com.appstore.uiui.BuildConfig; - public class CommonDatas { public static final String FLAG_FIRST_ENTER = "qch_first_enter"; } diff --git a/app/src/main/java/com/appstore/uiui/fragment/FeaturedFragment.java b/app/src/main/java/com/jgyapp/market/fragment/FeaturedFragment.java similarity index 95% rename from app/src/main/java/com/appstore/uiui/fragment/FeaturedFragment.java rename to app/src/main/java/com/jgyapp/market/fragment/FeaturedFragment.java index a0080a5..9c725ac 100644 --- a/app/src/main/java/com/appstore/uiui/fragment/FeaturedFragment.java +++ b/app/src/main/java/com/jgyapp/market/fragment/FeaturedFragment.java @@ -1,11 +1,10 @@ -package com.appstore.uiui.fragment; +package com.jgyapp.market.fragment; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.res.Configuration; -import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.Handler; @@ -19,23 +18,20 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.SimpleItemAnimator; -import com.appstore.uiui.R; -import com.appstore.uiui.activity.HintActivity; -import com.appstore.uiui.activity.MainActivity; -import com.appstore.uiui.adapter.AppAdapter; -import com.appstore.uiui.adapter.BannerViewHolder; -import com.appstore.uiui.base.LazyLoadFragment; -import com.appstore.uiui.base.RefreshManager; -import com.appstore.uiui.bean.AppInfo; -import com.appstore.uiui.bean.AppInfos; -import com.appstore.uiui.bean.Banner; -import com.appstore.uiui.bean.BaseResponse; -import com.appstore.uiui.bean.ImageUrl; -import com.appstore.uiui.network.NetInterfaceManager; -import com.appstore.uiui.network.api.BannerImage; -import com.appstore.uiui.network.api.QueryAllApp; -import com.appstore.uiui.utils.LogUtils; -import com.appstore.uiui.utils.Utils; +import com.jgyapp.market.R; +import com.jgyapp.market.activity.HintActivity; +import com.jgyapp.market.adapter.AppAdapter; +import com.jgyapp.market.adapter.BannerViewHolder; +import com.jgyapp.market.base.LazyLoadFragment; +import com.jgyapp.market.base.RefreshManager; +import com.jgyapp.market.bean.AppInfo; +import com.jgyapp.market.bean.AppInfos; +import com.jgyapp.market.bean.Banner; +import com.jgyapp.market.bean.BaseResponse; +import com.jgyapp.market.bean.ImageUrl; +import com.jgyapp.market.network.NetInterfaceManager; +import com.jgyapp.market.utils.LogUtils; +import com.jgyapp.market.utils.Utils; import com.blankj.utilcode.util.ScreenUtils; import com.bumptech.glide.Glide; import com.scwang.smartrefresh.layout.SmartRefreshLayout; diff --git a/app/src/main/java/com/appstore/uiui/fragment/KindFragment.java b/app/src/main/java/com/jgyapp/market/fragment/KindFragment.java similarity index 94% rename from app/src/main/java/com/appstore/uiui/fragment/KindFragment.java rename to app/src/main/java/com/jgyapp/market/fragment/KindFragment.java index 45808f4..4af31de 100644 --- a/app/src/main/java/com/appstore/uiui/fragment/KindFragment.java +++ b/app/src/main/java/com/jgyapp/market/fragment/KindFragment.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.fragment; +package com.jgyapp.market.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.appstore.uiui.R; -import com.appstore.uiui.adapter.KindAdapter; -import com.appstore.uiui.base.BaseFragment; -import com.appstore.uiui.base.RefreshManager; -import com.appstore.uiui.bean.Kind; +import com.jgyapp.market.R; +import com.jgyapp.market.adapter.KindAdapter; +import com.jgyapp.market.base.BaseFragment; +import com.jgyapp.market.base.RefreshManager; +import com.jgyapp.market.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/appstore/uiui/fragment/ManageFragment.java b/app/src/main/java/com/jgyapp/market/fragment/ManageFragment.java similarity index 93% rename from app/src/main/java/com/appstore/uiui/fragment/ManageFragment.java rename to app/src/main/java/com/jgyapp/market/fragment/ManageFragment.java index d26ff72..12a71a1 100644 --- a/app/src/main/java/com/appstore/uiui/fragment/ManageFragment.java +++ b/app/src/main/java/com/jgyapp/market/fragment/ManageFragment.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.fragment; +package com.jgyapp.market.fragment; import android.content.Context; import android.content.Intent; @@ -10,7 +10,6 @@ import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.provider.Settings; import android.view.View; import android.widget.ImageView; import android.widget.TextView; @@ -19,19 +18,18 @@ import androidx.constraintlayout.widget.ConstraintLayout; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.appstore.uiui.BuildConfig; -import com.appstore.uiui.R; -import com.appstore.uiui.activity.DownloadManagerActivity; -import com.appstore.uiui.activity.LocalManagerActivity; -import com.appstore.uiui.adapter.UpdateAppAdapter; -import com.appstore.uiui.base.LazyLoadFragment; -import com.appstore.uiui.bean.AppInfo; -import com.appstore.uiui.bean.LocalApp; -import com.appstore.uiui.bean.UpdateAppInfo; -import com.appstore.uiui.utils.ApkUtils; -import com.appstore.uiui.utils.ToastUtil; +import com.jgyapp.market.BuildConfig; +import com.jgyapp.market.R; +import com.jgyapp.market.activity.DownloadManagerActivity; +import com.jgyapp.market.activity.LocalManagerActivity; +import com.jgyapp.market.adapter.UpdateAppAdapter; +import com.jgyapp.market.base.LazyLoadFragment; +import com.jgyapp.market.bean.AppInfo; +import com.jgyapp.market.bean.LocalApp; +import com.jgyapp.market.bean.UpdateAppInfo; +import com.jgyapp.market.utils.ApkUtils; +import com.jgyapp.market.utils.ToastUtil; -import java.io.File; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/appstore/uiui/fragment/RankFragment.java b/app/src/main/java/com/jgyapp/market/fragment/RankFragment.java similarity index 91% rename from app/src/main/java/com/appstore/uiui/fragment/RankFragment.java rename to app/src/main/java/com/jgyapp/market/fragment/RankFragment.java index 18aa8e0..5b5c7bc 100644 --- a/app/src/main/java/com/appstore/uiui/fragment/RankFragment.java +++ b/app/src/main/java/com/jgyapp/market/fragment/RankFragment.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.fragment; +package com.jgyapp.market.fragment; import android.os.Bundle; @@ -11,12 +11,12 @@ import androidx.annotation.NonNull; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.appstore.uiui.R; -import com.appstore.uiui.adapter.AppAdapter; -import com.appstore.uiui.base.LazyLoadFragment; -import com.appstore.uiui.base.RefreshManager; -import com.appstore.uiui.bean.AppInfo; -import com.appstore.uiui.utils.LogUtils; +import com.jgyapp.market.R; +import com.jgyapp.market.adapter.AppAdapter; +import com.jgyapp.market.base.LazyLoadFragment; +import com.jgyapp.market.base.RefreshManager; +import com.jgyapp.market.bean.AppInfo; +import com.jgyapp.market.utils.LogUtils; 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/appstore/uiui/helper/CustomSnapHelper.java b/app/src/main/java/com/jgyapp/market/helper/CustomSnapHelper.java similarity index 98% rename from app/src/main/java/com/appstore/uiui/helper/CustomSnapHelper.java rename to app/src/main/java/com/jgyapp/market/helper/CustomSnapHelper.java index 347d6c8..ed1dcb4 100644 --- a/app/src/main/java/com/appstore/uiui/helper/CustomSnapHelper.java +++ b/app/src/main/java/com/jgyapp/market/helper/CustomSnapHelper.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.helper; +package com.jgyapp.market.helper; import android.view.View; diff --git a/app/src/main/java/com/appstore/uiui/jpush/ExampleUtil.java b/app/src/main/java/com/jgyapp/market/jpush/ExampleUtil.java similarity index 98% rename from app/src/main/java/com/appstore/uiui/jpush/ExampleUtil.java rename to app/src/main/java/com/jgyapp/market/jpush/ExampleUtil.java index f27da36..1b99bd7 100644 --- a/app/src/main/java/com/appstore/uiui/jpush/ExampleUtil.java +++ b/app/src/main/java/com/jgyapp/market/jpush/ExampleUtil.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.jpush; +package com.jgyapp.market.jpush; import android.content.Context; import android.content.pm.ApplicationInfo; @@ -11,7 +11,6 @@ import android.os.Bundle; import android.os.Looper; import android.telephony.TelephonyManager; import android.text.TextUtils; -import android.widget.Toast; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/app/src/main/java/com/appstore/uiui/jpush/Invalid/ExampleApplication.java b/app/src/main/java/com/jgyapp/market/jpush/Invalid/ExampleApplication.java similarity index 88% rename from app/src/main/java/com/appstore/uiui/jpush/Invalid/ExampleApplication.java rename to app/src/main/java/com/jgyapp/market/jpush/Invalid/ExampleApplication.java index cd004f2..8389c73 100644 --- a/app/src/main/java/com/appstore/uiui/jpush/Invalid/ExampleApplication.java +++ b/app/src/main/java/com/jgyapp/market/jpush/Invalid/ExampleApplication.java @@ -1,8 +1,8 @@ -package com.appstore.uiui.jpush.Invalid; +package com.jgyapp.market.jpush.Invalid; import android.app.Application; -import com.appstore.uiui.jpush.Logger; +import com.jgyapp.market.jpush.Logger; import cn.jpush.android.api.JPushInterface; diff --git a/app/src/main/java/com/appstore/uiui/jpush/Invalid/MainActivity.java b/app/src/main/java/com/jgyapp/market/jpush/Invalid/MainActivity.java similarity index 90% rename from app/src/main/java/com/appstore/uiui/jpush/Invalid/MainActivity.java rename to app/src/main/java/com/jgyapp/market/jpush/Invalid/MainActivity.java index fec9c74..1aab0c7 100644 --- a/app/src/main/java/com/appstore/uiui/jpush/Invalid/MainActivity.java +++ b/app/src/main/java/com/jgyapp/market/jpush/Invalid/MainActivity.java @@ -1,22 +1,4 @@ -package com.appstore.uiui.jpush.Invalid; - - -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.content.IntentFilter; -import android.os.Bundle; -import android.view.View; -import android.view.View.OnClickListener; -import android.widget.Button; -import android.widget.EditText; -import android.widget.TextView; -import android.widget.Toast; - -import cn.jpush.android.api.InstrumentedActivity; -import cn.jpush.android.api.JPushInterface; - import com.appstore.uiui.R; - +package com.jgyapp.market.jpush.Invalid; //public class MainActivity extends InstrumentedActivity implements OnClickListener{ diff --git a/app/src/main/java/com/appstore/uiui/jpush/Invalid/PushSetActivity.java b/app/src/main/java/com/jgyapp/market/jpush/Invalid/PushSetActivity.java similarity index 99% rename from app/src/main/java/com/appstore/uiui/jpush/Invalid/PushSetActivity.java rename to app/src/main/java/com/jgyapp/market/jpush/Invalid/PushSetActivity.java index c5709b8..08fd7cc 100644 --- a/app/src/main/java/com/appstore/uiui/jpush/Invalid/PushSetActivity.java +++ b/app/src/main/java/com/jgyapp/market/jpush/Invalid/PushSetActivity.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.jpush.Invalid; +package com.jgyapp.market.jpush.Invalid; //public class PushSetActivity extends InstrumentedActivity implements OnClickListener { // private static final String TAG = "JIGUANG-Example"; diff --git a/app/src/main/java/com/appstore/uiui/jpush/Invalid/SettingActivity.java b/app/src/main/java/com/jgyapp/market/jpush/Invalid/SettingActivity.java similarity index 88% rename from app/src/main/java/com/appstore/uiui/jpush/Invalid/SettingActivity.java rename to app/src/main/java/com/jgyapp/market/jpush/Invalid/SettingActivity.java index 1348751..4f9648d 100644 --- a/app/src/main/java/com/appstore/uiui/jpush/Invalid/SettingActivity.java +++ b/app/src/main/java/com/jgyapp/market/jpush/Invalid/SettingActivity.java @@ -1,24 +1,4 @@ -package com.appstore.uiui.jpush.Invalid; - -import android.content.SharedPreferences; -import android.content.SharedPreferences.Editor; -import android.os.Bundle; -import android.text.TextUtils; -import android.text.format.DateFormat; -import android.view.KeyEvent; -import android.view.View; -import android.view.View.OnClickListener; -import android.widget.Button; -import android.widget.CheckBox; -import android.widget.TimePicker; -import android.widget.Toast; - -import java.util.HashSet; -import java.util.Set; - -import cn.jpush.android.api.InstrumentedActivity; -import cn.jpush.android.api.JPushInterface; - import com.appstore.uiui.R; +package com.jgyapp.market.jpush.Invalid; //public class SettingActivity extends InstrumentedActivity implements OnClickListener { // TimePicker startTime; diff --git a/app/src/main/java/com/appstore/uiui/jpush/Invalid/TestActivity.java b/app/src/main/java/com/jgyapp/market/jpush/Invalid/TestActivity.java similarity index 96% rename from app/src/main/java/com/appstore/uiui/jpush/Invalid/TestActivity.java rename to app/src/main/java/com/jgyapp/market/jpush/Invalid/TestActivity.java index 1fed3ad..c294a4a 100644 --- a/app/src/main/java/com/appstore/uiui/jpush/Invalid/TestActivity.java +++ b/app/src/main/java/com/jgyapp/market/jpush/Invalid/TestActivity.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.jpush.Invalid; +package com.jgyapp.market.jpush.Invalid; import android.app.Activity; import android.content.Intent; diff --git a/app/src/main/java/com/appstore/uiui/jpush/LocalBroadcastManager.java b/app/src/main/java/com/jgyapp/market/jpush/LocalBroadcastManager.java similarity index 99% rename from app/src/main/java/com/appstore/uiui/jpush/LocalBroadcastManager.java rename to app/src/main/java/com/jgyapp/market/jpush/LocalBroadcastManager.java index a3bee04..7c6bd3b 100644 --- a/app/src/main/java/com/appstore/uiui/jpush/LocalBroadcastManager.java +++ b/app/src/main/java/com/jgyapp/market/jpush/LocalBroadcastManager.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.jpush; +package com.jgyapp.market.jpush; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/app/src/main/java/com/appstore/uiui/jpush/Logger.java b/app/src/main/java/com/jgyapp/market/jpush/Logger.java similarity index 95% rename from app/src/main/java/com/appstore/uiui/jpush/Logger.java rename to app/src/main/java/com/jgyapp/market/jpush/Logger.java index 9c65cae..89e06a2 100644 --- a/app/src/main/java/com/appstore/uiui/jpush/Logger.java +++ b/app/src/main/java/com/jgyapp/market/jpush/Logger.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.jpush; +package com.jgyapp.market.jpush; import android.util.Log; diff --git a/app/src/main/java/com/appstore/uiui/jpush/MyJPushMessageReceiver.java b/app/src/main/java/com/jgyapp/market/jpush/MyJPushMessageReceiver.java similarity index 95% rename from app/src/main/java/com/appstore/uiui/jpush/MyJPushMessageReceiver.java rename to app/src/main/java/com/jgyapp/market/jpush/MyJPushMessageReceiver.java index 64253a1..77f9c55 100644 --- a/app/src/main/java/com/appstore/uiui/jpush/MyJPushMessageReceiver.java +++ b/app/src/main/java/com/jgyapp/market/jpush/MyJPushMessageReceiver.java @@ -1,8 +1,8 @@ -package com.appstore.uiui.jpush; +package com.jgyapp.market.jpush; import android.content.Context; -import com.appstore.uiui.base.BaseApplication; +import com.jgyapp.market.base.BaseApplication; import cn.jpush.android.api.CustomMessage; import cn.jpush.android.api.JPushMessage; diff --git a/app/src/main/java/com/appstore/uiui/jpush/MyReceiver.java b/app/src/main/java/com/jgyapp/market/jpush/MyReceiver.java similarity index 98% rename from app/src/main/java/com/appstore/uiui/jpush/MyReceiver.java rename to app/src/main/java/com/jgyapp/market/jpush/MyReceiver.java index 6290f7f..b153182 100644 --- a/app/src/main/java/com/appstore/uiui/jpush/MyReceiver.java +++ b/app/src/main/java/com/jgyapp/market/jpush/MyReceiver.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.jpush; +package com.jgyapp.market.jpush; import android.content.BroadcastReceiver; import android.content.Context; @@ -6,7 +6,7 @@ import android.content.Intent; import android.os.Bundle; import android.text.TextUtils; -import com.appstore.uiui.activity.MainActivity; +import com.jgyapp.market.activity.MainActivity; import org.json.JSONException; import org.json.JSONObject; diff --git a/app/src/main/java/com/appstore/uiui/jpush/PushService.java b/app/src/main/java/com/jgyapp/market/jpush/PushService.java similarity index 75% rename from app/src/main/java/com/appstore/uiui/jpush/PushService.java rename to app/src/main/java/com/jgyapp/market/jpush/PushService.java index b5d61fb..c59e2bd 100644 --- a/app/src/main/java/com/appstore/uiui/jpush/PushService.java +++ b/app/src/main/java/com/jgyapp/market/jpush/PushService.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.jpush; +package com.jgyapp.market.jpush; import cn.jpush.android.service.JCommonService; diff --git a/app/src/main/java/com/appstore/uiui/jpush/TagAliasOperatorHelper.java b/app/src/main/java/com/jgyapp/market/jpush/TagAliasOperatorHelper.java similarity index 99% rename from app/src/main/java/com/appstore/uiui/jpush/TagAliasOperatorHelper.java rename to app/src/main/java/com/jgyapp/market/jpush/TagAliasOperatorHelper.java index 4feca3e..ca3eefb 100644 --- a/app/src/main/java/com/appstore/uiui/jpush/TagAliasOperatorHelper.java +++ b/app/src/main/java/com/jgyapp/market/jpush/TagAliasOperatorHelper.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.jpush; +package com.jgyapp.market.jpush; import android.content.Context; import android.os.Handler; diff --git a/app/src/main/java/com/appstore/uiui/network/HTTPInterface.java b/app/src/main/java/com/jgyapp/market/network/HTTPInterface.java similarity index 92% rename from app/src/main/java/com/appstore/uiui/network/HTTPInterface.java rename to app/src/main/java/com/jgyapp/market/network/HTTPInterface.java index a971382..5684150 100644 --- a/app/src/main/java/com/appstore/uiui/network/HTTPInterface.java +++ b/app/src/main/java/com/jgyapp/market/network/HTTPInterface.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.network; +package com.jgyapp.market.network; import android.content.Context; import android.content.pm.PackageInfo; @@ -8,12 +8,11 @@ import android.util.Log; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.appstore.uiui.BuildConfig; -import com.appstore.uiui.bean.AppInfo; -import com.appstore.uiui.bean.BaseResponse; -import com.appstore.uiui.network.api.NewestAppUpdate; -import com.appstore.uiui.utils.FileUtils; -import com.appstore.uiui.utils.JGYUtils; +import com.jgyapp.market.BuildConfig; +import com.jgyapp.market.bean.AppInfo; +import com.jgyapp.market.bean.BaseResponse; +import com.jgyapp.market.utils.FileUtils; +import com.jgyapp.market.utils.JGYUtils; import io.reactivex.Observer; import io.reactivex.android.schedulers.AndroidSchedulers; diff --git a/app/src/main/java/com/appstore/uiui/network/NetInterfaceManager.java b/app/src/main/java/com/jgyapp/market/network/NetInterfaceManager.java similarity index 86% rename from app/src/main/java/com/appstore/uiui/network/NetInterfaceManager.java rename to app/src/main/java/com/jgyapp/market/network/NetInterfaceManager.java index 1e11b7c..77ae107 100644 --- a/app/src/main/java/com/appstore/uiui/network/NetInterfaceManager.java +++ b/app/src/main/java/com/jgyapp/market/network/NetInterfaceManager.java @@ -1,25 +1,24 @@ -package com.appstore.uiui.network; +package com.jgyapp.market.network; import android.content.Context; import android.os.Environment; -import com.appstore.uiui.bean.Banner; -import com.appstore.uiui.bean.BaseResponse; -import com.appstore.uiui.network.URLs.UrlAddress; -import com.appstore.uiui.network.api.BannerImage; -import com.appstore.uiui.network.api.DownloadApp; -import com.appstore.uiui.network.api.GetBanner; -import com.appstore.uiui.network.api.NewestAppUpdate; -import com.appstore.uiui.network.api.QueryAllApp; -import com.appstore.uiui.network.api.SNInfo; -import com.appstore.uiui.network.api.SearchApp; -import com.appstore.uiui.network.api.QueryPackageApp; +import com.jgyapp.market.bean.Banner; +import com.jgyapp.market.bean.BaseResponse; +import com.jgyapp.market.network.URLs.UrlAddress; +import com.jgyapp.market.network.api.BannerImage; +import com.jgyapp.market.network.api.DownloadApp; +import com.jgyapp.market.network.api.GetBanner; +import com.jgyapp.market.network.api.NewestAppUpdate; +import com.jgyapp.market.network.api.QueryAllApp; +import com.jgyapp.market.network.api.SNInfo; +import com.jgyapp.market.network.api.SearchApp; +import com.jgyapp.market.network.api.QueryPackageApp; import java.io.File; import java.util.concurrent.TimeUnit; import io.reactivex.Observable; -import io.reactivex.Scheduler; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.schedulers.Schedulers; import okhttp3.Cache; diff --git a/app/src/main/java/com/appstore/uiui/network/URLs/UrlAddress.java b/app/src/main/java/com/jgyapp/market/network/URLs/UrlAddress.java similarity index 97% rename from app/src/main/java/com/appstore/uiui/network/URLs/UrlAddress.java rename to app/src/main/java/com/jgyapp/market/network/URLs/UrlAddress.java index 61a1476..6ee6ffc 100644 --- a/app/src/main/java/com/appstore/uiui/network/URLs/UrlAddress.java +++ b/app/src/main/java/com/jgyapp/market/network/URLs/UrlAddress.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.network.URLs; +package com.jgyapp.market.network.URLs; public class UrlAddress { public final static String ROOT_URL = "http://homework.uiuios.com/android/"; diff --git a/app/src/main/java/com/appstore/uiui/network/api/BannerImage.java b/app/src/main/java/com/jgyapp/market/network/api/BannerImage.java similarity index 62% rename from app/src/main/java/com/appstore/uiui/network/api/BannerImage.java rename to app/src/main/java/com/jgyapp/market/network/api/BannerImage.java index 64370e0..238969c 100644 --- a/app/src/main/java/com/appstore/uiui/network/api/BannerImage.java +++ b/app/src/main/java/com/jgyapp/market/network/api/BannerImage.java @@ -1,8 +1,8 @@ -package com.appstore.uiui.network.api; +package com.jgyapp.market.network.api; -import com.appstore.uiui.bean.BaseResponse; -import com.appstore.uiui.bean.ImageUrl; -import com.appstore.uiui.network.URLs.UrlAddress; +import com.jgyapp.market.bean.BaseResponse; +import com.jgyapp.market.bean.ImageUrl; +import com.jgyapp.market.network.URLs.UrlAddress; import java.util.List; diff --git a/app/src/main/java/com/appstore/uiui/network/api/DownloadApp.java b/app/src/main/java/com/jgyapp/market/network/api/DownloadApp.java similarity index 77% rename from app/src/main/java/com/appstore/uiui/network/api/DownloadApp.java rename to app/src/main/java/com/jgyapp/market/network/api/DownloadApp.java index 7cb9cfd..27db032 100644 --- a/app/src/main/java/com/appstore/uiui/network/api/DownloadApp.java +++ b/app/src/main/java/com/jgyapp/market/network/api/DownloadApp.java @@ -1,7 +1,7 @@ -package com.appstore.uiui.network.api; +package com.jgyapp.market.network.api; -import com.appstore.uiui.bean.BaseResponse; -import com.appstore.uiui.network.URLs.UrlAddress; +import com.jgyapp.market.bean.BaseResponse; +import com.jgyapp.market.network.URLs.UrlAddress; import io.reactivex.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/appstore/uiui/network/api/GetBanner.java b/app/src/main/java/com/jgyapp/market/network/api/GetBanner.java similarity index 51% rename from app/src/main/java/com/appstore/uiui/network/api/GetBanner.java rename to app/src/main/java/com/jgyapp/market/network/api/GetBanner.java index fe65f81..0dc5b10 100644 --- a/app/src/main/java/com/appstore/uiui/network/api/GetBanner.java +++ b/app/src/main/java/com/jgyapp/market/network/api/GetBanner.java @@ -1,8 +1,8 @@ -package com.appstore.uiui.network.api; +package com.jgyapp.market.network.api; -import com.appstore.uiui.bean.Banner; -import com.appstore.uiui.bean.BaseResponse; -import com.appstore.uiui.network.URLs.UrlAddress; +import com.jgyapp.market.bean.Banner; +import com.jgyapp.market.bean.BaseResponse; +import com.jgyapp.market.network.URLs.UrlAddress; import io.reactivex.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/appstore/uiui/network/api/NewestAppUpdate.java b/app/src/main/java/com/jgyapp/market/network/api/NewestAppUpdate.java similarity index 68% rename from app/src/main/java/com/appstore/uiui/network/api/NewestAppUpdate.java rename to app/src/main/java/com/jgyapp/market/network/api/NewestAppUpdate.java index de98cdb..a8796a0 100644 --- a/app/src/main/java/com/appstore/uiui/network/api/NewestAppUpdate.java +++ b/app/src/main/java/com/jgyapp/market/network/api/NewestAppUpdate.java @@ -1,10 +1,10 @@ -package com.appstore.uiui.network.api; +package com.jgyapp.market.network.api; -import com.appstore.uiui.bean.AppInfo; -import com.appstore.uiui.bean.BaseResponse; -import com.appstore.uiui.network.URLs.UrlAddress; +import com.jgyapp.market.bean.AppInfo; +import com.jgyapp.market.bean.BaseResponse; +import com.jgyapp.market.network.URLs.UrlAddress; import io.reactivex.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/appstore/uiui/network/api/QueryAllApp.java b/app/src/main/java/com/jgyapp/market/network/api/QueryAllApp.java similarity index 57% rename from app/src/main/java/com/appstore/uiui/network/api/QueryAllApp.java rename to app/src/main/java/com/jgyapp/market/network/api/QueryAllApp.java index 240f8af..85c36af 100644 --- a/app/src/main/java/com/appstore/uiui/network/api/QueryAllApp.java +++ b/app/src/main/java/com/jgyapp/market/network/api/QueryAllApp.java @@ -1,9 +1,8 @@ -package com.appstore.uiui.network.api; +package com.jgyapp.market.network.api; -import com.appstore.uiui.bean.AppInfo; -import com.appstore.uiui.bean.BaseResponse; -import com.appstore.uiui.bean.UserInfo; -import com.appstore.uiui.network.URLs.UrlAddress; +import com.jgyapp.market.bean.AppInfo; +import com.jgyapp.market.bean.BaseResponse; +import com.jgyapp.market.network.URLs.UrlAddress; import java.util.List; diff --git a/app/src/main/java/com/appstore/uiui/network/api/QueryPackageApp.java b/app/src/main/java/com/jgyapp/market/network/api/QueryPackageApp.java similarity index 62% rename from app/src/main/java/com/appstore/uiui/network/api/QueryPackageApp.java rename to app/src/main/java/com/jgyapp/market/network/api/QueryPackageApp.java index 1b7b55a..c9d1ec7 100644 --- a/app/src/main/java/com/appstore/uiui/network/api/QueryPackageApp.java +++ b/app/src/main/java/com/jgyapp/market/network/api/QueryPackageApp.java @@ -1,10 +1,8 @@ -package com.appstore.uiui.network.api; +package com.jgyapp.market.network.api; -import com.appstore.uiui.bean.AppInfo; -import com.appstore.uiui.bean.BaseResponse; -import com.appstore.uiui.network.URLs.UrlAddress; - -import java.util.List; +import com.jgyapp.market.bean.AppInfo; +import com.jgyapp.market.bean.BaseResponse; +import com.jgyapp.market.network.URLs.UrlAddress; import io.reactivex.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/appstore/uiui/network/api/SNInfo.java b/app/src/main/java/com/jgyapp/market/network/api/SNInfo.java similarity index 59% rename from app/src/main/java/com/appstore/uiui/network/api/SNInfo.java rename to app/src/main/java/com/jgyapp/market/network/api/SNInfo.java index 7f0bda6..723604a 100644 --- a/app/src/main/java/com/appstore/uiui/network/api/SNInfo.java +++ b/app/src/main/java/com/jgyapp/market/network/api/SNInfo.java @@ -1,8 +1,8 @@ -package com.appstore.uiui.network.api; +package com.jgyapp.market.network.api; -import com.appstore.uiui.bean.BaseResponse; -import com.appstore.uiui.bean.UserInfo; -import com.appstore.uiui.network.URLs.UrlAddress; +import com.jgyapp.market.bean.BaseResponse; +import com.jgyapp.market.bean.UserInfo; +import com.jgyapp.market.network.URLs.UrlAddress; import io.reactivex.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/appstore/uiui/network/api/SearchApp.java b/app/src/main/java/com/jgyapp/market/network/api/SearchApp.java similarity index 65% rename from app/src/main/java/com/appstore/uiui/network/api/SearchApp.java rename to app/src/main/java/com/jgyapp/market/network/api/SearchApp.java index 3e549f4..05b1f97 100644 --- a/app/src/main/java/com/appstore/uiui/network/api/SearchApp.java +++ b/app/src/main/java/com/jgyapp/market/network/api/SearchApp.java @@ -1,8 +1,8 @@ -package com.appstore.uiui.network.api; +package com.jgyapp.market.network.api; -import com.appstore.uiui.bean.AppInfo; -import com.appstore.uiui.bean.BaseResponse; -import com.appstore.uiui.network.URLs.UrlAddress; +import com.jgyapp.market.bean.AppInfo; +import com.jgyapp.market.bean.BaseResponse; +import com.jgyapp.market.network.URLs.UrlAddress; import java.util.List; diff --git a/app/src/main/java/com/appstore/uiui/receiver/AppManagerReceiver.java b/app/src/main/java/com/jgyapp/market/receiver/AppManagerReceiver.java similarity index 86% rename from app/src/main/java/com/appstore/uiui/receiver/AppManagerReceiver.java rename to app/src/main/java/com/jgyapp/market/receiver/AppManagerReceiver.java index 8d12aac..c33bf5f 100644 --- a/app/src/main/java/com/appstore/uiui/receiver/AppManagerReceiver.java +++ b/app/src/main/java/com/jgyapp/market/receiver/AppManagerReceiver.java @@ -1,14 +1,14 @@ -package com.appstore.uiui.receiver; +package com.jgyapp.market.receiver; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.util.Log; -import com.appstore.uiui.utils.ApkUtils; -import com.appstore.uiui.utils.LogUtils; -import com.appstore.uiui.utils.SPUtils; -import com.appstore.uiui.utils.ToastUtil; +import com.jgyapp.market.utils.ApkUtils; +import com.jgyapp.market.utils.LogUtils; +import com.jgyapp.market.utils.SPUtils; +import com.jgyapp.market.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.appstore.uiui.PACKAGE_ADDED"); + Intent intents = new Intent("com.jgyapp.market.PACKAGE_ADDED"); intents.putExtra("package", packageName); context.sendBroadcast(intents); } else { - Intent intents = new Intent("com.appstore.uiui.PACKAGE_REPLACED"); + Intent intents = new Intent("com.jgyapp.market.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.appstore.uiui.PACKAGE_REMOVED"); + Intent intents = new Intent("com.jgyapp.market.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.appstore.uiui", + "com.jgyapp.market", "com.uiuios.updatetools", "com.info.sn", "com.android.uiuios", diff --git a/app/src/main/java/com/jgyapp/market/receiver/BootReceiver.java b/app/src/main/java/com/jgyapp/market/receiver/BootReceiver.java new file mode 100644 index 0000000..73cae3d --- /dev/null +++ b/app/src/main/java/com/jgyapp/market/receiver/BootReceiver.java @@ -0,0 +1,37 @@ +package com.jgyapp.market.receiver; + +import android.content.BroadcastReceiver; +import android.content.ComponentName; +import android.content.Context; +import android.content.Intent; +import android.util.Log; + +import com.jgyapp.market.service.GuardService; +import com.jgyapp.market.service.InitJpushServer; +import com.jgyapp.market.service.StepService; +import com.jgyapp.market.utils.LogUtils; + +public class BootReceiver extends BroadcastReceiver { + public static final String BOOT_COMPLETED = "zuoyeos.action.BOOT_COMPLETED"; + + @Override + public void onReceive(Context context, Intent intent) { + String action = intent.getAction(); + Log.e("StoreBootReceiver", action); + switch (action) { + default: + break; + case Intent.ACTION_BOOT_COMPLETED: + case BOOT_COMPLETED: + context.startService(new Intent(context, InitJpushServer.class)); + context.startService(new Intent(context, StepService.class)); + context.startService(new Intent(context, GuardService.class)); + LogUtils.e("StoreBootReceiver", "booting BootReceiver"); + //启动设备信息 + Intent bootIntent = new Intent(BootReceiver.BOOT_COMPLETED); + bootIntent.setComponent(new ComponentName("com.info.sn", "com.info.sn.receiver.BootReceiver")); + context.sendBroadcast(bootIntent); + break; + } + } +} diff --git a/app/src/main/java/com/appstore/uiui/receiver/InstallResultReceiver.java b/app/src/main/java/com/jgyapp/market/receiver/InstallResultReceiver.java similarity index 96% rename from app/src/main/java/com/appstore/uiui/receiver/InstallResultReceiver.java rename to app/src/main/java/com/jgyapp/market/receiver/InstallResultReceiver.java index 7422a8c..7ef44f3 100644 --- a/app/src/main/java/com/appstore/uiui/receiver/InstallResultReceiver.java +++ b/app/src/main/java/com/jgyapp/market/receiver/InstallResultReceiver.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.receiver; +package com.jgyapp.market.receiver; import android.content.BroadcastReceiver; import android.content.Context; @@ -9,7 +9,7 @@ import android.util.Log; import androidx.annotation.RequiresApi; -import com.appstore.uiui.utils.ToastUtil; +import com.jgyapp.market.utils.ToastUtil; public class InstallResultReceiver extends BroadcastReceiver { diff --git a/app/src/main/java/com/jgyapp/market/receiver/NewAppReceiver.java b/app/src/main/java/com/jgyapp/market/receiver/NewAppReceiver.java new file mode 100644 index 0000000..6d49685 --- /dev/null +++ b/app/src/main/java/com/jgyapp/market/receiver/NewAppReceiver.java @@ -0,0 +1,103 @@ +package com.jgyapp.market.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 java.util.concurrent.TimeUnit; + +import io.reactivex.Observable; +import io.reactivex.ObservableEmitter; +import io.reactivex.Observer; +import io.reactivex.annotations.NonNull; +import io.reactivex.disposables.Disposable; + +public class NewAppReceiver extends BroadcastReceiver { + private static final String TAG = NewAppReceiver.class.getSimpleName(); + private static NewAppListener newAppListener; + @SuppressLint("StaticFieldLeak") + private static Context mContext; + + static { + sendAppInfo(); + } + + @Override + public void onReceive(Context context, Intent intent) { + mContext = context; + String action = intent.getAction(); + String state; + if (TextUtils.isEmpty(action)) { + Log.e(TAG, "onReceive: " + "action is empty "); + return; + } + String packageName = intent.getDataString().replace("package:", ""); + switch (action) { + case Intent.ACTION_PACKAGE_ADDED: + state = "安装了:"; + break; + case Intent.ACTION_PACKAGE_REPLACED: + state = "重装了:"; + break; + case Intent.ACTION_PACKAGE_REMOVED: + state = "卸载了:"; + break; + default: + state = "未知:"; + break; + } + Log.e(TAG, "sendAppInfo: " + state + packageName); + if ("com.info.sn".equals(packageName)) { + //启动设备信息 + Intent bootIntent = new Intent(BootReceiver.BOOT_COMPLETED); + bootIntent.setComponent(new ComponentName("com.info.sn", "com.info.sn.receiver.BootReceiver")); + context.sendBroadcast(bootIntent); + } else if ("com.uiuios.updatetools".equals(packageName)) { + //启动升级组件 + Intent bootIntent = new Intent(BootReceiver.BOOT_COMPLETED); + bootIntent.setComponent(new ComponentName("com.uiuios.updatetools", "com.uiuios.updatetools.receiver.BootReceiver")); + context.sendBroadcast(bootIntent); + } + newAppListener.setNewAppListener(packageName); + } + + + public interface NewAppListener { + void setNewAppListener(String packageName); + } + + private static void sendAppInfo() { + Observable.create((ObservableEmitter emitter) -> { + newAppListener = (String packageName) -> { + emitter.onNext(packageName); + }; + }) + .throttleLast(5, TimeUnit.SECONDS) + //这句很关键,这是RxJava中的操作符,在规定时间内观察者不在接收被观察者发送的事件 + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { + + } + + @Override + public void onNext(@NonNull String s) { + Log.e(TAG, "sendAppInfo: onNext: " + s); + } + + @Override + public void onError(@NonNull Throwable e) { + + } + + @Override + public void onComplete() { + Log.e(TAG, "onComplete: "); + } + }); + } +} diff --git a/app/src/main/java/com/appstore/uiui/service/GuardService.java b/app/src/main/java/com/jgyapp/market/service/GuardService.java similarity index 52% rename from app/src/main/java/com/appstore/uiui/service/GuardService.java rename to app/src/main/java/com/jgyapp/market/service/GuardService.java index c25f9cc..9acc1d7 100644 --- a/app/src/main/java/com/appstore/uiui/service/GuardService.java +++ b/app/src/main/java/com/jgyapp/market/service/GuardService.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.service; +package com.jgyapp.market.service; /** * 作者 mjsheng @@ -11,29 +11,24 @@ import android.app.Service; import android.content.ComponentName; import android.content.Context; import android.content.Intent; +import android.content.IntentFilter; import android.content.ServiceConnection; -import android.content.pm.PackageInfo; -import android.content.pm.PackageManager; -import android.os.Handler; import android.os.IBinder; -import android.os.Message; -import android.provider.Settings; import android.util.Log; -import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.appstore.uiui.KeepAliveConnection; -import com.appstore.uiui.bean.BaseResponse; -import com.appstore.uiui.network.NetInterfaceManager; -import com.appstore.uiui.network.api.DownloadApp; -import com.appstore.uiui.utils.ApkUtils; -import com.appstore.uiui.utils.LogUtils; -import com.appstore.uiui.utils.SPUtils; -import com.appstore.uiui.utils.ServiceAliveUtils; -import com.appstore.uiui.utils.Utils; +import com.jgyapp.market.KeepAliveConnection; +import com.jgyapp.market.bean.BaseResponse; +import com.jgyapp.market.network.NetInterfaceManager; +import com.jgyapp.market.receiver.NewAppReceiver; +import com.jgyapp.market.utils.ApkUtils; +import com.jgyapp.market.utils.LogUtils; +import com.jgyapp.market.utils.SPUtils; +import com.jgyapp.market.utils.ServiceAliveUtils; +import com.jgyapp.market.utils.Utils; import com.arialyy.annotations.Download; import com.arialyy.aria.core.Aria; import com.arialyy.aria.core.task.DownloadTask; @@ -82,87 +77,44 @@ public class GuardService extends Service { }; } + @Override + public void onCreate() { + super.onCreate(); + registerNewAppReceiver(); + } + + private NewAppReceiver mNewAppReceiver; + + private void registerNewAppReceiver() { + if (mNewAppReceiver == null) { + mNewAppReceiver = new NewAppReceiver(); + IntentFilter filter = new IntentFilter(); + filter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY); + filter.addAction(Intent.ACTION_PACKAGE_ADDED); + filter.addAction(Intent.ACTION_PACKAGE_REPLACED); + filter.addAction(Intent.ACTION_PACKAGE_REMOVED); + filter.addDataScheme("package"); + registerReceiver(mNewAppReceiver, filter); + } + } + + @Override + public void onDestroy() { + super.onDestroy(); + if (mNewAppReceiver != null) { + unregisterReceiver(mNewAppReceiver); + } + } + @Override public int onStartCommand(Intent intent, int flags, int startId) { - - Aria.init(this); Aria.get(this).getDownloadConfig().setMaxTaskNum(1); Aria.download(this).register(); -// OKGO.getAllAppPackageName(handler); - CheckUpdateBySNinfo(); - // startForeground(1, new Notification()); - // 绑定建立链接 bindService(new Intent(this, StepService.class), mServiceConnection, Context.BIND_IMPORTANT); return START_STICKY; } - synchronized private void CheckUpdateBySNinfo() { - //检测设备信息的更新 - PackageManager pm = getPackageManager(); - PackageInfo packageInfo = null; - try { - packageInfo = pm.getPackageInfo("com.info.sn", 0); - } catch (PackageManager.NameNotFoundException e) { - e.printStackTrace(); - } - if (null != packageInfo) { -// OKGO.checkUpdateByPackage(handler, packageInfo.packageName, String.valueOf(packageInfo.versionCode)); - } else { -// OKGO.checkUpdateByPackage(handler, "com.info.sn", "0"); - } - } - - private Handler handler = new Handler() { - @Override - public void handleMessage(@NonNull Message msg) { - super.handleMessage(msg); - switch (msg.what) { - case 200: - String url = (String) msg.obj; -// getFile(url); - break; - case 201: - String apppackage = (String) msg.obj; - Log.e("fht", Settings.System.getString(getContentResolver(), "qch_app_forbid") + "?"); - if (Settings.System.putString(getContentResolver(), "qch_app_forbid", apppackage + "com.info.sn,com.android.uiuios,com.appstore.uiui,com.uiuios.updatetools")) { - Log.e("fht", "app package write successful"); - } - break; - case 202: - break; - } - } - }; - -// private void getFile(String url) { -// OkGo.get(url) -// .execute(new FileCallback() { -// @Override -// public void onSuccess(final Response response) { -//// Settings.System.putString(getApplicationContext().getContentResolver(), "qch_app_forbid", "com.baidu.video"); -// new Thread(new Runnable() { -// @Override -// public void run() { -// ApkUtils.installApp(GuardService.this, response.body().getAbsolutePath()); -// } -// }).start(); -// LogUtils.e("getFile", "download file successful,now installing"); -// } -// -// @Override -// public void onError(Response response) { -// super.onError(response); -// LogUtils.e("getFile", "File download Failure"); -// } -// -// @Override -// public void downloadProgress(Progress progress) { -// super.downloadProgress(progress); -// LogUtils.e("getFile", "已下载:" + progress.currentSize + ",总大小:" + progress.totalSize + ",进度:" + progress.fraction + ",当前网速:" + progress.speed); -// } -// }); -// } //在这里处理任务执行中的状态,如进度进度条的刷新 @Download.onTaskRunning @@ -210,12 +162,7 @@ public class GuardService extends Service { }); } - new Thread(new Runnable() { - @Override - public void run() { - ApkUtils.installApp(GuardService.this, downloadPath); - } - }).start(); + new Thread(() -> ApkUtils.installApp(GuardService.this, downloadPath)).start(); } } diff --git a/app/src/main/java/com/appstore/uiui/service/InitJpushServer.java b/app/src/main/java/com/jgyapp/market/service/InitJpushServer.java similarity index 89% rename from app/src/main/java/com/appstore/uiui/service/InitJpushServer.java rename to app/src/main/java/com/jgyapp/market/service/InitJpushServer.java index 4f549ca..b000a28 100644 --- a/app/src/main/java/com/appstore/uiui/service/InitJpushServer.java +++ b/app/src/main/java/com/jgyapp/market/service/InitJpushServer.java @@ -1,12 +1,12 @@ -package com.appstore.uiui.service; +package com.jgyapp.market.service; import android.app.Service; import android.content.Intent; import android.os.Environment; import android.os.IBinder; -import com.appstore.uiui.KeepAliveConnection; -import com.appstore.uiui.network.HTTPInterface; +import com.jgyapp.market.KeepAliveConnection; +import com.jgyapp.market.network.HTTPInterface; import java.io.File; diff --git a/app/src/main/java/com/appstore/uiui/service/MyDownloadService.java b/app/src/main/java/com/jgyapp/market/service/MyDownloadService.java similarity index 96% rename from app/src/main/java/com/appstore/uiui/service/MyDownloadService.java rename to app/src/main/java/com/jgyapp/market/service/MyDownloadService.java index 44f6387..5b71062 100644 --- a/app/src/main/java/com/appstore/uiui/service/MyDownloadService.java +++ b/app/src/main/java/com/jgyapp/market/service/MyDownloadService.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.service; +package com.jgyapp.market.service; import android.app.Service; import android.content.Intent; diff --git a/app/src/main/java/com/appstore/uiui/service/StepService.java b/app/src/main/java/com/jgyapp/market/service/StepService.java similarity index 91% rename from app/src/main/java/com/appstore/uiui/service/StepService.java rename to app/src/main/java/com/jgyapp/market/service/StepService.java index 06c2ec5..759ecef 100644 --- a/app/src/main/java/com/appstore/uiui/service/StepService.java +++ b/app/src/main/java/com/jgyapp/market/service/StepService.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.service; +package com.jgyapp.market.service; /** * 作者 mjsheng @@ -16,9 +16,9 @@ import android.os.IBinder; import androidx.annotation.Nullable; -import com.appstore.uiui.KeepAliveConnection; -import com.appstore.uiui.utils.LogUtils; -import com.appstore.uiui.utils.ServiceAliveUtils; +import com.jgyapp.market.KeepAliveConnection; +import com.jgyapp.market.utils.LogUtils; +import com.jgyapp.market.utils.ServiceAliveUtils; /** * 主进程 双进程通讯 diff --git a/app/src/main/java/com/appstore/uiui/utils/ApkUtils.java b/app/src/main/java/com/jgyapp/market/utils/ApkUtils.java similarity index 99% rename from app/src/main/java/com/appstore/uiui/utils/ApkUtils.java rename to app/src/main/java/com/jgyapp/market/utils/ApkUtils.java index dba57cd..b946df5 100644 --- a/app/src/main/java/com/appstore/uiui/utils/ApkUtils.java +++ b/app/src/main/java/com/jgyapp/market/utils/ApkUtils.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.utils; +package com.jgyapp.market.utils; import android.app.PendingIntent; import android.content.Context; @@ -17,9 +17,9 @@ import android.widget.Toast; import androidx.annotation.RequiresApi; import androidx.core.content.FileProvider; -import com.appstore.uiui.BuildConfig; -import com.appstore.uiui.R; -import com.appstore.uiui.receiver.InstallResultReceiver; +import com.jgyapp.market.BuildConfig; +import com.jgyapp.market.R; +import com.jgyapp.market.receiver.InstallResultReceiver; import java.io.BufferedReader; import java.io.DataOutputStream; @@ -98,7 +98,7 @@ public class ApkUtils { if (Build.VERSION.SDK_INT >= 24) { //判读版本是否在7.0以上 //参数1 上下文, 参数2 Provider主机地址 和配置文件中保持一致 参数3 共享的文件 Uri apkUri = - FileProvider.getUriForFile(context, "com.appstore.uiui.fileprovider", uriFile); + FileProvider.getUriForFile(context, "com.jgyapp.market.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/appstore/uiui/utils/FileUtils.java b/app/src/main/java/com/jgyapp/market/utils/FileUtils.java similarity index 98% rename from app/src/main/java/com/appstore/uiui/utils/FileUtils.java rename to app/src/main/java/com/jgyapp/market/utils/FileUtils.java index 14c2c73..c7c7dc2 100644 --- a/app/src/main/java/com/appstore/uiui/utils/FileUtils.java +++ b/app/src/main/java/com/jgyapp/market/utils/FileUtils.java @@ -1,10 +1,10 @@ -package com.appstore.uiui.utils; +package com.jgyapp.market.utils; import android.content.Context; import android.util.Log; import com.alibaba.fastjson.JSONObject; -import com.appstore.uiui.base.FilePath; +import com.jgyapp.market.base.FilePath; import com.arialyy.aria.core.Aria; import java.io.File; diff --git a/app/src/main/java/com/appstore/uiui/utils/JGYUtils.java b/app/src/main/java/com/jgyapp/market/utils/JGYUtils.java similarity index 99% rename from app/src/main/java/com/appstore/uiui/utils/JGYUtils.java rename to app/src/main/java/com/jgyapp/market/utils/JGYUtils.java index 93e57f5..8470079 100644 --- a/app/src/main/java/com/appstore/uiui/utils/JGYUtils.java +++ b/app/src/main/java/com/jgyapp/market/utils/JGYUtils.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.utils; +package com.jgyapp.market.utils; import android.annotation.SuppressLint; import android.content.Context; @@ -15,7 +15,7 @@ import android.provider.Settings; import android.text.TextUtils; import android.util.Log; -import com.appstore.uiui.BuildConfig; +import com.jgyapp.market.BuildConfig; import java.lang.reflect.Constructor; import java.lang.reflect.Field; diff --git a/app/src/main/java/com/appstore/uiui/utils/LogUtils.java b/app/src/main/java/com/jgyapp/market/utils/LogUtils.java similarity index 90% rename from app/src/main/java/com/appstore/uiui/utils/LogUtils.java rename to app/src/main/java/com/jgyapp/market/utils/LogUtils.java index 04ea495..6d7c014 100644 --- a/app/src/main/java/com/appstore/uiui/utils/LogUtils.java +++ b/app/src/main/java/com/jgyapp/market/utils/LogUtils.java @@ -1,8 +1,8 @@ -package com.appstore.uiui.utils; +package com.jgyapp.market.utils; import android.util.Log; -import com.appstore.uiui.BuildConfig; +import com.jgyapp.market.BuildConfig; public class LogUtils { public static void v(String tag, String msg) { diff --git a/app/src/main/java/com/appstore/uiui/utils/SPUtils.java b/app/src/main/java/com/jgyapp/market/utils/SPUtils.java similarity index 98% rename from app/src/main/java/com/appstore/uiui/utils/SPUtils.java rename to app/src/main/java/com/jgyapp/market/utils/SPUtils.java index 015d23f..c09a2c4 100644 --- a/app/src/main/java/com/appstore/uiui/utils/SPUtils.java +++ b/app/src/main/java/com/jgyapp/market/utils/SPUtils.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.utils; +package com.jgyapp.market.utils; import android.content.Context; import android.content.SharedPreferences; @@ -9,7 +9,7 @@ import android.util.Base64; import android.widget.ImageView; -import com.appstore.uiui.common.CommonDatas; +import com.jgyapp.market.common.CommonDatas; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/app/src/main/java/com/appstore/uiui/utils/ServiceAliveUtils.java b/app/src/main/java/com/jgyapp/market/utils/ServiceAliveUtils.java similarity index 90% rename from app/src/main/java/com/appstore/uiui/utils/ServiceAliveUtils.java rename to app/src/main/java/com/jgyapp/market/utils/ServiceAliveUtils.java index 4819ac9..cc7e473 100644 --- a/app/src/main/java/com/appstore/uiui/utils/ServiceAliveUtils.java +++ b/app/src/main/java/com/jgyapp/market/utils/ServiceAliveUtils.java @@ -1,9 +1,9 @@ -package com.appstore.uiui.utils; +package com.jgyapp.market.utils; import android.app.ActivityManager; import android.content.Context; -import com.appstore.uiui.base.BaseApplication; +import com.jgyapp.market.base.BaseApplication; public class ServiceAliveUtils { diff --git a/app/src/main/java/com/appstore/uiui/utils/StatusBarUtil.java b/app/src/main/java/com/jgyapp/market/utils/StatusBarUtil.java similarity index 99% rename from app/src/main/java/com/appstore/uiui/utils/StatusBarUtil.java rename to app/src/main/java/com/jgyapp/market/utils/StatusBarUtil.java index 6574e80..79b00c1 100644 --- a/app/src/main/java/com/appstore/uiui/utils/StatusBarUtil.java +++ b/app/src/main/java/com/jgyapp/market/utils/StatusBarUtil.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.utils; +package com.jgyapp.market.utils; import android.app.Activity; import android.content.Context; diff --git a/app/src/main/java/com/appstore/uiui/utils/StorageUtils.java b/app/src/main/java/com/jgyapp/market/utils/StorageUtils.java similarity index 99% rename from app/src/main/java/com/appstore/uiui/utils/StorageUtils.java rename to app/src/main/java/com/jgyapp/market/utils/StorageUtils.java index 0e9c820..7b933ba 100644 --- a/app/src/main/java/com/appstore/uiui/utils/StorageUtils.java +++ b/app/src/main/java/com/jgyapp/market/utils/StorageUtils.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.utils; +package com.jgyapp.market.utils; import android.content.Context; import android.os.Build; diff --git a/app/src/main/java/com/appstore/uiui/utils/ToastUtil.java b/app/src/main/java/com/jgyapp/market/utils/ToastUtil.java similarity index 95% rename from app/src/main/java/com/appstore/uiui/utils/ToastUtil.java rename to app/src/main/java/com/jgyapp/market/utils/ToastUtil.java index 2da114f..6f93f16 100644 --- a/app/src/main/java/com/appstore/uiui/utils/ToastUtil.java +++ b/app/src/main/java/com/jgyapp/market/utils/ToastUtil.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.utils; +package com.jgyapp.market.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.appstore.uiui.BuildConfig; +import com.jgyapp.market.BuildConfig; /** * Created by haoge on 2017/3/2. diff --git a/app/src/main/java/com/appstore/uiui/utils/Utils.java b/app/src/main/java/com/jgyapp/market/utils/Utils.java similarity index 99% rename from app/src/main/java/com/appstore/uiui/utils/Utils.java rename to app/src/main/java/com/jgyapp/market/utils/Utils.java index fb4ba28..70e4436 100644 --- a/app/src/main/java/com/appstore/uiui/utils/Utils.java +++ b/app/src/main/java/com/jgyapp/market/utils/Utils.java @@ -1,4 +1,4 @@ -package com.appstore.uiui.utils; +package com.jgyapp.market.utils; import android.annotation.SuppressLint; import android.app.admin.DevicePolicyManager; @@ -33,11 +33,8 @@ import android.view.inputmethod.InputMethodManager; import android.widget.EditText; import android.widget.Toast; -import com.alibaba.fastjson.JSONObject; -import com.appstore.uiui.R; -import com.arialyy.aria.core.Aria; +import com.jgyapp.market.R; -import java.io.File; import java.io.FileReader; import java.io.InputStreamReader; import java.io.LineNumberReader; diff --git a/app/src/main/java/com/appstore/uiui/view/CornerImageView.kt b/app/src/main/java/com/jgyapp/market/view/CornerImageView.kt similarity index 95% rename from app/src/main/java/com/appstore/uiui/view/CornerImageView.kt rename to app/src/main/java/com/jgyapp/market/view/CornerImageView.kt index 9e32d7a..9ed3041 100644 --- a/app/src/main/java/com/appstore/uiui/view/CornerImageView.kt +++ b/app/src/main/java/com/jgyapp/market/view/CornerImageView.kt @@ -1,4 +1,4 @@ -package com.appstore.uiui.view +package com.jgyapp.market.view import android.content.Context import android.os.Build diff --git a/app/src/main/java/com/appstore/uiui/view/NumberProgressBar.java b/app/src/main/java/com/jgyapp/market/view/NumberProgressBar.java similarity index 99% rename from app/src/main/java/com/appstore/uiui/view/NumberProgressBar.java rename to app/src/main/java/com/jgyapp/market/view/NumberProgressBar.java index 9db734e..a13b32a 100644 --- a/app/src/main/java/com/appstore/uiui/view/NumberProgressBar.java +++ b/app/src/main/java/com/jgyapp/market/view/NumberProgressBar.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.appstore.uiui.view; +package com.jgyapp.market.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.appstore.uiui.R; +import com.jgyapp.market.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 bc72658..ad39740 100644 --- a/app/src/main/res/layout-land/item_download_manager.xml +++ b/app/src/main/res/layout-land/item_download_manager.xml @@ -42,7 +42,7 @@ android:text="APP" android:textStyle="bold" /> - - + - - - + - Testing documentation + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 4cb5cce..4f274fb 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ include ':app' -rootProject.name='应用市场' +rootProject.name='作业平板应用市场'