From 9ff5e23cb6ba39d40289e81c487f6c969d23c0c2 Mon Sep 17 00:00:00 2001 From: Fanhuitong <981964879@qq.com> Date: Wed, 29 Mar 2023 10:58:59 +0800 Subject: [PATCH] =?UTF-8?q?version:2.9=20fix:=20update:=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=8F=B0=E7=94=B5MTK=20Android12=E7=AD=BE=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 29 +++++---- app/keystore/TeclastMTK12.jks | Bin 0 -> 2553 bytes .../com/uiuios/aios/base/BaseApplication.java | 55 +++++++++--------- .../main/res/drawable/custom_bg_weather.xml | 6 ++ niceimageview/build.gradle | 4 +- 5 files changed, 55 insertions(+), 39 deletions(-) create mode 100644 app/keystore/TeclastMTK12.jks diff --git a/app/build.gradle b/app/build.gradle index b8c1df0..3f742a3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,8 @@ android { applicationId "com.uiuios.aios" minSdkVersion 24 targetSdkVersion 29 - versionCode 18 - versionName "2.7" + versionCode 20 + versionName "2.9" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -74,19 +74,28 @@ android { v1SigningEnabled true v2SigningEnabled true } + + MTK8183 { + storeFile file("keystore/TeclastMTK12.jks") + storePassword "123456" + keyAlias "teclastmtk12" + keyPassword "123456" + v1SigningEnabled true + v2SigningEnabled true + } } buildTypes { - MTKAndroid12Release.initWith(release) - MTKAndroid12Release { - signingConfig signingConfigs.mtk12 - } - - MTKAndroid12Debug.initWith(debug) - MTKAndroid12Debug { + MTK8183Debug.initWith(debug) + MTK8183Debug { versionNameSuffix "-debug" debuggable true - signingConfig signingConfigs.mtk12 + signingConfig signingConfigs.MTK8183 + } + + MTK8183Release.initWith(release) + MTK8183Release { + signingConfig signingConfigs.MTK8183 } zhanRuiRelease.initWith(release) diff --git a/app/keystore/TeclastMTK12.jks b/app/keystore/TeclastMTK12.jks new file mode 100644 index 0000000000000000000000000000000000000000..669cfa92936634484a135ca9a0486d5ad89899d3 GIT binary patch literal 2553 zcmd6o`8U-2AIE3K3}YM7hztf1<1_Y>7G#M?GM0;MBkRbTBF2p-M9MPu zy-{|;MTX2Rl1bd$>3;9``|X_X_Yb%~yw3Z)9`E=2oY(7pp6}=DJL@|O1Oh=g0sbra zLP+j@uE8PxA-)7P4y57x+qyv@I0&G^b^v}ZdP{PL1PzsknLCq!akT8`qN3wZjo1Y@X`yKtUqA?5SM!r;5GknM&VirR<) z&y0}1z-@Hxr-@GXGxDukm>nh?!&Rf}C;WuI(qyG{eK>m2bC-6g7)#{rVAEdn(p-vWfZjWw6|Mbp$%!EMujP53lgd@CfN? zVV_kP()x~sN^fnobK7)2s4=vgJ(6;Ho9wXG)V>*J?$e&+{@OUlFz%|_!^?%4SikjG zSrZD{kDZOgFio(}nQ~G~Z=T54wBXzF;f6shCt4CTxUXJ&vYsf_|b4)sWLyD>K!A9s{ z^GNZ91BMkz2QH`@PsvBzzx7$+WZR(^D^*EY>yd+Tn8XL8HWV?9>7?+PHc_{0&Lgep0eLc&&*yB2a$T_~tcG=Y6pHY-%sPGwE~1~c!o*38!+jn`|>*<&qo+6Vy~+`5)H z(K;%Y`%_s^(HMIpH~1N2^_$1LO^3}VZ|KoyEM}DE)l%%GQ4o82CepU)8C7@+bzAP6 zrq0bE1R@vbG^BZxF{roKHm|y7zEdx(vPjXONR=Vn*;XA_h0Cv?CpPEpaa_u3mRjd> z*WbR+?(mIiFd4YMgV(Yy9@lP*WM%k!67US?pXPFzyh{ZQux*!4#n0wR)o+6|K@_e^9r zp0q%Z_%b1TsQjPW59sdq{)J1-F^y8EeExRElO?y8P57yL5UK8jxHAM_>n6z5xs-P~ zjFzoy=+aZzfb28MQdRmj{uy~rNn3_BljyU+LXgHYSzr7VuZ!) zJH`q&f76Qhq~w{IL!U-XIji^L7P%CEA*B{4k(~qwxkYfhQ#jf~`sV(Z{)u<7b@CM^ z5p$LDt6J5!D#9C&ua2ye@^b872zYIrGAyR|?k6&4qxB`aVFtdR9L1i0nYo+N&|KoO zq4$?N!tL;yz#$L_R?4x%#{dK=vmnmG6kKye|IXeKl^3JivETr(z( zzzZO_pf)frG{nZ5fChwqBs^%OfvcalXFw3y+m#>+i2Q)uXw>O|P;!W?HyKOxCS4*3 zatxQlk!bD{WRIW#Z;yWy-v1%c{}LGh`=1&RU{SQ|zwRFYd&Rp4_yhaJP=F4gLC{oF z(*QI92Qid7r!j!=clu8)n+nGM{J@+M1f_yeoY@5Cfl$FaUR^tT9nh7)-S;xvyI{QyYOv>YQZ&3W?tIW`$vIVJLGN!O8 zu<6lACU ze=PdjHI6YSM7Q!?5ZT&~HHv0f&ugns!5(twdG8D=pG#jK)EYUxh15+-*2sTRV*W)v zutXv7zHVXMxiUWM9g(@olf(OEEgP1P+%I5l4V;rlpINmgayNPB?VifHTEkw!q7X$b z)eohQt0u67QW6fAINYYJon@-V7T8)3o^MGBZ2!GW0Ro2R$Ls(xTYw}-IFkG@QJ9G3 zLQd6m_6tR}WKdk&Qfo4nM!yHdbpP0wg~hZ0F^!b}dnPv~s~{%hAF2fEPd|?DM=NL; z9DstsyFbf=^Zz*V0E2Ahtm?)OO9j6Z@Hcuyn;5w$0#ZB@pVJ>X8vb0bq7M^Y682si zPi*OQ9c)t_ReyK39XT5>GO&Zxbr3f&f}f^7lB8B2#F{k4*Dy>KKgMqIPYaK#*pQ-R z=9x~gF2V?!aZjfqfr^XHmzML*Rgv^bPF<0#Yz-zvpGw^wO2c9lAh`a8{u12|2*$U31I;IY_i+A>=NryR_?hD%Xnx#xm+R-5oG$Iq# zZY~_%d|YXx&e~p1c;#a?-x|r{Etg-VqtiM7ek+~%!J*jq i3k%n*Z`M^-*)|E%3NhLDTX{PpKhi;3+Qwyp5q|=Hqc`OM literal 0 HcmV?d00001 diff --git a/app/src/main/java/com/uiuios/aios/base/BaseApplication.java b/app/src/main/java/com/uiuios/aios/base/BaseApplication.java index 4a2627a..a6fbaf8 100644 --- a/app/src/main/java/com/uiuios/aios/base/BaseApplication.java +++ b/app/src/main/java/com/uiuios/aios/base/BaseApplication.java @@ -103,6 +103,34 @@ public class BaseApplication extends Application { public void onSuccess(String response) { Log.e("AliyunPush", "init cloudchannel success"); Log.e("AliyunPush", "init cloudchannel success " + pushService.getDeviceId()); + String sn = Utils.getSerial(); + if (TextUtils.isEmpty(sn)) { + return; + } + pushService.bindAccount(sn, new CommonCallback() { + @Override + public void onSuccess(String s) { + Log.e("AliyunPush", "bind account " + sn + " success\n"); + } + + @Override + public void onFailed(String errorCode, String errorMsg) { + Log.e("AliyunPush", "bind account " + sn + " failed." + + "errorCode: " + errorCode + ", errorMsg:" + errorMsg); + } + }); + pushService.addAlias(sn, new CommonCallback() { + @Override + public void onSuccess(String s) { + Log.e("AliyunPush", "add alias " + sn + " success\n"); + } + + @Override + public void onFailed(String errorCode, String errorMsg) { + Log.e("AliyunPush", "add alias " + sn + " failed." + + "errorCode: " + errorCode + ", errorMsg:" + errorMsg + "\n"); + } + }); } @Override @@ -110,34 +138,7 @@ public class BaseApplication extends Application { Log.e("AliyunPush", "init cloudchannel failed -- errorcode:" + errorCode + " -- errorMessage:" + errorMessage); } }); - String sn = Utils.getSerial(); - if (TextUtils.isEmpty(sn)) { - return; - } - pushService.bindAccount(sn, new CommonCallback() { - @Override - public void onSuccess(String s) { - Log.e("AliyunPush", "bind account " + sn + " success\n"); - } - @Override - public void onFailed(String errorCode, String errorMsg) { - Log.e("AliyunPush", "bind account " + sn + " failed." + - "errorCode: " + errorCode + ", errorMsg:" + errorMsg); - } - }); - pushService.addAlias(sn, new CommonCallback() { - @Override - public void onSuccess(String s) { - Log.e("AliyunPush", "add alias " + sn + " success\n"); - } - - @Override - public void onFailed(String errorCode, String errorMsg) { - Log.e("AliyunPush", "add alias " + sn + " failed." + - "errorCode: " + errorCode + ", errorMsg:" + errorMsg + "\n"); - } - }); } private void catchException() { diff --git a/app/src/main/res/drawable/custom_bg_weather.xml b/app/src/main/res/drawable/custom_bg_weather.xml index 217e796..490912e 100644 --- a/app/src/main/res/drawable/custom_bg_weather.xml +++ b/app/src/main/res/drawable/custom_bg_weather.xml @@ -10,4 +10,10 @@ android:topRightRadius="10dp" android:bottomLeftRadius="10dp" android:bottomRightRadius="10dp" /> + + \ No newline at end of file diff --git a/niceimageview/build.gradle b/niceimageview/build.gradle index 1a8134b..5123bf7 100644 --- a/niceimageview/build.gradle +++ b/niceimageview/build.gradle @@ -11,8 +11,8 @@ android { } buildTypes { - MTKAndroid12Debug{} - MTKAndroid12Release{} + MTK8183Debug{} + MTK8183Release{} zhanRuiDebug {} zhanRuiRelease {} zhanRuiUserdebug{}