From 090ff2367021f2b03bb3816d588fe959fe88007a Mon Sep 17 00:00:00 2001 From: donghongyu Date: Sat, 12 Oct 2024 17:08:22 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=8CUpdate=E3=80=8D=201=E3=80=81=E4=BF=AE?= =?UTF-8?q?=E5=A4=8DTextView=20=E6=B2=A1=E6=9C=89=E5=86=99=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E7=9A=84=E6=97=B6=E5=80=99=E5=AF=BC=E8=87=B4=E7=9A=84?= =?UTF-8?q?=E5=B4=A9=E6=BA=83=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 14 +++++-- .../java/com/mogo/cloud/MainActivity.java | 8 ++-- .../res/drawable-hdpi/text_drawable_left.png | Bin 2369 -> 0 bytes .../icon_notice_default.png | Bin .../main/res/drawable-xhdpi/mogo_slogan.png | Bin 0 -> 22676 bytes .../res/drawable/main_bitmap_splash_bg.xml | 23 +++++++++++ .../res/drawable/main_bitmap_splash_icon.xml | 12 ++++++ app/src/main/res/layout/activity_main.xml | 14 ++++++- app/src/main/res/layout/splash_screen.xml | 13 +++++++ app/src/main/res/values/colors.xml | 2 +- app/src/main/res/values/styles.xml | 36 +++++++++++++++--- gradle.properties | 2 +- .../java/com/mogo/skin/SkinAttribute.java | 2 +- .../main/java/com/mogo/skin/SkinManager.java | 10 +++-- 14 files changed, 117 insertions(+), 19 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi/text_drawable_left.png rename app/src/main/res/{drawable-hdpi => drawable-xhdpi}/icon_notice_default.png (100%) create mode 100644 app/src/main/res/drawable-xhdpi/mogo_slogan.png create mode 100644 app/src/main/res/drawable/main_bitmap_splash_bg.xml create mode 100644 app/src/main/res/drawable/main_bitmap_splash_icon.xml create mode 100644 app/src/main/res/layout/splash_screen.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 304e5d7..9b51ecc 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -32,14 +32,22 @@ android:label="@string/app_name" android:networkSecurityConfig="@xml/network_security_config" android:roundIcon="@mipmap/ic_launcher_round" - android:supportsRtl="true" - android:theme="@style/AppTheme"> + android:supportsRtl="true"> + android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize" + android:enabled="true" + android:hardwareAccelerated="true" + android:launchMode="singleTask" + android:resizeableActivity="false" + android:screenOrientation="landscape" + android:resumeWhilePausing="true" + android:stateNotNeeded="true" + android:windowSoftInputMode="adjustPan|stateHidden" + android:theme="@style/AppTheme"> diff --git a/app/src/main/java/com/mogo/cloud/MainActivity.java b/app/src/main/java/com/mogo/cloud/MainActivity.java index 4612c19..4f801f6 100644 --- a/app/src/main/java/com/mogo/cloud/MainActivity.java +++ b/app/src/main/java/com/mogo/cloud/MainActivity.java @@ -85,9 +85,11 @@ public class MainActivity extends AppCompatActivity { Skin skin; if (isCheck) { skin = new Skin( - "d5493244467d3970834e42dc1a6f07c9", - "app-skin-debug.skin", - "https://carlife-static-1255510688.cos.ap-beijing.myqcloud.com/MoGoEagleEye/app-skin-debug.skin"); + "6992d2f7862d9255f7a02e0917302f4e", + "YiXin-skin.skin", + "https://carlife-static-1255510688.cos.ap-beijing.myqcloud.com/MoGoEagleEye/YiXin-skin.skin" + + ); //换肤 SkinManager.getInstance().selectSkin(this, skin); diff --git a/app/src/main/res/drawable-hdpi/text_drawable_left.png b/app/src/main/res/drawable-hdpi/text_drawable_left.png deleted file mode 100644 index 281f08909d78ee35ae58fd1761bd90ab7a755e65..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2369 zcmeH|={Fk)7sg{JFR`z!rIcDKLq(BPYzaXdgoxPp*q73FYOkeHYYk&WNhg-6ZEDx5 zv8AZ7YqWMlQmQowu~Qv?!2AL4hxwgz?{n_g=RD`RPi)Z^0zerc000oML?JL2T6Hn0 zyc`!>=k)0?0Ki^gd)ondaen`g{~Y*#azGIRO})tFd^84a4*0q6`ZpD>%H`Ad9dlPaX0C%yCi(5?O) z(|a$u^mZb}{rL%heThmTTJ}zvf1dtPN=E7O|GM8g!u#r>yi0aEh1**07@JHIHSk76 z>Vm`lqTD>njMLu;vVd_0m^o5XP>d~=e*P={s3+v+wY&Lct#>LOqG)QqpA_BjyahG#No%eP3Kb&aio|BI~e6^+siL(=he^2#$oqqSGA9)%FU9=c7^R&brfa7 z%NO^QugoEc^aM{iXrapeRA~r_Md1$`z7gmpv#VQwgH(;QU`8W{l3Q_vL!G~d$4Xd+ zg!(enzi_n3kQZ790_8*%+s0zebY-_1A|m~AWM7c9;ik5wd7==RL%x%OZ?& z@)Oj8lO$+fxx$bw&!u^3>6yLmf&YLu(qi3H5#?qeXzdDv`ZJAq^SXBvYK6DQ&qCb% z(P3m0I46VHZ)JS^W@I8Q0p1396+$+KDoF^F9%a76oQWvB$SjWvyfTSz8M&b?I1?9{ zb9&c1$Fb@o$s)-{NE!YRS2jkskS6M{3r;rciI|@*HycHQL;G-&-92vW z&Q1@2@$g%xcB7fACpV2ZJ}akiY<@yTh9jbTns_uzg{PY0YTzM#@t&$1SKAa0ggi=# zUXv~04EsiPP?1?UBgkh@@|uD*y1%mD2ID<3%#pzto^xmg2X?(Q?t!n zR|BSpc#Ky|M}?swHk6|RkMb%;e^02MeLY7M)fdwk-;_@}$cpn7Vj% z;vv%m>2|07Y`G3wVmh*~5kk?c=rlU*faPF7XkpearpB^Q^s4M`D6x>zA7Vfbl z@f~2#n0CI-9@PF2VW!vqcLJChRTGUo9lsMGx3StQxo*(4CoJh^T!E4F^F%XLrcy+j zu7?QEy}0u@SHrA(8*cp>uzYfaJgb*VOUGa=FB71zPwam|-AnuvL-jOEem+s})frwF zlI0$De_CSTt32#F$X7&y?JU*ZziXfA+W2v|qeILbh+17|F%92y%`b&U*+VnCTHSYK zvE+yzM<-^iIdObSZexBn;8ewEMsY)xW09c!mb=;_xse#VKbO0)*}P6xe<-1pu$UDc z-Z%7Ab2>4|7fq4;W1#g9mq&(qb$N?Z$-h@WZwKD#a}Hw-hEdfOzPAIzoQ{>vJg8i)zNxssiTYH;j`9kM|@?`jFovy0m_@8uRWkx-OU-O zx%xdMRaM*Nt{H-D)5er52=2e?r{p8PWUs+oai$4& zQ=extwYS4h>VYT3j+&hZ5SQZMR=U)Un_nHPDRG0rVdo~`$PXGIs%ZXi-S{`V*I0=O z^rCa@T)oB^-M@Z^8ueW>)6Ow>?cDD*4e6FaLxEVN)j1YvCDEeR3W1t63KcEpKCXzb zQ3RZaPCvF7=SK3kIP`&(SogaXLC#|z8nEu6RXEPK$*#{n!oRz4WuyuIsgCw diff --git a/app/src/main/res/drawable-hdpi/icon_notice_default.png b/app/src/main/res/drawable-xhdpi/icon_notice_default.png similarity index 100% rename from app/src/main/res/drawable-hdpi/icon_notice_default.png rename to app/src/main/res/drawable-xhdpi/icon_notice_default.png diff --git a/app/src/main/res/drawable-xhdpi/mogo_slogan.png b/app/src/main/res/drawable-xhdpi/mogo_slogan.png new file mode 100644 index 0000000000000000000000000000000000000000..00d5cd14a360469e830620feb76e2e7d265cc673 GIT binary patch literal 22676 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%0Ddk}%!M@nXzPI&MdKNYVpMF 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 + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/main_bitmap_splash_icon.xml b/app/src/main/res/drawable/main_bitmap_splash_icon.xml new file mode 100644 index 0000000..b92cdb3 --- /dev/null +++ b/app/src/main/res/drawable/main_bitmap_splash_icon.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 703ffc3..91014b6 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -13,8 +13,14 @@ + android:src="@drawable/icon_notice_default" /> + + diff --git a/app/src/main/res/layout/splash_screen.xml b/app/src/main/res/layout/splash_screen.xml new file mode 100644 index 0000000..1dc139f --- /dev/null +++ b/app/src/main/res/layout/splash_screen.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 26861e6..12dd619 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -2,7 +2,7 @@ #6200EE #3700B3 - #03DAC5 + #FFFFFF #4CAF50 #F44336 #9C27B0 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 9721084..ceaca99 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,11 +1,37 @@ - + + + + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index df87689..28ec353 100644 --- a/gradle.properties +++ b/gradle.properties @@ -58,4 +58,4 @@ MOGO_TELEMATIC_VERSION=1.4.7.42 # v2x MOGO_V2X_VERSION=1.4.7.42 # SKIN -MOGO_SKIN_VERSION=1.4.7.42 +MOGO_SKIN_VERSION=1.4.7.44 diff --git a/libraries/mogo-skin/src/main/java/com/mogo/skin/SkinAttribute.java b/libraries/mogo-skin/src/main/java/com/mogo/skin/SkinAttribute.java index 4ea6218..24d6cd8 100644 --- a/libraries/mogo-skin/src/main/java/com/mogo/skin/SkinAttribute.java +++ b/libraries/mogo-skin/src/main/java/com/mogo/skin/SkinAttribute.java @@ -79,7 +79,7 @@ public class SkinAttribute { if (isNumeric(attributeValue.substring(1))) { resId = Integer.parseInt(attributeValue.substring(1)); } - } catch (NumberFormatException e) { + } catch (Exception e) { // 由于有时候TextView会直接配置文字，而不是用 @string/XXX 所以会导致这里转换异常，车里简单的处理异常跳过即可 //e.printStackTrace(); } diff --git a/libraries/mogo-skin/src/main/java/com/mogo/skin/SkinManager.java b/libraries/mogo-skin/src/main/java/com/mogo/skin/SkinManager.java index 88916e7..ccd19b1 100644 --- a/libraries/mogo-skin/src/main/java/com/mogo/skin/SkinManager.java +++ b/libraries/mogo-skin/src/main/java/com/mogo/skin/SkinManager.java @@ -9,6 +9,7 @@ import android.content.res.AssetManager; import android.content.res.Resources; import android.text.TextUtils; import android.util.Log; +import android.widget.Toast; import com.mogo.skin.net.DownloadManager; import com.mogo.skin.utils.FileUtils; @@ -34,6 +35,7 @@ public class SkinManager extends Observable { public static void init(Application application) { synchronized (SkinManager.class) { if (null == instance) { + Log.d(TAG, "SkinManager init …………"); mApplication = application; instance = new SkinManager(application); } @@ -51,6 +53,8 @@ public class SkinManager extends Observable { //注册Activity生命周期回调 skinActivityLifecycle = new SkinActivityLifecycle(); application.registerActivityLifecycleCallbacks(skinActivityLifecycle); + + // 加载皮肤，如果为空则为APP内默认皮肤 loadSkin(SkinPreference.getInstance().getSkin()); } @@ -141,10 +145,10 @@ public class SkinManager extends Observable { //皮肤包的md5校验 防止下载文件损坏(但是会减慢速度。从数据库查询已下载皮肤表数据库中保留md5字段) if (TextUtils.equals(SkinUtils.getSkinMD5(skinFile), skin.md5)) { Log.d("SkinActivity", "校验成功,修改文件名。"); - } else { - Log.e("SkinActivity", "校验出错,本地文件MD5 与云端文件MD5 不一致。"); - + Log.e("SkinActivity", "皮肤文件校验出错,本地文件MD5 与云端文件MD5 不一致。"); + Toast.makeText(mApplication, "皮肤文件校验出错,本地文件MD5 与云端文件MD5 不一致。", Toast.LENGTH_SHORT).show(); + // TODO 删除本地皮肤文件，并重新下载（这个操作比较危险，需要严格保证配置文件中的md5与实际皮肤包一致，否则将是灾难） } } catch (Exception e) { e.printStackTrace();