diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/model/LoginModel.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/model/LoginModel.kt index 07af16189c..3cd6eabc99 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/model/LoginModel.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/model/LoginModel.kt @@ -190,9 +190,9 @@ object LoginModel { go2LoginInfo(data) // TODO yangyakun 根据后台配置的用户租户对应的皮肤包进行下载换肤 val skin = Skin( - "f97d8076dcedd2cb5c30149da28cf863", - "YiXin-skin.skin", - "https://carlife-static-1255510688.cos.ap-beijing.myqcloud.com/MoGoEagleEye/YiXin-skin.skin" + "f108b3332188f0330af9aa64bb72a96c", + "YiXin-skin_v1_2024_10_12_17_42.skin", + "https://carlife-static-1255510688.cos.ap-beijing.myqcloud.com/MoGoEagleEye/YiXin-skin_v1_2024_10_12_17_42.skin" ) //换肤 SkinManager.getInstance().selectSkin(Utils.getApp(), skin) diff --git a/gradle.properties b/gradle.properties index 37d93e3cf4..b5a739e308 100644 --- a/gradle.properties +++ b/gradle.properties @@ -80,7 +80,7 @@ MOGO_LOCATION_VERSION=1.4.7.42 # 远程通讯模块 MOGO_TELEMATIC_VERSION=1.4.7.42 # 动态换肤SDK -MOGO_SKIN_VERSION=1.4.7.44 +MOGO_SKIN_VERSION=1.4.7.45 ######## MogoAiCloudSDK Version ######## # 自研地图 MAP_SDK_VERSION=3.4.1.2 diff --git a/skin/YiXin-skin/build.gradle b/skin/YiXin-skin/build.gradle index b65caba527..46f9c0c0c3 100644 --- a/skin/YiXin-skin/build.gradle +++ b/skin/YiXin-skin/build.gradle @@ -1,30 +1,32 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.android.compileSdkVersion defaultConfig { applicationId "com.dongnao.app.skin" - minSdkVersion 21 - targetSdkVersion 26 + minSdkVersion rootProject.ext.android.minSdkVersion + targetSdkVersion rootProject.ext.android.targetSdkVersion + + // 这里每次更新皮肤资源都要对版本++ 用于版本管理 versionCode 1 versionName "1.0" } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } - - lintOptions { - abortOnError false - } - } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - testImplementation 'junit:junit:4.12' } + +android.applicationVariants.all { variant -> + def buildTime = new Date().format("yyyy_MM_dd_HH_mm", TimeZone.getTimeZone("GMT+08:00")) + def projectFolderName = project.name // 获取项目文件夹名称 + + variant.outputs.all { output -> + outputFileName = [ + projectFolderName, + "v${variant.versionCode}", + buildTime + ].findAll { it.length() > 0 }.join('_') << ".skin" + } +} \ No newline at end of file diff --git a/skin/YiXin-skin/src/main/res/drawable-xhdpi/icon_status_bar_logo.png b/skin/YiXin-skin/src/main/res/drawable-xhdpi/icon_status_bar_logo.png new file mode 100644 index 0000000000..6029163ee7 Binary files /dev/null and b/skin/YiXin-skin/src/main/res/drawable-xhdpi/icon_status_bar_logo.png differ diff --git a/skin/YiXin-skin/src/main/res/raw/m2.nt3d b/skin/YiXin-skin/src/main/res/raw/m2.nt3d new file mode 100644 index 0000000000..658d2660b6 Binary files /dev/null and b/skin/YiXin-skin/src/main/res/raw/m2.nt3d differ