diff --git a/app/build.gradle b/app/build.gradle index 56adf49..55d3c01 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' def appName() { - return "CubeZYAppStore" + return "KuxinAppStore" } def releaseTime() { - return new Date().format("yyyyMMdd-HHmmss", TimeZone.getDefault()) + return new Date().format("yyyyMMdd_HHmmss", TimeZone.getDefault()) } android { @@ -17,8 +17,8 @@ android { minSdkVersion 26 targetSdkVersion 29 - versionCode 1 - versionName "1.0.0" + versionCode 2 + versionName "1.0.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -40,65 +40,6 @@ android { //签名 signingConfigs { - MTK { - storeFile file("keystore/TeclastMTK12.jks") - storePassword "123456" - keyAlias "TeclastMTK12" - keyPassword "123456" - v2SigningEnabled false - } - - mtk12 { - storeFile file("keystore/mtkAndroid12.keystore") - storePassword "123456" - keyAlias "mtk12" - keyPassword "123456" - v2SigningEnabled false - } - - cube8183 { - storeFile file("keystore/TeclastMTK12.jks") - storePassword "123456" - keyAlias "TeclastMTK12" - keyPassword "123456" - v2SigningEnabled false - } - - teclast8183 { - storeFile file("keystore/TeclastMTK12.jks") - storePassword "123456" - keyAlias "TeclastMTK12" - keyPassword "123456" - v2SigningEnabled false - } - - Teclast8515 { - storeFile file("keystore/Teclast8515.keystore") - storePassword "123456" - keyAlias "Teclast8515" - keyPassword "123456" - v1SigningEnabled true - v2SigningEnabled true - } - - iPlay50SE { - storeFile file("keystore/iPlay50SE.keystore") - storePassword "123456" - keyAlias "iplay50se" - keyPassword "123456" - v1SigningEnabled true - v2SigningEnabled true - } - - zhanRui { - storeFile file("keystore/zhanxun.keystore") - storePassword "123456" - keyAlias "zhanxun" - keyPassword "123456" - v1SigningEnabled true - v2SigningEnabled false - } - //iPlay50 mini,iPlay50 android13 共用签名 iPlay50mini { storeFile file("keystore/iPlay50Mini.keystore") @@ -108,19 +49,11 @@ android { v2SigningEnabled false } - iPlay50miniPro { - storeFile file("keystore/iPlay50miniPro.jks") + iPlay50SE { + storeFile file("keystore/iPlay50SE.keystore") storePassword "123456" - keyAlias "iplay50minipro" + keyAlias "iplay50se" keyPassword "123456" - v2SigningEnabled false - } - - iPlay40H { - storeFile file("keystore/iPlay40h.keystore") - storePassword "android" - keyAlias "platform" - keyPassword "android" v1SigningEnabled true v2SigningEnabled true } @@ -133,10 +66,44 @@ android { v2SigningEnabled false } - iPlay50P { - storeFile file("keystore/iPlay50P.jks") + U807UserDebug { + storeFile file("keystore/U807userdebug.keystore") storePassword "123456" - keyAlias "iplay50p" + keyAlias "u807userdebug" + keyPassword "123456" + v2SigningEnabled false + } + + G10P { + storeFile file("keystore/G10PMTK11.jks") + storePassword "123456" + keyAlias "G10PMTK11" + keyPassword "123456" + v1SigningEnabled true + v2SigningEnabled true + } + + teclast8183 { + storeFile file("keystore/TeclastMTK12.jks") + storePassword "123456" + keyAlias "TeclastMTK12" + keyPassword "123456" + v2SigningEnabled false + } + + UnisocS6688 { + storeFile file("keystore/UnisocS6688.jks") + storePassword "123456" + keyAlias "unisocs6688userdebug" + keyPassword "123456" + v1SigningEnabled true + v2SigningEnabled true + } + + Aigo1071 { + storeFile file("keystore/Aigo1071.jks") + storePassword "123456" + keyAlias "aigo1071" keyPassword "123456" v1SigningEnabled true v2SigningEnabled true @@ -144,18 +111,69 @@ android { } buildTypes { - iPlay50PDebug.initWith(debug) - iPlay50PDebug { - buildConfigField "String", "platform", '"T1102"' + Aigo1071Debug.initWith(debug) + Aigo1071Debug { versionNameSuffix "-debug" debuggable true - signingConfig signingConfigs.iPlay50P + signingConfig signingConfigs.Aigo1071 + buildConfigField "String", "platform", '"W8183"' } - iPlay50PRelease.initWith(release) - iPlay50PRelease { - buildConfigField "String", "platform", '"T1102"' - signingConfig signingConfigs.iPlay50P + Aigo1071Release.initWith(release) + Aigo1071Release { + signingConfig signingConfigs.Aigo1071 + buildConfigField "String", "platform", '"W8183"' + } + + UnisocS6688Debug.initWith(debug) + UnisocS6688Debug { + versionNameSuffix "-debug" + debuggable true + signingConfig signingConfigs.UnisocS6688 + buildConfigField "String", "platform", '"S6688"' + } + + UnisocS6688Release.initWith(release) + UnisocS6688Release { + signingConfig signingConfigs.UnisocS6688 + buildConfigField "String", "platform", '"S6688"' + } + + + teclast8183Debug.initWith(debug) + teclast8183Debug { + versionNameSuffix "-debug" + debuggable true + signingConfig signingConfigs.teclast8183 + buildConfigField "String", "platform", '"A11MTK8183"' + } + + teclast8183Release.initWith(release) + teclast8183Release { + signingConfig signingConfigs.teclast8183 + buildConfigField "String", "platform", '"A11MTK8183"' + } + + G10PDebug.initWith(debug) + G10PDebug { + versionNameSuffix "-debug" + debuggable true + signingConfig signingConfigs.G10P + buildConfigField "String", "platform", '"G10P"' + } + + G10PRelease.initWith(release) + G10PRelease { + signingConfig signingConfigs.G10P + buildConfigField "String", "platform", '"G10P"' + } + + U807UserDebug.initWith(release) + U807UserDebug { + buildConfigField "String", "platform", '"U807"' +// versionNameSuffix "-debug" +// debuggable true + signingConfig signingConfigs.U807UserDebug } U807Debug.initWith(debug) @@ -172,65 +190,9 @@ android { signingConfig signingConfigs.U807 } - Cube8183Debug.initWith(debug) - Cube8183Debug { - debuggable true - versionNameSuffix "-debug" - buildConfigField "String", "platform", '"cube8183"' - signingConfig signingConfigs.cube8183 - } - - Cube8183Release.initWith(release) - Cube8183Release { - buildConfigField "String", "platform", '"cube8183"' - signingConfig signingConfigs.cube8183 - } - - Teclast8183Debug.initWith(debug) - Teclast8183Debug { - debuggable true - versionNameSuffix "-debug" - buildConfigField "String", "platform", '"teclast8183"' - signingConfig signingConfigs.teclast8183 - } - - Teclast8183Release.initWith(release) - Teclast8183Release { - buildConfigField "String", "platform", '"teclast8183"' - signingConfig signingConfigs.teclast8183 - } - - Teclast8515Debug.initWith(debug) - Teclast8515Debug { - buildConfigField "String", "platform", '"8515"' - versionNameSuffix "-debug" - debuggable true - signingConfig signingConfigs.Teclast8515 - } - - Teclast8515Release.initWith(release) - Teclast8515Release { - buildConfigField "String", "platform", '"8515"' - signingConfig signingConfigs.Teclast8515 - } - - iPlay50ProDebug.initWith(debug) - iPlay50ProDebug { - buildConfigField "String", "platform", '"MTK"' - versionNameSuffix "-debug" - debuggable true - signingConfig signingConfigs.mtk12 - } - - iPlay50ProRelease.initWith(release) - iPlay50ProRelease { - buildConfigField "String", "platform", '"MTK"' - signingConfig signingConfigs.mtk12 - } - iPlay50SEDebug.initWith(debug) iPlay50SEDebug { - buildConfigField "String", "platform", '"ipaly50SE"' + buildConfigField "String", "platform", '"iPaly50SE"' versionNameSuffix "-debug" debuggable true signingConfig signingConfigs.iPlay50SE @@ -238,87 +200,16 @@ android { iPlay50SERelease.initWith(release) iPlay50SERelease { - buildConfigField "String", "platform", '"ipaly50SE"' + buildConfigField "String", "platform", '"iPaly50SE"' signingConfig signingConfigs.iPlay50SE } - iPlay50miniDebug.initWith(debug) - iPlay50miniDebug { - buildConfigField "String", "platform", '"T811"' - versionNameSuffix "-debug" - debuggable true - signingConfig signingConfigs.iPlay50mini - } - - iPlay50miniRelease.initWith(release) - iPlay50miniRelease { - buildConfigField "String", "platform", '"T811"' - signingConfig signingConfigs.iPlay50mini - } - - iPlay5013Debug.initWith(debug) - iPlay5013Debug { - buildConfigField "String", "platform", '"iplay5013"' - versionNameSuffix "-debug" - debuggable true - signingConfig signingConfigs.iPlay50mini - } - - iPlay5013Release.initWith(release) - iPlay5013Release { - buildConfigField "String", "platform", '"iplay5013"' - signingConfig signingConfigs.iPlay50mini - } - - iPlay50miniProDebug.initWith(debug) - iPlay50miniProDebug { - buildConfigField "String", "platform", '"miniG99"' - versionNameSuffix "-debug" - debuggable true - signingConfig signingConfigs.iPlay50miniPro - } - - iPlay50miniProRelease.initWith(release) - iPlay50miniProRelease { - buildConfigField "String", "platform", '"miniG99"' - signingConfig signingConfigs.iPlay50miniPro - } - - iPlay40HDebug.initWith(debug) - iPlay40HDebug { - buildConfigField "String", "platform", '"iplay40h"' - versionNameSuffix "-debug" - debuggable true - signingConfig signingConfigs.iPlay50mini - } - - iPlay40HRelease.initWith(release) - iPlay40HRelease { - buildConfigField "String", "platform", '"iplay40h"' - signingConfig signingConfigs.iPlay50mini - } - - zhanRuiDebug.initWith(debug) - zhanRuiDebug { - debuggable true - versionNameSuffix "-debug" - buildConfigField "String", "platform", '"展锐"' - signingConfig signingConfigs.zhanRui - } - - zhanRuiRelease.initWith(release) - zhanRuiRelease { - buildConfigField "String", "platform", '"展锐"' - signingConfig signingConfigs.zhanRui - } - debug { - buildConfigField "String", "platform", '"MTK"' versionNameSuffix "-debug" minifyEnabled false //Zipalign优化 zipAlignEnabled true - signingConfig signingConfigs.MTK + signingConfig signingConfigs.iPlay50mini applicationVariants.all { variant -> variant.outputs.each { output -> if (outputFile != null) { @@ -329,7 +220,6 @@ android { } } release { - buildConfigField "String", "platform", '"MTK"' //混淆 minifyEnabled false //Zipalign优化 @@ -337,7 +227,7 @@ android { //前一部分代表系统默认的android程序的混淆文件，该文件已经包含了基本的混淆声明，后一个文件是自己的定义混淆文件 proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' //签名 - signingConfig signingConfigs.MTK + signingConfig signingConfigs.iPlay50mini // 将release版本的包名重命名，加上版本及日期 applicationVariants.all { variant -> variant.outputs.each { output -> @@ -352,30 +242,15 @@ android { } sourceSets { - iPlay50PDebug { manifest.srcFile 'src/debug/AndroidManifest.xml' } + G10PDebug { manifest.srcFile 'src/debug/AndroidManifest.xml' } U807Debug { manifest.srcFile 'src/debug/AndroidManifest.xml' } - Cube8183Debug { manifest.srcFile 'src/debug/AndroidManifest.xml' } - Teclast8183Debug { manifest.srcFile 'src/debug/AndroidManifest.xml' } - Teclast8515Debug { manifest.srcFile 'src/debug/AndroidManifest.xml' } - iPlay50ProDebug { manifest.srcFile 'src/debug/AndroidManifest.xml' } - iPlay50SEDebug { manifest.srcFile 'src/debug/AndroidManifest.xml' } - iPlay50miniDebug { manifest.srcFile 'src/debug/AndroidManifest.xml' } - iPlay5013Debug { manifest.srcFile 'src/debug/AndroidManifest.xml' } - iPlay50miniProDebug { manifest.srcFile 'src/debug/AndroidManifest.xml' } - zhanRuiDebug { manifest.srcFile 'src/debug/AndroidManifest.xml' } + U807Debug { manifest.srcFile 'src/debug/AndroidManifest.xml' } + U807UserDebug { manifest.srcFile 'src/debug/AndroidManifest.xml' } debug { manifest.srcFile 'src/debug/AndroidManifest.xml' } - iPlay50PRelease { manifest.srcFile 'src/main/AndroidManifest.xml' } + G10PRelease { manifest.srcFile 'src/main/AndroidManifest.xml' } U807Release { manifest.srcFile 'src/main/AndroidManifest.xml' } - Cube8183Release { manifest.srcFile 'src/main/AndroidManifest.xml' } - Teclast8183Release { manifest.srcFile 'src/main/AndroidManifest.xml' } - Teclast8515Release { manifest.srcFile 'src/main/AndroidManifest.xml' } - iPlay50ProRelease { manifest.srcFile 'src/main/AndroidManifest.xml' } iPlay50SERelease { manifest.srcFile 'src/main/AndroidManifest.xml' } - iPlay50miniRelease { manifest.srcFile 'src/main/AndroidManifest.xml' } - iPlay5013Release { manifest.srcFile 'src/main/AndroidManifest.xml' } - iPlay50miniProRelease { manifest.srcFile 'src/main/AndroidManifest.xml' } - zhanRuiRelease { manifest.srcFile 'src/main/AndroidManifest.xml' } release { manifest.srcFile 'src/main/AndroidManifest.xml' } } } diff --git a/app/keystore/Aigo1071.jks b/app/keystore/Aigo1071.jks new file mode 100644 index 0000000..c32bd7a Binary files /dev/null and b/app/keystore/Aigo1071.jks differ diff --git a/app/keystore/G10PMTK11.jks b/app/keystore/G10PMTK11.jks new file mode 100644 index 0000000..324fa31 Binary files /dev/null and b/app/keystore/G10PMTK11.jks differ diff --git a/app/keystore/Teclast8515.keystore b/app/keystore/Teclast8515.keystore deleted file mode 100644 index 922a161..0000000 Binary files a/app/keystore/Teclast8515.keystore and /dev/null differ diff --git a/app/keystore/U807userdebug.keystore b/app/keystore/U807userdebug.keystore new file mode 100644 index 0000000..af7ecd8 Binary files /dev/null and b/app/keystore/U807userdebug.keystore differ diff --git a/app/keystore/UnisocS6688Userdebug.jks b/app/keystore/UnisocS6688Userdebug.jks new file mode 100644 index 0000000..07f2a13 Binary files /dev/null and b/app/keystore/UnisocS6688Userdebug.jks differ diff --git a/app/keystore/iPlay40h.keystore b/app/keystore/iPlay40h.keystore deleted file mode 100644 index 5961980..0000000 Binary files a/app/keystore/iPlay40h.keystore and /dev/null differ diff --git a/app/keystore/iPlay50P.jks b/app/keystore/iPlay50P.jks deleted file mode 100644 index 496ef8d..0000000 Binary files a/app/keystore/iPlay50P.jks and /dev/null differ diff --git a/app/keystore/iPlay50miniPro.jks b/app/keystore/iPlay50miniPro.jks deleted file mode 100644 index e5aeab8..0000000 Binary files a/app/keystore/iPlay50miniPro.jks and /dev/null differ diff --git a/app/keystore/mtkAndroid12.keystore b/app/keystore/mtkAndroid12.keystore deleted file mode 100644 index 860f30f..0000000 Binary files a/app/keystore/mtkAndroid12.keystore and /dev/null differ diff --git a/app/keystore/zhanxun.keystore b/app/keystore/zhanxun.keystore deleted file mode 100644 index 7c46fbc..0000000 Binary files a/app/keystore/zhanxun.keystore and /dev/null differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index dad8560..bbd6550 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -41,9 +41,9 @@ android:exported="true"> - + - + list = info.getApp_preview(); mImageAdapter.setData(list); } @Override public void setAdminAppDetails(AdminAppInfo adminAppInfo) { - tv_name.setText(mAdminAppInfo.getApp_name()); - tv_company.setText(mAdminAppInfo.getApp_developer()); - detali_tv_size.setText("大小\t" + "(" + StorageUtils.byteToMB(mAdminAppInfo.getApp_size()) + ")"); - detail_tv_Developers.setText("开发者\t" + mAdminAppInfo.getApp_developer()); - tv_update_time.setText("时间\t" + mAdminAppInfo.getUpdate_time()); - tv_version.setText("版本\t" + mAdminAppInfo.getApp_version_name()); - tv_content.setText(mAdminAppInfo.getApp_remarks()); - detali_tv_version.setText("版本:" + mAdminAppInfo.getApp_version_name()); - rating_bar.setRating(mAdminAppInfo.getApp_score()); - Glide.with(this).asBitmap().load(mAdminAppInfo.getApp_icon()).transform(new GlideCircleWithBorder(this)).into(iv_icon); - setImage(mAdminAppInfo); + if (adminAppInfo != null) { + tv_name.setText(mAdminAppInfo.getApp_name()); + tv_company.setText(mAdminAppInfo.getApp_developer()); + detali_tv_size.setText("大小\t" + "(" + StorageUtils.byteToMB(mAdminAppInfo.getApp_size()) + ")"); + detail_tv_Developers.setText("开发者\t" + mAdminAppInfo.getApp_developer()); + tv_update_time.setText("时间\t" + mAdminAppInfo.getUpdate_time()); + tv_version.setText("版本\t" + mAdminAppInfo.getApp_version_name()); + tv_content.setText(mAdminAppInfo.getApp_remarks()); + detali_tv_version.setText("版本:" + mAdminAppInfo.getApp_version_name()); + rating_bar.setRating(mAdminAppInfo.getApp_score()); + Glide.with(this).asBitmap().load(mAdminAppInfo.getApp_icon()).transform(new GlideCircleWithBorder(this)).into(iv_icon); + setImage(adminAppInfo); + } } void refresh(DownloadTask task) { diff --git a/app/src/main/java/com/uiuipad/appstore/activity/details/DetailsPresenter.java b/app/src/main/java/com/uiuipad/appstore/activity/details/DetailsPresenter.java index 49c3b4a..fe91b21 100644 --- a/app/src/main/java/com/uiuipad/appstore/activity/details/DetailsPresenter.java +++ b/app/src/main/java/com/uiuipad/appstore/activity/details/DetailsPresenter.java @@ -6,9 +6,12 @@ import android.util.Log; import com.trello.rxlifecycle4.RxLifecycle; import com.trello.rxlifecycle4.android.ActivityEvent; import com.uiuipad.appstore.base.BaseResponse; +import com.uiuipad.appstore.bean.AdminAppInfo; import com.uiuipad.appstore.bean.AppClassBean; import com.uiuipad.appstore.network.NetInterfaceManager; +import java.util.List; + import io.reactivex.rxjava3.annotations.NonNull; import io.reactivex.rxjava3.core.Observer; import io.reactivex.rxjava3.disposables.Disposable; @@ -48,16 +51,20 @@ public class DetailsPresenter implements DetailsContact.Presenter { public void getAdminAppDetails(long id) { NetInterfaceManager.getInstance().getAdminAppDetailsObservable(id) .compose(RxLifecycle.bindUntilEvent(lifecycle, ActivityEvent.DESTROY)) - .subscribe(new Observer>() { + .subscribe(new Observer>() { @Override public void onSubscribe(@NonNull Disposable d) { Log.e("getAdminAppDetails", "onSubscribe: "); } @Override - public void onNext(@NonNull BaseResponse appClassBeanBaseResponse) { - Log.e("getAdminAppDetails", "onNext: " + appClassBeanBaseResponse); - + public void onNext(@NonNull BaseResponse infoBaseResponse) { + Log.e("getAdminAppDetails", "onNext: " + infoBaseResponse); + if (infoBaseResponse.code == 200) { + mView.setAdminAppDetails(infoBaseResponse.data); + } else { + mView.setAdminAppDetails(null); + } } @Override diff --git a/app/src/main/java/com/uiuipad/appstore/network/NetInterfaceManager.java b/app/src/main/java/com/uiuipad/appstore/network/NetInterfaceManager.java index 2ec88d1..25881f5 100644 --- a/app/src/main/java/com/uiuipad/appstore/network/NetInterfaceManager.java +++ b/app/src/main/java/com/uiuipad/appstore/network/NetInterfaceManager.java @@ -144,7 +144,7 @@ public class NetInterfaceManager { .observeOn(AndroidSchedulers.mainThread()); } - public Observable> getAdminAppDetailsObservable(long id) { + public Observable> getAdminAppDetailsObservable(long id) { return mRetrofit.create(AdminAppDetailsApi.class) .getAdminAppDetails(id) .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/uiuipad/appstore/network/api/AdminAppDetailsApi.java b/app/src/main/java/com/uiuipad/appstore/network/api/AdminAppDetailsApi.java index 80a39bd..d72e72e 100644 --- a/app/src/main/java/com/uiuipad/appstore/network/api/AdminAppDetailsApi.java +++ b/app/src/main/java/com/uiuipad/appstore/network/api/AdminAppDetailsApi.java @@ -1,7 +1,7 @@ package com.uiuipad.appstore.network.api; import com.uiuipad.appstore.base.BaseResponse; -import com.uiuipad.appstore.bean.AppClassBean; +import com.uiuipad.appstore.bean.AdminAppInfo; import com.uiuipad.appstore.network.UrlAddress; import java.util.List; @@ -12,7 +12,7 @@ import retrofit2.http.Query; public interface AdminAppDetailsApi { @GET(UrlAddress.GET_ADMIN_APP_DETAILS) - Observable> getAdminAppDetails( + Observable> getAdminAppDetails( @Query("id") long id ); } diff --git a/app/src/main/java/com/uiuipad/appstore/utils/ApkUtils.java b/app/src/main/java/com/uiuipad/appstore/utils/ApkUtils.java index 3cf2d1c..731efba 100644 --- a/app/src/main/java/com/uiuipad/appstore/utils/ApkUtils.java +++ b/app/src/main/java/com/uiuipad/appstore/utils/ApkUtils.java @@ -840,6 +840,9 @@ public class ApkUtils { this.add("com.uiui.zybrowser"); this.add("com.uiui.zysn"); this.add("com.uiui.calendar"); + this.add("com.uiuipad.os"); + this.add("com.uiuipad.find"); + this.add("com.uiuipad.zyinfo"); }}; public static void RemoveTask(final Context context, final String packageName) { diff --git a/app/src/main/res/layout-land/activity_details.xml b/app/src/main/res/layout-land/activity_details.xml index 12f78bd..493bad8 100644 --- a/app/src/main/res/layout-land/activity_details.xml +++ b/app/src/main/res/layout-land/activity_details.xml @@ -241,7 +241,7 @@