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 281f089..0000000 Binary files a/app/src/main/res/drawable-hdpi/text_drawable_left.png and /dev/null differ 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 0000000..00d5cd1 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/mogo_slogan.png differ diff --git a/app/src/main/res/drawable/main_bitmap_splash_bg.xml b/app/src/main/res/drawable/main_bitmap_splash_bg.xml new file mode 100644 index 0000000..d78157c --- /dev/null +++ b/app/src/main/res/drawable/main_bitmap_splash_bg.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + \ 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();