From 8eb995ec7d82b9c66e230bca69a15d16a5155462 Mon Sep 17 00:00:00 2001 From: Fanhuitong <981964879@qq.com> Date: Fri, 15 Dec 2023 09:36:23 +0800 Subject: [PATCH] =?UTF-8?q?version:1.0.1=20fix:=20update:=E5=87=86?= =?UTF-8?q?=E5=A4=87=E5=88=86=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 347 ++++++------------ app/keystore/Aigo1071.jks | Bin 0 -> 2699 bytes app/keystore/G10PMTK11.jks | Bin 0 -> 2352 bytes app/keystore/Teclast8515.keystore | Bin 2356 -> 0 bytes app/keystore/U807userdebug.keystore | Bin 0 -> 2554 bytes app/keystore/UnisocS6688Userdebug.jks | Bin 0 -> 2947 bytes app/keystore/iPlay40h.keystore | Bin 2549 -> 0 bytes app/keystore/iPlay50P.jks | Bin 2345 -> 0 bytes app/keystore/iPlay50miniPro.jks | Bin 2353 -> 0 bytes app/keystore/mtkAndroid12.keystore | Bin 2701 -> 0 bytes app/keystore/zhanxun.keystore | Bin 2617 -> 0 bytes app/src/main/AndroidManifest.xml | 4 +- .../activity/details/DetailsActivity.java | 31 +- .../activity/details/DetailsPresenter.java | 15 +- .../appstore/network/NetInterfaceManager.java | 2 +- .../network/api/AdminAppDetailsApi.java | 4 +- .../com/uiuipad/appstore/utils/ApkUtils.java | 3 + .../main/res/layout-land/activity_details.xml | 4 +- .../main/res/layout-land/item_local_app.xml | 28 +- .../main/res/layout-port/activity_details.xml | 4 +- .../main/res/layout-port/item_local_app.xml | 4 +- 21 files changed, 165 insertions(+), 281 deletions(-) create mode 100644 app/keystore/Aigo1071.jks create mode 100644 app/keystore/G10PMTK11.jks delete mode 100644 app/keystore/Teclast8515.keystore create mode 100644 app/keystore/U807userdebug.keystore create mode 100644 app/keystore/UnisocS6688Userdebug.jks delete mode 100644 app/keystore/iPlay40h.keystore delete mode 100644 app/keystore/iPlay50P.jks delete mode 100644 app/keystore/iPlay50miniPro.jks delete mode 100644 app/keystore/mtkAndroid12.keystore delete mode 100644 app/keystore/zhanxun.keystore 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 0000000000000000000000000000000000000000..c32bd7a86123d9dbe23198b808b1ea52035a85ba GIT binary patch literal 2699 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 s0IE&$WB>pF literal 0 HcmV?d00001 diff --git a/app/keystore/G10PMTK11.jks b/app/keystore/G10PMTK11.jks new file mode 100644 index 0000000000000000000000000000000000000000..324fa3165901bfe56095885d02ba319749535507 GIT binary patch literal 2352 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 literal 0 HcmV?d00001 diff --git a/app/keystore/UnisocS6688Userdebug.jks b/app/keystore/UnisocS6688Userdebug.jks new file mode 100644 index 0000000000000000000000000000000000000000..07f2a13416ff32f8c6e23982b542de26ecc88c75 GIT binary patch literal 2947 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 literal 0 HcmV?d00001 diff --git a/app/keystore/iPlay40h.keystore b/app/keystore/iPlay40h.keystore deleted file mode 100644 index 5961980419aaa3e7c627e8d0f8dcacb5b847c32b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2549 zcmd5-_g9l!7EOZ?Fd!r}5e!`r;ui=-q=-oGB4wx|MM^+=SCTyG(vjYqNQcm+2neE5 z6ctpui1gus6d58+eDh|;wPyZ+_rqCtoqg|JYoD|B+2?rkcoPHyL1+Q~BN)60_I}QH zd^~7CG#~tC5(q>G0?05bz)a70fgTJ4i$hq!U^)lV%87e?hE0WFWCUx;{0e z$|W(1?HrwTHPN(AHs4e+%8z$1`ysISbpCND{9%rxfl8{*$>+s0gg5sbm>QWrr`#1+ z%GG=&Da=86@p0^(RhO)ZxR!zf1@|SkL?(cOw19RO9vWHTpwwzFPE^X_yC`t zcJ;we-1^?0I3Jsm;rTqFynBjrAXdOlRB1BfDr*|m=V#xcp0BBfhnRYCYi?ORiK|~A z<{U+3GE5L!Kv8~7F&n;kFFwlx(#ZV#&8!%3udV&YaIXHvNZvB75SQcV55A$NW)nhc zSA$i|-dhe$nk?i@BOy6>@qky_Qh{-*d)epN2f28if{+F*^ge6hZ%DVwrgic<54_ff zGsDV|1YB|(R>(>AL2MM@XnVW6BhWX%zh#eYsGT<$r;bcbIiw6Kh=!%Vvtf2V{qe^( z1H)ch4Ey7@8JV1L4$VfHiQX3Og6}8&>|3!J@a;0YXG4{U5xcmDraUrBRy?Oa@<>ay z^(ZCmGfb#_YUS*#S~gX}?wz`?5|XlNqB&UPb^pO511@~u#`4P}x)vky1dzi!*<}qJub25xDXAZmsb(f{GQS#UEE}C$&tS&-oG-b zsb;-{aZ99`{_IOO^g2HHT?D)sSrn*ecaK}WS3I!qBJ=IOMXb(~bznJ)$k5zaJIyY+)n^>o;;QY8 z*-d1vhLhHTkHgPQFEp;#$$99v@r|aB$s4E-JoL;?a9$g6DO6zxP=$QkSk0JglAi0H zCW!ZXeas+E5yKIs6Kw6@e_3%&=OVExb)RZtHJKWzODqtizO0{{ zCFqpLR@B_(7=KPIt6o}H56=2b{@#M{{aB$^!|p4prRs3mgq)&2a)hooRXV08R~Hx8 zxe;{A#t04CJKGg!9iW(QZk7&DjO>Xb#-3#`T-NZ{N2NtfmSDcU5Wm{9fpM3Ja3sYV z+qjHnMC!B`JU==1&C%2K4$Ge3L)Uq|s~DZ;J5ChSgOMc}<}!j~*M^1dxL1VRnM)q4 z)dV98NN#>{P4O*AgF3{tis<5s;bT}^aev98)(uWAgpOv;(o64bG$ly+c4qgFa(y9# zaJk7&;dG_(vNS^-0~3v%>YyO@c$?PP$hOpdJS97MHdFaN7kmCyIsPF&fBxmd>ZUS| z!qsh-=oUgeq1s2@VE5Zz6b~soT+y4xYOyh_M2|NNgbi1;wf55twIL0Xo33c42GzSI z**eTYOY1O>6GDS})zfjRwNgskeLHeJkme6&h|u3fkTP>~bx_}qoIjkA&H^g~Tmpe$ z)igV-0Laj!LMQ|bfgnJXEMnwqv$1~wNP2{Lq*mks5)6jXT$7ZBV*(KLP*WH^3Sw%4 zLjkNm69yEcnmxglX0o2H_Bajz{S$3Qwz_4~3 zMJiN%Zngns&v|Q1>|g|l&qwq_r$mG<#}Wx56kU|RU}=hrfHrIztgRfzICh3^$ZtOf z8hR7ROY$4PN?dTS5s$*lavQH5h-*nA8et7lwrtgzy_JDVE}-_cA4?t<-5*vyaU7Q1 zMC8g<;LGPWTU(lRVEOQ3SL&F=jr5%{*$Mqa#>?@E_>zt)y*+8~DpBv8%VkkFYEGF@ z(F;@R@A(7`pR6k8lx`l5-Vi|VfnVic+@ zlZo5cS1v}BnwyN-^(J`_{C!9i0*025r~v5@;H3$Nml?(ZLmPf6q|D@Yh#m0yL_J&X zPsBv_WdWoYKko%$q+Wp3P5i%aib&a|q>R6)63D+y+^L_XpkQ1fvcb3INqagCrgclklrWjo~5;hsss#G`39bOgil^<)?``mu)*~Lle+3N$0 z^U>&0D&u9#Gin-i`s4y$a?=HjR!?;E8*Qkqp+yv@Pmi&_# zvQT&lzp#6eB(Gay${KG&zb`Jd@TuJIZ|e5dYj=b)3OYPP(47!#?{<>>=(iavT{`EO z(0%KJCZq%TK-6|pUfZ%|DU~OUKfqd>$LGjpo;WpS(Fe)Hhs8-f_@caD(O@dQd9)hS z<)$^Gi@|-#V&a=kT1PyG|8?J}wW diff --git a/app/keystore/iPlay50P.jks b/app/keystore/iPlay50P.jks deleted file mode 100644 index 496ef8d80bc7720e71f5d5f878f6e136640cd101..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2345 zcmd5-`8(8W8=vpY7{-h(qP%v=44V0lwURBQ>`Y{-$=GHn62rkb#mJT|6*00#M3Hb( z$i8(D*=5ZXY8(`WFt57a^IqqN_YZh~xbN%weD3?XpXd5qpX+{hmv)yR5D0WHfM3Dm z<#(AJq5=Bt5%JFbwZ;$#7XUKgJ0L%TR~Z4o0VSvq0B}Lz4ESQ$(N5Jhl8IJrb_HEP zreU|p;a<=Nweyv^!h-FYq~j|}iz+rS&8D&2cuM72rHN42h{~1}xm{XY(xviOpSV>G zQ^ugq8&Tm{evAAxZg=Sp*a}Jy;7GpZq-}^>^wX&K0y3E+9kT9-? z9y5@18D`K;6xg9Wfk*d0>8%VrhTx&Z%}(14=u)_H#Vn=yvM?*dVW(~1eG}WhQ55b4 zY^uxndHLrp?pUoq-T2YmyuVO3EhlP;HG18Z`|A~-n$&RMn z7loP&D7#-=-v?CpcxR}CO4DTX-G+~SI!e!+E@@^Xt2&VyNM@B?Q^TP_7V?nAG)B_$ zc06~T`}U7oI+NC>ojF&o)E-{7d9744A|!%pC^&#qn=|?*r&!OscKA~?`6CP)vuM*a6*oN2;Y^UQ3{urqPOgM7ul%pB;R(g?5 zxguf0zn|yrmQnDOD+4rOQvO*AojWQknxhp0L2D-Sf}{RDx6_-SA`V~WT>TW}n(h7c zl}dG~gpq`dvQCq<`d^!nV?)N#9Jis19K}Vo)%N=}wq*Ulll}Tl5O{otyT=%#xH)w) zWJJ&17c>ig#Eg5QaVoXlUHxn1%2`3rvtPP+lFnmyM=(R5?-k9um0B>03)w-%x{JZ| z>gpGrGaK8eNimm0c{Mgu@k=YP%kz1^PgD6OnC+PyYz*IHn>t3HLw7N0=I2hl z6IQWQwq9KRjx>G_6Wcx-m@Z+v)q&>uLaa#;XAu{|rFXIhG$lxK&A})u3D5Jz^)g*k zrLoG(*WoEz9u709fyJ+?IH_aA2m2I@Jm%0Q7A(hr?ptO?5jXU5*toaMcl3vHA|tOy zb<4c(O8vPK7TyQxT$peV;axrPK*qHH#TTZV%ftmO`!~UPP01zMyxVM_bH+^*o0z63 zJ+u>{#YH|DE^8vKGwk#>iwgrMt00d>MJQN3yoNI>(6Qml3wYG|gL=1G51U)4H6SUp zf9bp1YbjKB<#JgO+0cQ3>QbD%SwCRC(;(+=*+a^HBy#VXu#~n$pkYiBU+&}i^pIks z%9QpV$!NSw-JEixg27{b)_BDYN4zZdJMG11I#`~1lAqM|auC;|(Ulf&4;(q7@Sy&7 zzoks@#?Pe2?s9*un?L*#HibUZ42&qsG$t+>kBGAMeEiLSs#ZW}SYmMlJ`O z26zktflY%9*gKE`ZOMf}0Vos+S+%`^2~rPr1Njh0rRdYq-}wLl#RUN)A_*uEiGbO` z5yDVIOM(z6@DuQ$d5Bc9FNI3>BJhLgpAhURi7hf=)=GN9CdFGT{PLcdu3Ul|ub#ku){Qeu3n1n?+93)E8AP*rmh z<5NEd5#JVlf-wH;^VE~tInZ@vIA3` znInXDV~dXY2hY>2%GDDarN4!!;;%Ki-4UbQxCn&-5a59|XbDR08AOsFE(#ZE#jn)) zNhx`s(6+th(^kX58f?7;rGJ*?;Ris`@c-TL({Pf)a4rxA0GxknzGvAz%>jtn;MW5_ ztpV@oF*6@*j<6#RA{I`Wi=*$d1QIK71s^XC&B=`4-#s8J&~KmP(G%LLq)+Zl)Qmz2 zuV?z3B{V;c>vti2a7VptG_UVt3$>1h(LI8jHu&5#wboAb8a6xJz(GrSaHor!9gM8ji+Lz3jvp+W4>r}( zAkY%>1Fld}>zbdGBiyi;ltsn)E7*e6T<TTA^n?FY|2>($0~iCh>wJGRW5pXK^! zy`T=kd7IKTw#lirB6+Ke6bbLIveuT}P#Tw3KD{QZ)I;0ySYhuh3+f5>N;{t@Y#Rqk PI`FO=KK_l#3%dUXR`2&| diff --git a/app/keystore/iPlay50miniPro.jks b/app/keystore/iPlay50miniPro.jks deleted file mode 100644 index e5aeab8a7143ad52217b6b3edf5407851d5a9d52..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2353 zcmd5-XIE3(7Ck2+34|t~vMee~n#2LJ%DlLG%PI#-X|_Wn|k zo2$F4hZp{Yj{ep>a}NLzaEL&04ACLc!bp$;6oN5;AOfHuP^{SKIVC+wv@hexn0Gki zNX!!7F1~Uc`smJk-pr4z(`Ipe>qe-|UBw-r-an2qr5<#TQsq)sPbieKM-O7IEOQk_ zQ;r`5H*#h<5z5ZI)qAU;m%{Pne6o#Ut$E`2nQNl$i@&}mNPX}?>07HYT)-RQrQ0-G z8DRyQh;h+oKhc3d2elIylsoGe6Ku)XPjdA5Ym133px0QcOnK#*$6GuD+QcQc;RfX;uA9_p%%N02#-Cb|)EFo+A z8eJ@#otIW3ITlDGvt*E{BJ`pS9%kMbj$%aRpOTMs?29 zxIM>abvD_a-Yvq>nqWeSN`yfCP<;Nogy1NQlQImWkT(G97zonCk7iDqDhP--h>VRY zDK8exg|Rx)Qv4?9rgqrprocJM>z_}?dT&=I(lRfj1~SqNRPb`Fd)DOXP&(QyOiwo?wO zzT^kR-#CB+*ZdHkMN)6wW}<_zfe8A?eYuycBK^c!nFzy;ouQ%O&Abw|%e{1bqmiTp zjQMp1Hi*t+L^Ra~9oHXU2(LjGz>vXOxSPjkVOZ`hphU7~t<3xEbRNtVIlK%B2 zJ=@5VN?gT^;e_kCw~thlSV&FxrK%faG|?~|+^C;T`-|5qT;S~si~83|%WY#n%aydd zjfJoCM0=^IBLQB5JSo987~z4uQ5=mk=}xJ&Ml8bYjSI8N?(k**?rhnzs@Q>I_y@BU0bz;Aei1|^#dFO(6uYw^v0MmI=Sk&y5s)CplDE9_O5EK_U>W~5dEnJO+%^gBt7>Aj5cMg7(@;1%x#7hwLg)W`DHX`fa7rq>ogVdZx+Us>cZ1He(2B{4 ziHk`69Cw~l_0MY{x0Yt+HAPDrb=%sJmwuC1< z^S%(BZ}Pcxik2O(pP4dWZY=(L$q+HQGoz6i zXK@gEWVL8X#<*m&zuIEZ*}Qv0H8t4eqq!l;h4q7L7?v|m^Q?x$mi%EA6Y$598kx4r zy7<9}^Oc5WvoNEmD{eGx!7g+cxfq@|G%BsNZZi$_;qbnW4z+LgebX@hty+68mRY=3 zUpn_k1ot)_sTE{bH#{5FqVMge}X`6?F6=Dwk-vXLb0TTrRf`j1kKRrKr zvL~K{fQyV}5+--QSGLTDma(M1u>UZ$bQ)XGC|`>473bwOBJiyV&)s8&XGc+I{E2Vk z%S?Rzg)-jwFqV2P;E~832ad&w%a(x)sIOKtI4z8#Zb7gVwj#a1qo>Wv$LOJTaRD&Q zkS7zn<+Z1Y^RDxw;a)6Z>uo&vfF+KpwdT#oQJcQq{4z-WyTyFo`J!UKe={SUf%Max z&%Ep%p)IOd34WynI{_P@B<$@@o}Db*%{NscojxHy~wcUk#Z7e-uikA<90 ZjpVA<)8&-mvoa0K%gzt^f-~dHRLfi&Ohe$U#N~ENu#ss7!=fp{k5h5Z88$+c*LP|io zQzRYIC?O((U_89NIluqC_uKs;aL|WzKzalYs>Q%08K)n2zzT!_^KejE z5Dt3j1WO@sV9$R=U|SFlj6T8UCuPjQ{J$+0D3C4>2RcUJKnDm32I&9s$#FP{OBXny zY;ISh=C^0pCkEUGl#HDAq@xG4n}cwmp2adw32An(^%5o9l9H8q*Oi_MJUKk&?s6w+ z{zj9b_#gPtzz-Ze{D;H%8s6@JCxSoGF>}?m&7-Qicg@lU&M$V`lNQ?D<`z!n8>%d$FHEqbu3Wb>I&j=+Tjy|za%@lo{5mF8Ycy2|3)p|^XI%vb%H(6E zAs_15-!`y4Z|-*}$_DwvhBKCe&m@KWzod7ndeT+)N>9=AljZHL_u#-N(z}a>}(RnyKEsAW@`~wXxd7rc?Okt+zExEY8;dmZME8zm@G3& zi-F5LhBrWRWcl&a_5cB5L*C$)L@w)tfQDEbaKD<+SEqP(f^8$@;<+dGS2*9aS0@7& zy11FWHN{8L<{4gSUGLUni`P^8CGs=nv7VXIzJBlXE|t5kNw8mnhg$ZCn zG3?;z#m3v0g>t7RU9Cf$9xX>v-^a*w$3_F}SSalJ_P7BeTIbcO`_Y_PkWZy3tK(fu z@p+33W62w{{q!Lh}mYD=_`vk6oOh&RK?_fvN<3u*y zwb6p3L(b`LD33qLxWWcC;}_iq=!p@Nha|^`l1WmLSrRbVJM0)FMaId&@YR!e>YxuY zsm(@*@8`QFl~(8W%#Py4FQGHnDzaDj#}lw-8EC^*3{i~TjP#-hXNkfJcx>oNpm_tw znK0;_IpD%0+)YA&zON=~MNTW_y*}C5m%Y=BzgIWYDV5{OJhK5>azIt|RmN}t8xySw z^1&e6V2dZf7&D^XX!?IZu3DqV|mC5NPc<=K5LcyQ2d zzZY&=<6T!19qiH7Upv&A@W!U!$ge`fwr}2% zO-ZPK4w-VWDq3N5jgG2Hi;UDW;C|gJbK$kPru7Gr*P#I|I0>Um8ur$QhaXcD7426( z6QqhdX2>}mnxx*+e0}dGo*e~YT0H~5Tts{B%zX3+;eDUd%beA;Tjwl<`;?^53X0a0 z)mB!(Y4{1558RgWEI8b*<&Q&(fmWqa2|_f>jW zKiry(%)&roR~HM@uiTY8!3Ojt{1k5Qk=c zkr!Ko37NN^O||@IlBSRmsGKWD$e{`~X1!9{>`7LJ0j6aU;1v9B3~;_jAb03J4Smi9*RMDaoCvv+3_4 z2*Zg@OHa^CIw0Vrk^f16|MDxtfBc%!a&Ym3u4$0inBI|hOTB1BM6vFF{ThP<-AWgo z){Zw0hPnIj?v6<$5c|j9dB{UJ^y+4^mL_1WTSv{a`EWe#v5Zx(M;@~atf@|aBTJp| z_<;OO>nVtlq;{9@3*ej(Bk{+bO%+sSQSi$qgvBr&m$KOBJi-1>NulKm^8;*# z#Z_g4i*6knH=Q1y39VW>1aYf;jIW?R^<1KUZQNxdLK*u=pHwcZdih#+XkReYGp((} z+jw289q65C3lyfm?C-%^JaU}QlCKt!SWcS0Rdu%L`~r4Kl5JpX#g)yyRC#J!2geCd z`YK2;+djLJ_GsqP9VKfsL4$Z(!3b^3AM&piajB^wM9p+kP(cWF+9-}flRhl~t|fo} zHeHOGyK|QQsqshYbl5j^P|^I0*bMu~%(i?+ zp%}7hz>*@=@yGd;+MYgpv`5Kcp+S=`v_%CdFn7T3vGH^cVS-3Gqiu_=g z0(!V~BgW%1FAGS*W6Nsrh6|uswN)^Jd2>%#Ekm0TIypLet8l=IB2-ra8+MCxzlYux>@xz(W@qEO2f zfM@aTt>&Z|re`?F2Yhg$&4O>%72=|QV(n}>CYU>O1bR`f|!WenW*C>n;vO+H-D&uaYCVG^;#iRB0cpN{_gn6n;jeV$>HRMbP#;Hk(4QH$ z@D~u>nB>&^=Ew_jzt`J*OpbQZW$K2t?ybORextTs)SE8}=Kcy3W{Y|#V;}bG=P}qV zPz;yYco>hh%RIOzY@wC!0i|SJc0{{)v?Dh7lykFjL|RTatvzU0V=VojO1LrDPywj`)Mj*9P$00ueP1+vgUr7GUPN~I-y>7!hAoxvv_C% z8OQ8cpzxVUJ9rPZ1i+zzyJ^z4+lJk vv2;?yLkC@v(XBl0=8k9waaBLz6k>3SSG!J>LysK1pJk5t38te5#^wD5Jca3{ diff --git a/app/keystore/zhanxun.keystore b/app/keystore/zhanxun.keystore deleted file mode 100644 index 7c46fbc6f1cfbc0ac9370820ac7ba95fc2e165a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2617 zcmY+EWmFUl7KUeF7;@+m9EO%=f=&fR1w={#0m)$)hn5bJAq1prLAp!25tVL`29**- zq$P)D**&}8cfKF@+;g7yz4zw>$5TiW0g2&w@@+7=P{@N20t843%)*l|fbitsukkb- zPlEeLL}CKMlNerO{p-;NQ~vLYiULTKg$JF%@gM?R5KQrZeEpmq#K@8_L~u{ew2*^E zaEyC+r|7VBY!eX!IladcwY0w|wjq*YIsPi@Qv z^3)_`OTk6E|9-DBF$M^0^t9K~awC@d_=?9U0jK@0sP=cvIB$Zxx5+-tjbgo@_(Dt2W*TIOF`(i~J6E0r8(nAKZgR5@f; zB6nE9n|jRl*=XFzDiEi5ihiwWet)&=_(+bVRO+so5 z*~M6g1=Fc-lwrB;*BUhWgT-SI#p^z`mfCkH|K#UR%>3c+|CX-fKHt@jRK69&#IM`G z|MWDn6_uXsR@5F&I<%*qW4h^7PHgzo;@RC~U!dkp&Mn}c0J4N;IH?=|1~#ehphq?3 zBl5;H8rpoAu>Ly2t2SPC%*Ec30+D~QPoJ01wtP4h@8N4G9EWv5h3w1bc zaKdwV-oqh8@@&I-m4Dpl80LmVEwL|8ORGX#z_c*YS;>`)2iq$er+^ zUi-8X>;JF1^9fVVv3cHA$ zW6FyxC$B#3?d)dgY6d%oo%m>dW&6poeBP_%iKN(8IodP7QhKnmi|^v;OM}2u?&pgd zOu2%0dD3*{hX2%*e<0rp`_%B~o$H|LH-}`_Vf`7&EpOSNmutsEF1-ldZqj=l;e9Xn z^@G)DoU)K;ReLIxM0@3S+@wn7kHxvC<~xr&C3lFJ-W#vw`nJY>lo9h$Q2c1r!f4GYh?8=f_2pFGnU+bnO!|z~0&>ZAog5gDlT2 z*SqA-8%sj8@A8g_=`qcbinm`naik1q@K z^+YH25y-BUB}vq=n#2{U_3b+jEm!&3>&~=|mBNra^BL=}?Cx6@&dWl(1D|fI_Qi!%rdo%STeI`Xff34p=d7AY;PW=XEdHfsKB9r zsgj%#LCZl6@CMidEC3DwPkOwG7?DuVyHThh7{rW?*G`Zktl#o7YG@!eNIH_DdIBrdzGJe{Cu<|lk^DSL%v zc~+pPUO?Hjy(( zc9Pw(63rclW`t`Ohokz8@}c!9RpO4wHrz?K*9f$?k_DD-o0Kny&oLk&vlCCnCeI$n zxoM^{=QY`rLm{(~1(+pTmuVSVKQ9GS$6CJt9^9*B7zy1H zL+)MrL0VaLEO!ezCdnL}_tB^Un0%fj9VLE-mS;<9CS}aj$}DE6j7y$=0^8|-PX~Zg z9kJ#3BS>t6f~$wp`d(e4RrGmm4`NSmV$U{4SRcjH>CzizMxM%emI@3NYX-fhlZ1ZosB|U8Ea{g*qWOq4mrx9yDxIx`!I~xOVe3LHm z3AM?89%Da4Ty5hr@wI8lRW-bR-Nj#U;XFG^fU=rT-CRAjw#@(2w8w60=m3v{V3`B| z$K~qHiY5{XOn7xs?YtMIx%gX6mnlOhRqMeSOxdg6oKRlOtuXtbO zcTFb~&dgy#$AYTBk5_yE+RU(}*BAzuXQD9O+3oFmd?KdD+j&~rOzZP>ZQGXB4YOUW zSgPxxn#bHp9l^?KMS{J!qwc9s#j7sX!e-BgnR0<3n}yDr1LQ(L+cqC1fFQ-4*yK_@ zS%#F@8v8spI9P4ssyZC}4h!XUt#ahi$p?=Zt?CLuoWEF+u75lb7ntOh?SBqef^)&i z!6d@e#6)Z)01zV?F4h*(A#~yTDOmv)G3Pp{#6}BZ)XjV{?6>>aOv!OTqJBJnOQV&3 KiHH~&lJ##+rq5Ua 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 @@