[new]增加友盟sdk

android/app/build.gradle

@@ -28,7 +28,7 @@ android {
 
         ndk {
             //noinspection ChromeOsAbiSupport
-//            abiFilters "arm64-v8a"
+            abiFilters "arm64-v8a"
         }
     }
 

android/app/src/main/AndroidManifest.xml

@@ -43,7 +43,11 @@
 
         <meta-data
             android:name="com.amap.api.v2.apikey"
-            android:value="d10659dc789ae488935bd9e221d81cab" />
+            android:value="73e19afac5a562e6425fc69cac276746" />
+
+        <meta-data
+            android:name="UMENG_APPKEY"
+            android:value="67e11d9b48ac1b4f87f56ea2" />
 
         <meta-data
             android:name="flutterEmbedding"

android/app/src/main/assets/com.shishi.dingwei.cert.pem

@@ -0,0 +1,32 @@
+-----BEGIN CERTIFICATE-----
+MIIFkjCCA3qgAwIBAgIDAUNpMA0GCSqGSIb3DQEBCwUAMIGAMQswCQYDVQQGEwJD
+TjEQMA4GA1UECAwHQmVpamluZzEMMAoGA1UECgwDTVNBMREwDwYDVQQLDAhPQUlE
+X1NESzEeMBwGA1UEAwwVY29tLmJ1bi5taWl0bWRpZC5zaWduMR4wHAYJKoZIhvcN
+AQkBFg9tc2FAY2FpY3QuYWMuY24wHhcNMjUwMzI1MTAyNTM4WhcNMjYwMzI2MTAy
+NTM4WjCBgzELMAkGA1UEBhMCQ04xEDAOBgNVBAgMB0JlaWppbmcxEDAOBgNVBAcM
+B0JlaWppbmcxDTALBgNVBAoMBGZ5bXkxGzAZBgNVBAMMEmNvbS5zaGlzaGkuZGlu
+Z3dlaTEkMCIGCSqGSIb3DQEJARYVamlhbmdqaWFqaWVAYXRtb2IuY29tMIICIjAN
+BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAshgvU9xluAUrL51Tam/Ph5Z4yQEL
+0z3ex9d5tX/eOblLFGGDGmmbiAmI2+Knn2VMkIMsQVE2HwTk6RO3HHXDaGYAqdOU
+U54N9M75HOKY2sCSJDXiAtjRpTe0arjuCmv9Oi0rquTfm3y+/BNDMGQIp6MUrMH/
+8jWOUdSydm9yOwZ1u61Um+ymwdEOM+SpridOIT1ZewbUnX1Z750VUwQ0Zv3DIMrq
+RJfgghlvB1Ho8zx3R3h0Sta8e37sECPuY4DJg2ETV2Q+AJidLwpbq0EeWrzdsTrs
+QfB27QfpUIrbDZ0Ar2GNV6eLOxbX5k+icwzUP/70YF8WKzmlRX6GP7oKzvkn2ban
+o/pnSkdyoDmgAO+bfM3CXzOlhq2zyZd8R3Nm4Q+JBsEZEwHBye1kDiK1s/OQjwny
+KGIfJ2ZQZbAjWpiSYej5dpwLZp3zLQ7mGSaP9kCuifyhbcsLGCHpFOn4kbCWmrpw
+X+bA/SMW7yXEUQfh0QrMkimBIPM+15YfdHx4pn1IE9BreOP6Pp8z4ewqvQMunVrT
+MWBce/GdXqWqTiXVDaWViBE/MEB64iZmydfE5YnRkQFvOZFtpGtnK+LuhHevCUGv
+pzfpG0tHQ3rrzgRjrIqqgsuWngNKM/PB0VliIGtNjy02WxLOD3WKzcx1giEo55N+
+CqcMMWCVJ+mactcCAwEAAaMQMA4wDAYDVR0TAQH/BAIwADANBgkqhkiG9w0BAQsF
+AAOCAgEAKAAz+aN6/qXqlZUXjkvwQnFiVBt1pD/rA2s/qCTrfpkxFZUvxl9KVED3
+fDaD38IMSh/WZBnDCPNfwIu+KJOF+zFuFm+Vw1Re8fyGSlYsPaN8cscvWZzXuEfa
+oUy5+/QP0PcNZtS4q08YBhoxlmqLgB/6dHkH2KoqR7AoZIjGvL+1c1vtf4pFuhWU
+Sh+5Mw9R5S7vxwOuxLG6xjJXF4JT6sWFqZVA+VqDjihsizVtqLtdta6w1Ma1itEw
+AqitX3FZby5oMwKEA9gAa5ytp38ae4r/JCd0DYMaQGNOvlXvSUmF37zqngdEnLPu
+3MQ5npl5ze144VI65uRCDKDpIV8lEdiCpcsKIObxHNtjQZ32LAtYPN99Br7RSNGI
++X2dWp6E1uweiFeaoYgHTGt9hYZ3YKqqMutXRjpuNhygw9pjfqRKA86vUfdgGXIS
+VeS3DJvUP1bdOk5oCsn15fAL6i9N+B9JEZYl7ewptpCM8j1i/4rqPwy26HTbrLYQ
+waTMfpNXWXaN74wXA00j+s4GAAuxItAz9zP9XoDknwkTIBBZkAKnCI40ft45qCmx
+u3EGF0oS90NHE8UhAFzIXNb9EPr9Ow+Up4B0CEQ+P1W9n4j3jT7uv//ofm0T0z2+
+m79uVjUhXOFMgCTVYPnxUaaW6kJwmZJfxKdvq/5gRcho1V5bxAE=
+-----END CERTIFICATE-----

