Merge remote-tracking branch 'origin/feat-wqf-payment' into xiaoyu_cocossteve

xiaoyu
2 parents c725435a 27dad3d1
Showing 6 changed files with 22 additions and 5 deletions
android/app/src/main/AndroidManifest.xml
android/app/src/main/kotlin/com/kouyuxingqiu/wow_english/MainActivity.kt
lib/app/splash_page.dart
lib/common/core/user_util.dart
lib/common/request/dao/user_dao.dart
pubspec.yaml
@@ -42,4 +42,5 @@
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
 </manifest>
@@ -10,6 +10,7 @@ import com.gyf.immersionbar.BarHide
 import com.gyf.immersionbar.ImmersionBar
 import com.kouyuxingqiu.wow_english.methodChannels.GameMethodChannel
 import com.kouyuxingqiu.wow_english.methodChannels.SingSoungMethodChannel
+import com.umeng.commonsdk.UMConfigure
 import io.flutter.embedding.android.FlutterActivity
  
 class MainActivity : FlutterActivity() {
@@ -22,6 +23,9 @@ class MainActivity : FlutterActivity() {
             SingSoungMethodChannel(this, it)
             GameMethodChannel(this, it)
         }
+        //UM日志打印
+        UMConfigure.setLogEnabled(true)
+        UMConfigure.preInit(this, "663b66b0b3362515012f4ea5", "official")
     }
  
     override fun onResume() {
@@ -6,6 +6,7 @@ import &#39;package:flutter/foundation.dart&#39;;
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:limiting_direction_csx/limiting_direction_csx.dart';
+import 'package:umeng_common_sdk/umeng_common_sdk.dart';
 import 'package:wow_english/common/core/app_config_helper.dart';
 import 'package:wow_english/common/core/user_util.dart';
 import 'package:wow_english/common/extension/string_extension.dart';
@@ -67,7 +68,7 @@ class _TransitionViewState extends State&lt;TransitionView&gt; {
       }*/
       bool isAggreementAccepted = AppConfigHelper.getAgreementAccepted();
       if (isAggreementAccepted) {
-        pushNamedAndRemoveUntil(AppRouteName.home, (route) => false);
+        _initData();
       } else {
         showDialog(
           context: context,
@@ -80,8 +81,7 @@ class _TransitionViewState extends State&lt;TransitionView&gt; {
                 webUrl: AppConsts.userPrivacyPolicyUrl,
                 leftTap: () {
                   AppConfigHelper.saveAgreementAccepted(true);
-                  pushNamedAndRemoveUntil(
-                      AppRouteName.home, (route) => false);
+                  _initData();
                 },
                 rightTap: () {
                   // 退出应用
@@ -95,6 +95,12 @@ class _TransitionViewState extends State&lt;TransitionView&gt; {
     });
   }
  
+  ///初始化数据
+  void _initData() {
+    UmengCommonSdk.initCommon("663b66b0b3362515012f4ea5", "663b66ecf32cc41105ae74b7", "official");
+    pushNamedAndRemoveUntil(AppRouteName.home, (route) => false);
+  }
+
   Future<void> fetchNecessaryData(String userToken,
       {Completer<void>? completer}) async {
     completer ??= Completer<void>();
 import 'dart:convert';
  
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
+import 'package:umeng_common_sdk/umeng_common_sdk.dart';
 import 'package:wow_english/common/core/sp_const.dart';
 import 'package:wow_english/models/user_entity.dart';
 import 'package:wow_english/route/route.dart';
@@ -60,6 +59,7 @@ class UserUtil {
     if (currentPageName != AppRouteName.splash) {
       Navigator.of(AppRouter.context).pushNamedAndRemoveUntil(AppRouteName.login, (route) => false);
     }*/
+    UmengCommonSdk.onProfileSignOff();
     pushNamedAndRemoveUntil(AppRouteName.login, (route) => false, arguments: {'showPasswordPage': showPasswordLoginPage});
   }
  
+import 'package:umeng_common_sdk/umeng_common_sdk.dart';
 import 'package:wow_english/common/core/user_util.dart';
 import 'package:wow_english/models/user_entity.dart';
 import 'package:wow_english/utils/log_util.dart';
@@ -25,6 +26,7 @@ class UserDao {
       data = await getUserInfo();
       data?.token = token;
       UserUtil.saveUser(data);
+      UmengCommonSdk.onProfileSignIn(data?.phoneNum ?? phoneNumber);
     }
     return data;
   }
@@ -107,6 +107,10 @@ dependencies:
   package_info_plus: ^4.2.0
   # 应用内更新 https://pub-web.flutter-io.cn/packages/flutter_app_update
   flutter_app_update: ^3.0.4
+  # 友盟统计 https://pub-web.flutter-io.cn/packages/umeng_common_sdk
+  umeng_common_sdk: ^1.2.7
+  # 友盟APM https://pub-web.flutter-io.cn/packages/umeng_apm_sdk
+  umeng_apm_sdk: ^2.2.1
  
 dev_dependencies:
   build_runner: ^2.4.4