Przeglądaj źródła

[new]合并配置并完善根据平台显示对应内容

zk 2 miesięcy temu
rodzic
commit
d995e2d938

assets/images/icon_logo.webp → assets/images/icon_logo_android.webp


assets/images/icon_logo_max.webp → assets/images/icon_logo_android_max.webp


BIN
assets/images/icon_logo_ios.webp


BIN
assets/images/icon_logo_ios_max.webp


+ 1 - 1
assets/string/base/string.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">手机实时定位</string>
+    <string name="app_name_android">寻迹速查定位</string>
     <string name="app_name_ios">手机实时定位</string>
     <string name="main_tab_home">首页</string>
     <string name="main_tab_camera">扫一扫</string>

+ 31 - 2
lib/data/consts/build_config.dart

@@ -1,14 +1,15 @@
 import 'dart:io';
 
 import 'package:flutter/foundation.dart';
+import 'package:location/resource/string.gen.dart';
+
+import '../../resource/assets.gen.dart';
 
 final class BuildConfig {
   BuildConfig._();
 
   static bool get isDebug => kDebugMode;
 
-  static const String qiyuKEY = "09ea6e0a6d006e25462906fbf6758c99";
-
   static const String _quickLoginIosBusinessId =
       "adc0a4df0dae40e787c6bb76ac635aab";
   static const String _quickLoginAndroidBusinessId =
@@ -23,6 +24,34 @@ final class BuildConfig {
       return '';
     }
   }
