diff --git a/ios/Runner/Assets.xcassets/login_btn_press.imageset/login_btn_press.png b/ios/Runner/Assets.xcassets/login_btn_press.imageset/login_btn_press.png deleted file mode 100644 index 65f8929b..00000000 Binary files a/ios/Runner/Assets.xcassets/login_btn_press.imageset/login_btn_press.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/sky_login_btn_normal.imageset/Contents.json b/ios/Runner/Assets.xcassets/sky_login_btn_normal.imageset/Contents.json new file mode 100644 index 00000000..0364beae --- /dev/null +++ b/ios/Runner/Assets.xcassets/sky_login_btn_normal.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "sky_login_btn_normal.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/Runner/Assets.xcassets/login_btn_normal.imageset/login_btn_normal.png b/ios/Runner/Assets.xcassets/sky_login_btn_normal.imageset/sky_login_btn_normal.png similarity index 100% rename from ios/Runner/Assets.xcassets/login_btn_normal.imageset/login_btn_normal.png rename to ios/Runner/Assets.xcassets/sky_login_btn_normal.imageset/sky_login_btn_normal.png diff --git a/ios/Runner/Assets.xcassets/login_btn_normal.imageset/Contents.json b/ios/Runner/Assets.xcassets/sky_login_btn_press.imageset/Contents.json similarity index 85% rename from ios/Runner/Assets.xcassets/login_btn_normal.imageset/Contents.json rename to ios/Runner/Assets.xcassets/sky_login_btn_press.imageset/Contents.json index a6c3fabf..b63b8bcd 100644 --- a/ios/Runner/Assets.xcassets/login_btn_normal.imageset/Contents.json +++ b/ios/Runner/Assets.xcassets/sky_login_btn_press.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "login_btn_normal.png", + "filename" : "sky_login_btn_press.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/ios/Runner/Assets.xcassets/sky_login_btn_press.imageset/sky_login_btn_press.png b/ios/Runner/Assets.xcassets/sky_login_btn_press.imageset/sky_login_btn_press.png new file mode 100644 index 00000000..4467ae9a Binary files /dev/null and b/ios/Runner/Assets.xcassets/sky_login_btn_press.imageset/sky_login_btn_press.png differ diff --git a/ios/Runner/Assets.xcassets/xhj_login_btn_normal.imageset/Contents.json b/ios/Runner/Assets.xcassets/xhj_login_btn_normal.imageset/Contents.json new file mode 100644 index 00000000..f968c602 --- /dev/null +++ b/ios/Runner/Assets.xcassets/xhj_login_btn_normal.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "xhj_login_btn_normal.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/Runner/Assets.xcassets/xhj_login_btn_normal.imageset/xhj_login_btn_normal.png b/ios/Runner/Assets.xcassets/xhj_login_btn_normal.imageset/xhj_login_btn_normal.png new file mode 100644 index 00000000..3678adac Binary files /dev/null and b/ios/Runner/Assets.xcassets/xhj_login_btn_normal.imageset/xhj_login_btn_normal.png differ diff --git a/ios/Runner/Assets.xcassets/login_btn_press.imageset/Contents.json b/ios/Runner/Assets.xcassets/xhj_login_btn_press.imageset/Contents.json similarity index 85% rename from ios/Runner/Assets.xcassets/login_btn_press.imageset/Contents.json rename to ios/Runner/Assets.xcassets/xhj_login_btn_press.imageset/Contents.json index 61107dd1..0ca3f4b6 100644 --- a/ios/Runner/Assets.xcassets/login_btn_press.imageset/Contents.json +++ b/ios/Runner/Assets.xcassets/xhj_login_btn_press.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "login_btn_press.png", + "filename" : "xhj_login_btn_press.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/ios/Runner/Assets.xcassets/xhj_login_btn_press.imageset/xhj_login_btn_press.png b/ios/Runner/Assets.xcassets/xhj_login_btn_press.imageset/xhj_login_btn_press.png new file mode 100644 index 00000000..b0a0a56b Binary files /dev/null and b/ios/Runner/Assets.xcassets/xhj_login_btn_press.imageset/xhj_login_btn_press.png differ diff --git a/lib/flavors.dart b/lib/flavors.dart index f2c54c95..304da904 100755 --- a/lib/flavors.dart +++ b/lib/flavors.dart @@ -334,4 +334,24 @@ class F { return false; } } + + // 是否是生产环境 + static String get loginBtnImagePrefix { + switch (appFlavor) { + case Flavor.local: + case Flavor.dev: + case Flavor.pre: + case Flavor.sky_dev: + case Flavor.sky_pre: + case Flavor.sky: + return 'sky'; + case Flavor.xhj_dev: + case Flavor.xhj_pre: + case Flavor.xhj: + case Flavor.xhj_bundle: + return 'xhj'; + default: + return 'sky'; + } + } } diff --git a/lib/tools/jverify_one_click_login.dart b/lib/tools/jverify_one_click_login.dart index 0f4af29b..fe6f5532 100644 --- a/lib/tools/jverify_one_click_login.dart +++ b/lib/tools/jverify_one_click_login.dart @@ -207,10 +207,14 @@ class JverifyOneClickLoginManage { uiConfig.logBtnTextColor = AppColors.mainColor.value; uiConfig.logBtnTextSize = 16; if (isiOS) { - uiConfig.loginBtnNormalImage = 'login_btn_normal'; //图片必须存在 - uiConfig.loginBtnPressedImage = 'login_btn_press'; //图片必须存在 - uiConfig.loginBtnUnableImage = 'login_btn_normal'; //图片必须存在 - uiConfig.logBtnBackgroundPath = 'login_btn_normal'; + uiConfig.loginBtnNormalImage = + '${F.loginBtnImagePrefix}_login_btn_normal'; //图片必须存在 + uiConfig.loginBtnPressedImage = + '${F.loginBtnImagePrefix}_login_btn_press'; //图片必须存在 + uiConfig.loginBtnUnableImage = + '${F.loginBtnImagePrefix}_login_btn_normal'; //图片必须存在 + uiConfig.logBtnBackgroundPath = + '${F.loginBtnImagePrefix}_login_btn_normal'; } // uiConfig.logBtnTextBold = true;