优化

ln_jq_app/lib/common/styles/theme.dart

@@ -22,6 +22,11 @@ class AppTheme {
 
   static const Color darkThemeColor = Color(0xFF032896);
 
+  static const String android_key ="335642645";
+  static const String android_appsecret="39628204345a4240b5b645b68a5896c7";
+  static const String ios_key="335642649";
+  static const String ios_appsecret="173bc08bd5df422da20c8e3ffbf0521b";
+
   /// 亮色主题样式
   static ThemeData light = ThemeData(
     useMaterial3: false,

ln_jq_app/lib/pages/home/controller.dart

@@ -1,8 +1,10 @@
 import 'dart:io';
 
 import 'package:aliyun_push_flutter/aliyun_push_flutter.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter_native_splash/flutter_native_splash.dart';
 import 'package:getx_scaffold/getx_scaffold.dart';
+import 'package:ln_jq_app/common/styles/theme.dart';
 import 'package:ln_jq_app/pages/b_page/base_widgets/view.dart';
 import 'package:ln_jq_app/pages/c_page/base_widgets/view.dart';
 import 'package:ln_jq_app/pages/login/view.dart';
@@ -25,6 +27,101 @@ class HomeController extends GetxController with BaseControllerMixin {
     FlutterNativeSplash.remove();
   }
 
+  // 根据登录状态和登录渠道返回不同的首页
+  Widget getHomePage() {
+    requestPermission();
+    //登录状态跳转
+    if (StorageService.to.isLoggedIn) {
+      // 如果已登录，再判断是哪个渠道
+      if (StorageService.to.loginChannel == LoginChannel.station) {
+        return B_BaseWidgetsPage(); // 站点首页
+      } else if (StorageService.to.loginChannel == LoginChannel.driver) {
+        return BaseWidgetsPage(); // 司机首页
+      } else {
+        return LoginPage();
+      }
+    } else {
+      // 未登录，直接去登录页
+      return LoginPage();
+    }
+  }
+
+  void requestPermission() async {
+    PermissionStatus status = await Permission.notification.status;
+    if (status.isGranted) {
+      Logger.d("通知权限已开启");
+      return;
+    }
+
+    if (status.isDenied) {
+      // 建议此处增加一个应用内的 Rationale (解释说明) 弹窗
+      status = await Permission.notification.request();
+    }
+    if (status.isGranted) {
+      // 授权成功
+      Logger.d('通知已开启');
+    } else if (status.isPermanentlyDenied) {
+      Logger.d('通知权限已被拒绝，请到系统设置中开启');
+    } else if (status.isDenied) {
+      Logger.d('请授予通知权限，以便接收加氢站通知');
+    }
+  }
+
+  ///推送相关
+  Future<void> initAliyunPush() async {
+    // 1. 配置分离：建议将 Key 提取到外部或配置文件中
+    final String appKey = Platform.isIOS ? AppTheme.ios_key : AppTheme.android_key;
+    final String appSecret = Platform.isIOS
+        ? AppTheme.ios_appsecret
+        : AppTheme.android_appsecret;
+
+    try {
+      //  初始化推送
+      final result = await _aliyunPush.initPush(appKey: appKey, appSecret: appSecret);
+
+      if (result['code'] != kAliyunPushSuccessCode) {
+        Logger.d('初始化推送失败: ${result['code']} - ${result['errorMsg']}');
+        return;
+      }
+
+      Logger.d('阿里云推送初始化成功');
+      // 分平台配置
+      if (Platform.isIOS) {
+        await _setupIOSConfig();
+      } else if (Platform.isAndroid) {
+        await _setupAndroidConfig();
+      }
+    } catch (e) {
+      Logger.d('初始化过程中发生异常: $e');
+    }
+  }
+
+  /// iOS 专属配置
+  Future<void> _setupIOSConfig() async {
+    final res = await _aliyunPush.showIOSNoticeWhenForeground(true);
+    if (res['code'] == kAliyunPushSuccessCode) {
+      Logger.d('iOS 前台通知展示已开启');
+    } else {
+      Logger.d('iOS 前台通知开启失败: ${res['errorMsg']}');
+    }
+  }
+
+  /// Android 专属配置
+  Future<void> _setupAndroidConfig() async {
+    await _aliyunPush.setNotificationInGroup(true);
+    final res = await _aliyunPush.createAndroidChannel(
+      "xll_push_android",
+      '新消息通知',
+      4,
+      '用于接收加氢站实时状态提醒',
+    );
+    if (res['code'] == kAliyunPushSuccessCode) {
+      Logger.d('Android 通知通道创建成功');
+    } else {
+      Logger.d('Android 通道创建失败: ${res['code']} - ${res['errorMsg']}');
+    }
+  }
+
   void addPushCallback() {
     _aliyunPush.addMessageReceiver(
       onNotification: _onNotification,
@@ -76,88 +173,4 @@ class HomeController extends GetxController with BaseControllerMixin {
   Future<void> _onIOSRegisterDeviceTokenFailed(Map<dynamic, dynamic> message) async {
     Logger.d('onIOSRegisterDeviceTokenFailed====> $message');
   }
-
-  Future<void> initAliyunPush() async {
-    String appKey;
-    String appSecret;
-
-    if (Platform.isIOS) {
-      appKey = '335642649';
-      appSecret = '173bc08bd5df422da20c8e3ffbf0521b';
-    } else {
-      appKey = "335642645";
-      appSecret = "39628204345a4240b5b645b68a5896c7";
-    }
-
-    var result = await _aliyunPush.initPush(appKey: appKey, appSecret: appSecret);
-    var code = result['code'];
-    if (code == kAliyunPushSuccessCode) {
-      Logger.d('初始化推送成功');
-      if(Platform.isIOS){
-        var result = await _aliyunPush.showIOSNoticeWhenForeground(true);
-        var code = result['code'];
-        if (code == kAliyunPushSuccessCode) {
-          Logger.d('设置前台显示通知成功');
-        } else {
-          Logger.d('设置前台显示通知失败');
-        }
-      }else if(Platform.isAndroid){
-         await _aliyunPush.setNotificationInGroup(true);
-         var result = await _aliyunPush.createAndroidChannel(
-            "xll_push_android", '新消息通知', 2, '收到新消息的通知类别');
-
-        var code = result['code'];
-        if (code == kAliyunPushSuccessCode) {
-          Logger.d('创建通道成功');
-        } else {
-          var errorCode = result['code'];
-          var errorMsg = result['errorMsg'];
-          Logger.d('创建通道失败, $errorCode - $errorMsg');
-        }
-      }
-    } else {
-      var errorMsg = result['errorMsg'];
-      Logger.d('初始化推送失败: $code - $errorMsg');
-    }
-  }
-
-  // 根据登录状态和登录渠道返回不同的首页
-  Widget getHomePage() {
-    requestPermission();
-    //登录状态跳转
-    if (StorageService.to.isLoggedIn) {
-      // 如果已登录，再判断是哪个渠道
-      if (StorageService.to.loginChannel == LoginChannel.station) {
-        return B_BaseWidgetsPage(); // 站点首页
-      } else if (StorageService.to.loginChannel == LoginChannel.driver) {
-        return BaseWidgetsPage(); // 司机首页
-      } else {
-        return LoginPage();
-      }
-    } else {
-      // 未登录，直接去登录页
-      return LoginPage();
-    }
-  }
-
-  void requestPermission() async {
-    PermissionStatus status = await Permission.notification.status;
-    if (status.isGranted) {
-      Logger.d("通知权限已开启");
-      return;
-    }
-
-    if (status.isDenied) {
-      // 建议此处增加一个应用内的 Rationale (解释说明) 弹窗
-      status = await Permission.notification.request();
-    }
-    if (status.isGranted) {
-      // 授权成功
-      Logger.d('通知已开启');
-    } else if (status.isPermanentlyDenied) {
-      Logger.d('通知权限已被拒绝，请到系统设置中开启');
-    } else if (status.isDenied) {
-      Logger.d('请授予通知权限，以便接收加氢站通知');
-    }
-  }
 }