+
+  static AssetGenImage get logoImage {
+    if (Platform.isAndroid) {
+      return Assets.images.iconLogoAndroid;
+    } else if (Platform.isIOS) {
+      return Assets.images.iconLogoIos;
+    } else {
+      throw UnsupportedError('Unsupported platform');
+    }
+  }
+
+  static AssetGenImage get logoMaxImage {
+    if (Platform.isAndroid) {
+      return Assets.images.iconLogoAndroidMax;
+    } else if (Platform.isIOS) {
+      return Assets.images.iconLogoIosMax;
+    } else {
+      throw UnsupportedError('Unsupported platform');
+    }
+  }
+
+  static String get appName {
+    if (Platform.isAndroid) {
+      return StringName.appNameAndroid;
+    } else {
+      return StringName.appNameIos;
+    }
+  }
 }
 
 final class BuglyConfig {

+ 1 - 1
lib/di/network_module.dart

@@ -5,7 +5,7 @@ import 'package:location/data/api/atmob_stream_api.dart';
 import 'package:location/data/consts/constants.dart';
 import 'package:pretty_dio_logger/pretty_dio_logger.dart';
 import '../data/api/interceptor/stream_dio_log_interceptor.dart';
-import '../data/consts/build_config.dart';
+import '../data/consts/app_config.dart';
 
 @module
 abstract class NetworkModule {

+ 2 - 2
lib/main.dart

@@ -25,7 +25,7 @@ import 'package:location/utils/privacy_compliance.dart';
 import 'package:location/utils/toast_util.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
 
-import 'data/consts/build_config.dart';
+import 'data/consts/app_config.dart';
 import 'data/consts/channel_util.dart';
 import 'data/consts/constants.dart';
 import 'device/device_info_util.dart';
@@ -179,7 +179,7 @@ class MyApp extends StatelessWidget {
 }
 
 class AppCommonConfig {
-  static GenerateAppTitle? appName = (_) => Platform.isIOS? StringName.appNameIos : StringName.appName;
+  static GenerateAppTitle? appName = (_) => BuildConfig.appName;
 
   // 路由配置
   static List<GetPage>? getPages = AppPage.pages;

+ 3 - 2
lib/module/about/about_page.dart

@@ -6,6 +6,7 @@ import 'package:flutter/src/widgets/framework.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:get/get_core/src/get_main.dart';
+import 'package:location/data/consts/app_config.dart';
 import 'package:location/dialog/agreement_dialog.dart';
 import 'package:location/resource/assets.gen.dart';
 import 'package:location/utils/app_info_util.dart';
@@ -32,9 +33,9 @@ class AboutPage extends BasePage<AboutController> {
         CommonView.buildAppBar(StringName.mineFunAbout,
             backOnTap: controller.back, titleCenter: false),
         SizedBox(height: 48.w),
-        Assets.images.iconLogo.image(width: 70.w, height: 70.w),
+        BuildConfig.logoImage.image(width: 70.w, height: 70.w),
         SizedBox(height: 8.w),
-        Text(Platform.isIOS? StringName.appNameIos : StringName.appName,
+        Text(BuildConfig.appName,
             style: TextStyle(fontSize: 14.sp, color: Colors.black)),
         SizedBox(height: 2.w),
         Text('当前版本:${appInfoUtil.appVersionName}',

+ 2 - 1
lib/module/feedback/feed_back_controller.dart

@@ -3,6 +3,7 @@ import 'dart:io';
 import 'package:get/get.dart';
 import 'package:injectable/injectable.dart';
 import 'package:location/base/base_controller.dart';
+import 'package:location/data/consts/app_config.dart';
 import 'package:location/data/repositories/account_repository.dart';
 import 'package:location/handler/event_handler.dart';
 import 'package:location/module/browser/browser_view.dart';
@@ -45,7 +46,7 @@ class FeedBackController extends BaseController {
         "&app_platform=${Platform.isAndroid ? 1 : 2}"
         "&app_version=${appInfoUtil.appVersionName}"
         "&package_name=${appInfoUtil.packageName}"
-        "&app_name=${Platform.isIOS? StringName.appNameIos : StringName.appName}"
+        "&app_name=${BuildConfig.appName}"
         "&phone=$phone";
     BrowserPage.start(url);
   }

+ 2 - 1
lib/module/mine/mine_controller.dart

@@ -7,6 +7,7 @@ import 'package:location/base/base_controller.dart';
 import 'package:location/data/api/response/member_trial_info_response.dart';
 import 'package:location/data/bean/member_status_info.dart';
 import 'package:location/data/bean/user_info.dart';
+import 'package:location/data/consts/app_config.dart';
 import 'package:location/data/consts/error_code.dart';
 import 'package:location/data/repositories/config_repository.dart';
 import 'package:location/handler/error_handler.dart';
@@ -75,7 +76,7 @@ class MineController extends BaseController {
         "&app_platform=${Platform.isAndroid ? 1 : 2}"
         "&app_version=${appInfoUtil.appVersionName}"
         "&package_name=${appInfoUtil.packageName}"
-        "&app_name=${Platform.isIOS? StringName.appNameIos : StringName.appName}"
+        "&app_name=${BuildConfig.appName}"
         "&phone=$phone";
     BrowserPage.start(url);
   }

+ 2 - 1
lib/module/splash/splash_page.dart

@@ -6,6 +6,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:get/get_core/src/get_main.dart';
 import 'package:location/base/base_page.dart';
+import 'package:location/data/consts/app_config.dart';
 import 'package:location/module/splash/splash_controller.dart';
 import 'package:location/resource/assets.gen.dart';
 
@@ -30,7 +31,7 @@ class SplashPage extends BasePage<SplashController> {
           children: [
             SizedBox(height: 170.h),
             Center(
-                child: Assets.images.iconLogo.image(width: 76.w, height: 76.w)),
+                child: BuildConfig.logoImage.image(width: 76.w, height: 76.w)),
           ],
         ),
         Padding(

+ 3 - 2
lib/module/track/track_day_detail/track_share_view.dart

@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:location/data/api/response/track_daily_summary_response.dart';
 import 'package:location/data/bean/user_info.dart';
+import 'package:location/data/consts/app_config.dart';
 import 'package:location/data/repositories/account_repository.dart';
 import 'package:location/resource/assets.gen.dart';
 import 'package:location/resource/string.gen.dart';
@@ -94,12 +95,12 @@ class TrackShareView extends StatelessWidget {
     return Row(
       mainAxisAlignment: MainAxisAlignment.center,
       children: [
-        Assets.images.iconLogo.image(width: 28.w, height: 28.w),
+        BuildConfig.logoImage.image(width: 28.w, height: 28.w),
         SizedBox(width: 6.w),
         Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            Text(Platform.isIOS ? StringName.appNameIos : StringName.appName,
+            Text(BuildConfig.appName,
                 style: TextStyle(
                     fontSize: 12.sp,
                     fontWeight: FontWeight.bold,

+ 18 - 8
lib/resource/assets.gen.dart

@@ -275,13 +275,21 @@ class $AssetsImagesGen {
   AssetGenImage get iconLoginWx =>
       const AssetGenImage('assets/images/icon_login_wx.webp');
 
-  /// File path: assets/images/icon_logo.webp
-  AssetGenImage get iconLogo =>
-      const AssetGenImage('assets/images/icon_logo.webp');
+  /// File path: assets/images/icon_logo_android.webp
+  AssetGenImage get iconLogoAndroid =>
+      const AssetGenImage('assets/images/icon_logo_android.webp');
 
-  /// File path: assets/images/icon_logo_max.webp
-  AssetGenImage get iconLogoMax =>
-      const AssetGenImage('assets/images/icon_logo_max.webp');
+  /// File path: assets/images/icon_logo_android_max.webp
+  AssetGenImage get iconLogoAndroidMax =>
+      const AssetGenImage('assets/images/icon_logo_android_max.webp');
+
+  /// File path: assets/images/icon_logo_ios.webp
+  AssetGenImage get iconLogoIos =>
+      const AssetGenImage('assets/images/icon_logo_ios.webp');
+
+  /// File path: assets/images/icon_logo_ios_max.webp
+  AssetGenImage get iconLogoIosMax =>
+      const AssetGenImage('assets/images/icon_logo_ios_max.webp');
 
   /// File path: assets/images/icon_main_add_friend.webp
   AssetGenImage get iconMainAddFriend =>
@@ -828,8 +836,10 @@ class $AssetsImagesGen {
         iconLoginGoWxArrow,
         iconLoginPhone,
         iconLoginWx,
-        iconLogo,
-        iconLogoMax,
+        iconLogoAndroid,
+        iconLogoAndroidMax,
+        iconLogoIos,
+        iconLogoIosMax,
         iconMainAddFriend,
         iconMainFriendGuard,
         iconMainFriendGuardAndroid,

+ 3 - 2
lib/resource/string.gen.dart

@@ -2,7 +2,8 @@ import 'package:get/get.dart';
 
 class StringName {
   StringName._();
-  static String get appName => 'app_name'.tr; // 手机实时定位
+
+  static String get appNameAndroid => 'app_name_android'.tr; // 寻迹速查定位
   static String get appNameIos => 'app_name_ios'.tr; // 手机实时定位
   static String get mainTabHome => 'main_tab_home'.tr; // 首页
   static String get mainTabCamera => 'main_tab_camera'.tr; // 扫一扫
@@ -349,7 +350,7 @@ class StringMultiSource {
   StringMultiSource._();
   static const Map<String, Map<String, String>> translations = {
     'zh_CN': {
-      'app_name': '手机实时定位',
+      'app_name_android': '寻迹速查定位',
       'app_name_ios': '手机实时定位',
       'main_tab_home': '首页',
       'main_tab_camera': '扫一扫',

+ 1 - 1
lib/sdk/bugly/bugly_helper.dart

@@ -1,5 +1,5 @@
 import 'package:flutter_bugly/flutter_bugly.dart';
-import 'package:location/data/consts/build_config.dart';
+import 'package:location/data/consts/app_config.dart';
 
 import '../../device/atmob_platform_info.dart';
 

+ 1 - 1
lib/sdk/gravity/gravity_helper.dart

@@ -8,7 +8,7 @@ import 'package:location/data/repositories/config_repository.dart';
 import 'package:location/utils/atmob_log.dart';
 import 'package:location/utils/toast_util.dart';
 import '../../data/api/response/member_status_response.dart';
-import '../../data/consts/build_config.dart';
+import '../../data/consts/app_config.dart';
 import '../../data/consts/payment_type.dart';
 import '../../device/atmob_platform_info.dart';
 import '../../utils/async_util.dart';

+ 1 - 1
lib/sdk/quicklogin/quick_login_helper.dart

@@ -2,7 +2,7 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:flutter/services.dart';
-import 'package:location/data/consts/build_config.dart';
+import 'package:location/data/consts/app_config.dart';
 import 'package:location/data/consts/web_url.dart';
 import 'package:location/resource/assets.gen.dart';
 import 'package:location/utils/atmob_log.dart';

+ 1 - 1
lib/sdk/umeng/umeng_helper.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_umeng/flutter_umeng.dart';
 
-import '../../data/consts/build_config.dart';
+import '../../data/consts/app_config.dart';
 
 class UmengHelper {
   UmengHelper._();

+ 1 - 1
lib/sdk/wechat/wechat_helper.dart

@@ -2,7 +2,7 @@ import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
 import 'package:location/data/consts/web_url.dart';
 import 'package:wechat_kit/wechat_kit.dart';
-import '../../data/consts/build_config.dart';
+import '../../data/consts/app_config.dart';
 
 class WechatHelper {
   WechatHelper._();

+ 2 - 1
lib/sdk/wechat/wechat_share_util.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
+import 'package:location/data/consts/app_config.dart';
 import 'package:location/sdk/wechat/wechat_helper.dart';
 import 'package:wechat_kit/wechat_kit.dart';
 import '../../data/consts/web_url.dart';
@@ -21,7 +22,7 @@ class WechatShareUtil {
         webpageUrl: WebUrl.shareUrl,
         title: StringName.shareFriendTitle,
         description: StringName.shareFriendDesc,
-        thumbData: await assetImageToBytes(Assets.images.iconLogoMax.path));
+        thumbData: await assetImageToBytes(BuildConfig.logoMaxImage.path));
   }
 
   static Future<Uint8List> assetImageToBytes(String assetPath) async {