[new]增加引力引擎配置

lib/base/base_request.dart

@@ -1,5 +1,6 @@
 import 'dart:io';
 
+import 'package:atmob_channel_reader/atmob_channel_reader.dart';
 import 'package:electronic_assistant/device/atmob_platform_info.dart';
 import 'package:electronic_assistant/utils/app_info_util.dart';
 import 'package:electronic_assistant/device/device_info_util.dart';
@@ -34,6 +35,10 @@ class BaseRequest {
   /// 渠道信息, iOS没有渠道信息, Android通过渠道包工具获取
   @JsonKey(name: "channelName")
   String? channelName;
+  @JsonKey(name: "appId")
+  int? appId;
+  @JsonKey(name: "tgPlatform")
+  int? tgPlatform;
 
   /// 设备信息
   /// Android特有
@@ -113,7 +118,9 @@ class BaseRequest {
   }
 
   void initChannelInfo() {
-    channelName = "";
+    channelName = atmobPlatformInfo.channelName;
+    appId = atmobPlatformInfo.appId;
+    tgPlatform = atmobPlatformInfo.tgPlatform;
   }
 
   void initDeviceInfo() {

lib/data/consts/build_config.dart

@@ -1,9 +1,37 @@
+import 'dart:io';
+
 import 'package:flutter/foundation.dart';
 
 class BuildConfig {
   BuildConfig._();
 
   static bool get isDebug => kDebugMode;
-  static const String gravityAppId = "";
-  static const String gravityAccessToken = "";
+}
+
+mixin GravityConfig {
+  //引力引擎配置
+  static const _gravityAndroidAppId = "24753190";
+  static const _gravityIosAppId = "29235674";
+  static const _gravityAndroidAccessToken = "kqrXSfRQFz5ksKLaGoJx7hbfzvul3cte";
+  static const _gravityIosAccessToken = "ot67ubSa2jInhgrbhuppxwCKsNnejUid";
+
+  static String get gravityAppId {
+    if (Platform.isAndroid) {
+      return _gravityAndroidAppId;
+    } else if (Platform.isIOS) {
+      return _gravityIosAppId;
+    } else {
+      return '';
+    }
+  }
+
+  static String get gravityAccessToken {
+    if (Platform.isAndroid) {
+      return _gravityAndroidAccessToken;
+    } else if (Platform.isIOS) {
+      return _gravityIosAccessToken;
+    } else {
+      return '';
+    }
+  }
 }

lib/device/atmob_platform_info.dart

@@ -11,6 +11,11 @@ class AtmobPlatformInfo {
   String? _simImei1;
   String? _mac;
 
+  //渠道信息
+  String? _channelName;
+  int? _appId;
+  int? _tgPlatform;
+
   /// iOS特有
   String? _idfa;
   String? _idfv;
@@ -26,6 +31,21 @@ class AtmobPlatformInfo {
   double? _locLng;
   double? _locLat;
 
+  AtmobPlatformInfo setChannelName(String? channelName) {
+    _channelName = channelName;
+    return this;
+  }
+
+  AtmobPlatformInfo setTgPlatform(int? tgPlatform) {
+    _tgPlatform = tgPlatform;
+    return this;
+  }
+
+  AtmobPlatformInfo setAppId(int? appId) {
+    _appId = appId;
+    return this;
+  }
+
   AtmobPlatformInfo setOaid(String? oaid) {
     _oaid = oaid;
     return this;
@@ -137,6 +157,12 @@ class AtmobPlatformInfo {
   String? get aaid => _aaid;
 
   String? get oaid => _oaid;
+
+  String? get channelName => _channelName;
+
+  int? get tgPlatform => _tgPlatform;
+
+  int? get appId => _appId;
 }
 
 final AtmobPlatformInfo atmobPlatformInfo = AtmobPlatformInfo();

lib/main.dart

@@ -18,6 +18,7 @@ import 'package:get/get_navigation/src/root/get_material_app.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
 
 import 'data/consts/Constants.dart';
+import 'device/atmob_platform_info.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
@@ -30,8 +31,7 @@ void main() async {
   await KVUtil.init();
 
   //渠道信息
-  await AtmobChannelReader.default4Test(Constants.appDefaultChannel,
-      Constants.appDefaultTgPlatformId, Constants.appDefaultAppId);
+  initChannel();
 
   //初始化
   await initAfterGrant();
@@ -39,6 +39,14 @@ void main() async {
   runApp(const MyApp());
 }
 
+initChannel() async {
+  await AtmobChannelReader.default4Test(Constants.appDefaultChannel,
+      Constants.appDefaultTgPlatformId, Constants.appDefaultAppId);
+  atmobPlatformInfo.setChannelName(await AtmobChannelReader.getChannel());
+  atmobPlatformInfo.setTgPlatform(await AtmobChannelReader.getTgPlatformId());
+  atmobPlatformInfo.setAppId(await AtmobChannelReader.getAppId());
+}
+
 Future<void> initAfterGrant() async {
   if (!isAgreePrivacyPolicy()) {
     return;

lib/module/chat/controller.dart

@@ -128,7 +128,11 @@ class ChatController extends BaseController {
         builder: (BuildContext context) {
           return const ChatStartPage();
         },
-      );
+      ).then((result) {
+        if (!accountRepository.isLogin.value) {
+          Get.back();
+        }
+      });
     });
   }
 

lib/sdk/gravity/gravity_helper.dart

@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'package:atmob_channel_reader/atmob_channel_reader.dart';
 import 'package:electronic_assistant/data/repositories/account_repository.dart';
+import 'package:electronic_assistant/device/atmob_platform_info.dart';
 import 'package:electronic_assistant/utils/async_util.dart';
 import 'package:electronic_assistant/utils/mmkv_util.dart';
 import 'package:flutter/widgets.dart';
@@ -58,13 +59,12 @@ class GravityHelper {
   }
 
   static CancelableFuture<bool> _gravityInitialize(String ssid) {
-    return AsyncUtil.retryWithExponentialBackoff<bool>(() async {
-      String? channel = await AtmobChannelReader.getChannel();
+    return AsyncUtil.retryWithExponentialBackoff<bool>(() {
       return GravityEngine.initialize(
-              BuildConfig.gravityAppId,
-              BuildConfig.gravityAccessToken,
+              GravityConfig.gravityAppId,
+              GravityConfig.gravityAccessToken,
               ssid,
-              channel ?? '',
+              atmobPlatformInfo.channelName ?? '',
               BuildConfig.isDebug)
           .then((data) {
         debugPrint('gravity initialize($ssid) success');

plugin/atmob_channel_reader/android/src/main/java/com/atmob/channel/atmob_channel_reader/AtmobChannelReaderPlugin.java

@@ -82,6 +82,7 @@ public class AtmobChannelReaderPlugin implements FlutterPlugin, MethodCallHandle
             return;
         }
         ChannelReader.default4Test(channel, appId, tgPlatformId);
+        result.success(null);
     }
 
     @Override