diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginFragment.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginFragment.kt index a5517e4740..7d6171c1e0 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginFragment.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginFragment.kt @@ -98,10 +98,15 @@ class LoginFragment : MvpFragment(), ILoginView CallerLogger.d(TAG, "init") // TODO yangyakun 根据后台配置的用户租户对应的皮肤包进行下载换肤 val skin = Skin( - "fbd0132038555e7e60b8f615324ca8b2", + "c9f07e5ee283a2197913cfc4b29ad937", "YiXin-skin_v1_2024_10_24.apk", "https://carlife-static-1255510688.cos.ap-beijing.myqcloud.com/MoGoEagleEye/YiXin-skin_v1_2024_10_24.apk" ) + val skinDeQing = Skin( + "1fb9d7a86d548ac406f3856a908fa60d", + "DeQing-skin_v1_2024_10_24.apk", + "https://carlife-static-1255510688.cos.ap-beijing.myqcloud.com/MoGoEagleEye/DeQing-skin_v1_2024_10_24.apk" + ) //换肤 SkinManager.getInstance().downloadSkin(Utils.getApp(), skin, object : SkinLoadListener { override fun onLoadSuccess() { diff --git a/settings.gradle b/settings.gradle index 0b70ea32fd..8705e605ac 100644 --- a/settings.gradle +++ b/settings.gradle @@ -94,3 +94,4 @@ include ':core:function-impl:mogo-core-function-patch' // 以下是项目定制中的不同皮肤项目,皮肤项目独立打包并通过 COS 发布,后续借助运营平台能力进行动态维护 include ':skin:YiXin-skin' +include ':skin:DeQing-skin' diff --git a/skin/DeQing-skin/.gitignore b/skin/DeQing-skin/.gitignore new file mode 100644 index 0000000000..796b96d1c4 --- /dev/null +++ b/skin/DeQing-skin/.gitignore @@ -0,0 +1 @@ +/build diff --git a/skin/DeQing-skin/build.gradle b/skin/DeQing-skin/build.gradle new file mode 100644 index 0000000000..28bb919ee3 --- /dev/null +++ b/skin/DeQing-skin/build.gradle @@ -0,0 +1,32 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion rootProject.ext.android.compileSdkVersion + + defaultConfig { + applicationId "com.mogo.skin.deqing" + minSdkVersion rootProject.ext.android.minSdkVersion + targetSdkVersion rootProject.ext.android.targetSdkVersion + + // 这里每次更新皮肤资源都要对版本++ 用于版本管理 + versionCode 1 + versionName "1.0" + } +} + +dependencies { + implementation fileTree(include: ['*.jar'], dir: 'libs') +} + +android.applicationVariants.all { variant -> + def buildTime = new Date().format("yyyy_MM_dd", TimeZone.getTimeZone("GMT+08:00")) + def projectFolderName = project.name // 获取项目文件夹名称 + + variant.outputs.all { output -> + outputFileName = [ + projectFolderName, + "v${variant.versionCode}", + buildTime + ].findAll { it.length() > 0 }.join('_') << ".apk" + } +} \ No newline at end of file diff --git a/skin/DeQing-skin/proguard-rules.pro b/skin/DeQing-skin/proguard-rules.pro new file mode 100644 index 0000000000..f1b424510d --- /dev/null +++ b/skin/DeQing-skin/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/skin/DeQing-skin/src/main/AndroidManifest.xml b/skin/DeQing-skin/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..f5abfd51b0 --- /dev/null +++ b/skin/DeQing-skin/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + \ No newline at end of file diff --git a/skin/DeQing-skin/src/main/res/drawable-nodpi/biz_login_bg_bus_end.webp b/skin/DeQing-skin/src/main/res/drawable-nodpi/biz_login_bg_bus_end.webp new file mode 100644 index 0000000000..93d7aaecdd Binary files /dev/null and b/skin/DeQing-skin/src/main/res/drawable-nodpi/biz_login_bg_bus_end.webp differ diff --git a/skin/DeQing-skin/src/main/res/drawable-nodpi/biz_login_bg_bus_start.webp b/skin/DeQing-skin/src/main/res/drawable-nodpi/biz_login_bg_bus_start.webp new file mode 100644 index 0000000000..69e7cd65d0 Binary files /dev/null and b/skin/DeQing-skin/src/main/res/drawable-nodpi/biz_login_bg_bus_start.webp differ diff --git a/skin/DeQing-skin/src/main/res/drawable-nodpi/biz_login_passenger_1080x1920.png b/skin/DeQing-skin/src/main/res/drawable-nodpi/biz_login_passenger_1080x1920.png new file mode 100644 index 0000000000..379ee69b36 Binary files /dev/null and b/skin/DeQing-skin/src/main/res/drawable-nodpi/biz_login_passenger_1080x1920.png differ diff --git a/skin/DeQing-skin/src/main/res/drawable-nodpi/icon_car_b1.png b/skin/DeQing-skin/src/main/res/drawable-nodpi/icon_car_b1.png new file mode 100644 index 0000000000..67e390c366 Binary files /dev/null and b/skin/DeQing-skin/src/main/res/drawable-nodpi/icon_car_b1.png differ diff --git a/skin/DeQing-skin/src/main/res/drawable-nodpi/icon_car_b2.png b/skin/DeQing-skin/src/main/res/drawable-nodpi/icon_car_b2.png new file mode 100644 index 0000000000..6c412582ba Binary files /dev/null and b/skin/DeQing-skin/src/main/res/drawable-nodpi/icon_car_b2.png differ diff --git a/skin/DeQing-skin/src/main/res/drawable-nodpi/icon_car_default.png b/skin/DeQing-skin/src/main/res/drawable-nodpi/icon_car_default.png new file mode 100644 index 0000000000..817536919a Binary files /dev/null and b/skin/DeQing-skin/src/main/res/drawable-nodpi/icon_car_default.png differ diff --git a/skin/DeQing-skin/src/main/res/drawable-nodpi/icon_car_m1.png b/skin/DeQing-skin/src/main/res/drawable-nodpi/icon_car_m1.png new file mode 100644 index 0000000000..16a055772b Binary files /dev/null and b/skin/DeQing-skin/src/main/res/drawable-nodpi/icon_car_m1.png differ diff --git a/skin/DeQing-skin/src/main/res/drawable-nodpi/icon_car_t1.png b/skin/DeQing-skin/src/main/res/drawable-nodpi/icon_car_t1.png new file mode 100644 index 0000000000..407f0c00e5 Binary files /dev/null and b/skin/DeQing-skin/src/main/res/drawable-nodpi/icon_car_t1.png differ diff --git a/skin/DeQing-skin/src/main/res/drawable-nodpi/icon_car_t2.png b/skin/DeQing-skin/src/main/res/drawable-nodpi/icon_car_t2.png new file mode 100644 index 0000000000..8478fc1b2c Binary files /dev/null and b/skin/DeQing-skin/src/main/res/drawable-nodpi/icon_car_t2.png differ diff --git a/skin/DeQing-skin/src/main/res/drawable-xhdpi/icon_bus_passenger_logo.png b/skin/DeQing-skin/src/main/res/drawable-xhdpi/icon_bus_passenger_logo.png new file mode 100644 index 0000000000..9160944c08 Binary files /dev/null and b/skin/DeQing-skin/src/main/res/drawable-xhdpi/icon_bus_passenger_logo.png differ diff --git a/skin/DeQing-skin/src/main/res/drawable-xhdpi/icon_notice_default.png b/skin/DeQing-skin/src/main/res/drawable-xhdpi/icon_notice_default.png new file mode 100644 index 0000000000..ef9317836a Binary files /dev/null and b/skin/DeQing-skin/src/main/res/drawable-xhdpi/icon_notice_default.png differ diff --git a/skin/DeQing-skin/src/main/res/drawable-xhdpi/icon_passenger_operation.png b/skin/DeQing-skin/src/main/res/drawable-xhdpi/icon_passenger_operation.png new file mode 100644 index 0000000000..8d7d5028d4 Binary files /dev/null and b/skin/DeQing-skin/src/main/res/drawable-xhdpi/icon_passenger_operation.png differ diff --git a/skin/DeQing-skin/src/main/res/drawable-xhdpi/icon_qr_center_logo.png b/skin/DeQing-skin/src/main/res/drawable-xhdpi/icon_qr_center_logo.png new file mode 100644 index 0000000000..c71540b71c Binary files /dev/null and b/skin/DeQing-skin/src/main/res/drawable-xhdpi/icon_qr_center_logo.png differ diff --git a/skin/DeQing-skin/src/main/res/drawable-xhdpi/icon_status_bar_logo.png b/skin/DeQing-skin/src/main/res/drawable-xhdpi/icon_status_bar_logo.png new file mode 100644 index 0000000000..5fa4b598de Binary files /dev/null and b/skin/DeQing-skin/src/main/res/drawable-xhdpi/icon_status_bar_logo.png differ diff --git a/skin/DeQing-skin/src/main/res/drawable-xhdpi/mogo_slogan.png b/skin/DeQing-skin/src/main/res/drawable-xhdpi/mogo_slogan.png new file mode 100644 index 0000000000..1c0bdf4236 Binary files /dev/null and b/skin/DeQing-skin/src/main/res/drawable-xhdpi/mogo_slogan.png differ diff --git a/skin/YiXin-skin/src/main/res/drawable-nodpi/road_video_bg.png b/skin/DeQing-skin/src/main/res/drawable-xhdpi/road_video_bg.png similarity index 100% rename from skin/YiXin-skin/src/main/res/drawable-nodpi/road_video_bg.png rename to skin/DeQing-skin/src/main/res/drawable-xhdpi/road_video_bg.png diff --git a/skin/DeQing-skin/src/main/res/drawable-xhdpi/shuttle_p_m2_status_bar_logo.png b/skin/DeQing-skin/src/main/res/drawable-xhdpi/shuttle_p_m2_status_bar_logo.png new file mode 100644 index 0000000000..6029163ee7 Binary files /dev/null and b/skin/DeQing-skin/src/main/res/drawable-xhdpi/shuttle_p_m2_status_bar_logo.png differ diff --git a/skin/DeQing-skin/src/main/res/drawable/main_bitmap_splash_bg.xml b/skin/DeQing-skin/src/main/res/drawable/main_bitmap_splash_bg.xml new file mode 100644 index 0000000000..d78157cb0e --- /dev/null +++ b/skin/DeQing-skin/src/main/res/drawable/main_bitmap_splash_bg.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/skin/DeQing-skin/src/main/res/drawable/main_bitmap_splash_icon.xml b/skin/DeQing-skin/src/main/res/drawable/main_bitmap_splash_icon.xml new file mode 100644 index 0000000000..b92cdb3d10 --- /dev/null +++ b/skin/DeQing-skin/src/main/res/drawable/main_bitmap_splash_icon.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/skin/DeQing-skin/src/main/res/raw/m2.nt3d b/skin/DeQing-skin/src/main/res/raw/m2.nt3d new file mode 100644 index 0000000000..658d2660b6 Binary files /dev/null and b/skin/DeQing-skin/src/main/res/raw/m2.nt3d differ diff --git a/skin/DeQing-skin/src/main/res/raw/video_biz_login_bus_bg.mp4 b/skin/DeQing-skin/src/main/res/raw/video_biz_login_bus_bg.mp4 new file mode 100644 index 0000000000..8426332c1d Binary files /dev/null and b/skin/DeQing-skin/src/main/res/raw/video_biz_login_bus_bg.mp4 differ diff --git a/skin/DeQing-skin/src/main/res/values/colors.xml b/skin/DeQing-skin/src/main/res/values/colors.xml new file mode 100644 index 0000000000..42f0fd6956 --- /dev/null +++ b/skin/DeQing-skin/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #1F1F1F + #373935 + + #ffffff + + + #FFA500 + diff --git a/skin/DeQing-skin/src/main/res/values/strings.xml b/skin/DeQing-skin/src/main/res/values/strings.xml new file mode 100644 index 0000000000..97e161216f --- /dev/null +++ b/skin/DeQing-skin/src/main/res/values/strings.xml @@ -0,0 +1,11 @@ + + + 下渚湖 + + 下渚湖资讯 + + 欢迎乘坐下渚湖自动驾驶! + 稍等,亲\n下渚湖小助手正在为您确认信息… + 要提前说再见了吗?下渚湖小助手很舍不得您呢! + 您已完成乘车指南,更多功能欢迎探索~\n下渚湖小助手预祝您旅途愉快! + \ No newline at end of file diff --git a/skin/YiXin-skin/src/main/res/drawable-nodpi/biz_login_passenger_1920x1080.png b/skin/YiXin-skin/src/main/res/drawable-nodpi/biz_login_passenger_1920x1080.png deleted file mode 100644 index 75df2ac20e..0000000000 Binary files a/skin/YiXin-skin/src/main/res/drawable-nodpi/biz_login_passenger_1920x1080.png and /dev/null differ diff --git a/skin/YiXin-skin/src/main/res/drawable-nodpi/biz_login_passenger_2560x1600.png b/skin/YiXin-skin/src/main/res/drawable-nodpi/biz_login_passenger_2560x1600.png deleted file mode 100644 index c535403510..0000000000 Binary files a/skin/YiXin-skin/src/main/res/drawable-nodpi/biz_login_passenger_2560x1600.png and /dev/null differ diff --git a/skin/YiXin-skin/src/main/res/drawable-xhdpi/road_video_bg.png b/skin/YiXin-skin/src/main/res/drawable-xhdpi/road_video_bg.png index 99bfcefc6f..7ff433d71e 100644 Binary files a/skin/YiXin-skin/src/main/res/drawable-xhdpi/road_video_bg.png and b/skin/YiXin-skin/src/main/res/drawable-xhdpi/road_video_bg.png differ