android/build.gradle

@@ -1,7 +1,7 @@
 allprojects {
     ext {
         compileSdkVersion = 34
-        applicationId = "com.manbu.shouji"
+        applicationId = "com.shishi.dingwei"
         minSdkVersion = 23
         targetSdkVersion = 34
     }

lib/base/base_request.dart

@@ -109,8 +109,7 @@ class BaseRequest {
   }
 
   void initPackageInfo() {
-    // packageName = appInfoUtil.packageName;
-    packageName = 'com.manbu.shouji';
+    packageName = appInfoUtil.packageName;
     appVersionName = appInfoUtil.appVersionName;
     appVersionCode = appInfoUtil.appVersionCode;
   }

lib/data/consts/build_config.dart

@@ -10,6 +10,12 @@ final class BuildConfig {
   static const String qiyuKEY = "09ea6e0a6d006e25462906fbf6758c99";
 }
 
+final class UmengConfig {
+  UmengConfig._();
+
+  static const String umengIosAppKey = '67e11e7565c707471a29602e';
+}
+
 final class WechatConfig {
   WechatConfig._();
 

lib/data/consts/web_url.dart

@@ -2,10 +2,10 @@ class WebUrl {
   WebUrl._();
 
   static const String _privacyPolicy =
-      "https://doc.v8dashen.com/doc/298eb75d38dc2c4a";
+      "https://doc.v8dashen.com/doc/bad49f15215daa70";
 
   static const String _privacyPolicyIos =
-      "https://cdn.v8dashen.com/static/xt-xm-i-privacy.html";
+      "https://doc.v8dashen.com/doc/546b8b5175a1b4db";
 
   static const String _userAgreement =
       "https://doc.v8dashen.com/doc/417838a4f155ec74";

lib/main.dart

@@ -13,6 +13,7 @@ import 'package:location/router/app_pages.dart';
 import 'package:location/sdk/gravity/gravity_helper.dart';
 import 'package:location/sdk/map/map_helper.dart';
 import 'package:location/sdk/qiyu/qi_yu_helper.dart';
+import 'package:location/sdk/umeng/umeng_helper.dart';
 import 'package:location/sdk/wechat/wechat_helper.dart';
 import 'package:location/utils/app_info_util.dart';
 import 'package:location/utils/mmkv_util.dart';
@@ -73,6 +74,8 @@ class AppInitTask implements EnsurePolicyGrant {
     GravityHelper.init();
     //七鱼客服
     QiYuHelper.init();
+    //友盟
+    UmengHelper.initCommon();
   }
 }
 

lib/module/member/member_page.dart

@@ -286,7 +286,7 @@ class MemberPage extends BasePage<MemberController> {
                         fontWeight: FontWeight.bold),
                   ),
                   Text(
-                    ' / ${controller.selectedGoods?.name}',
+                    ' / ${controller.selectedGoods?.name ?? '--'}',
                     style: TextStyle(fontSize: 12.sp, color: '#000000'.color),
                   ),
                   Spacer(),

lib/module/splash/splash_controller.dart

@@ -7,6 +7,7 @@ import 'package:injectable/injectable.dart';
 import 'package:location/base/base_controller.dart';
 import 'package:location/dialog/agreement_dialog.dart';
 import 'package:location/module/main/main_page.dart';
+import 'package:location/sdk/umeng/umeng_helper.dart';
 import '../../utils/privacy_compliance.dart';
 
 @injectable
@@ -22,7 +23,7 @@ class SplashController extends BaseController {
       AgreementDialog.show(cancelClick: () {
         exitApp();
       }, sureClick: () {
-        PrivacyCompliance.setPrivacyPolicy(true);
+        _agreePrivacy();
         isAgreePrivacyNextStep();
       });
     }
@@ -45,4 +46,9 @@ class SplashController extends BaseController {
       exit(0);
     }
   }
+
+  void _agreePrivacy() async {
+    await UmengHelper.setPolicyGrantResult(true);
+    PrivacyCompliance.setPrivacyPolicy(true);
+  }
 }

lib/sdk/umeng/umeng_helper.dart

@@ -0,0 +1,15 @@
+import 'package:flutter_umeng/flutter_umeng.dart';
+
+import '../../data/consts/build_config.dart';
+
+class UmengHelper {
+  UmengHelper._();
+
+  static void initCommon() {
+    FlutterUmeng.initCommon(iosAppKey: UmengConfig.umengIosAppKey);
+  }
+
+  static Future<void> setPolicyGrantResult(bool granted) {
+    return FlutterUmeng.setPolicyGrantResult(granted);
+  }
+}

pubspec.lock

@@ -425,6 +425,15 @@ packages:
       relative: true
     source: path
     version: "0.0.1"
+  flutter_umeng:
+    dependency: "direct main"
+    description:
+      path: "."
+      ref: "v0.0.2"
+      resolved-ref: "041f5a7c1a18f2dd4c7fdec1e97a35cb5cc9ab67"
+      url: "http://git.atmob.com:28999/Atmob-Flutter/flutter_umeng.git"
+    source: git
+    version: "0.0.2"
   flutter_web_plugins:
     dependency: transitive
     description: flutter

pubspec.yaml

@@ -155,6 +155,11 @@ dependencies:
       url: http://git.atmob.com:28999/Atmob-Flutter/gravity_engine.git
       ref: v0.0.2
 
+  flutter_umeng:
+    git:
+      url: http://git.atmob.com:28999/Atmob-Flutter/flutter_umeng.git
+      ref: v0.0.2
+
   #oaid
 #  oaid:
 #    git: