IP获取城市修改,其他UI修改

# Conflicts:
#	pubspec.lock

.metadata

@@ -4,7 +4,42 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: 02c026b03cd31dd3f867e5faeb7e104cce174c5f
+  revision: "bae5e49bc2a867403c43b2aae2de8f8c33b037e4"
-  channel: stable
+  channel: "[user-branch]"
 
 project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+      base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+    - platform: android
+      create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+      base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+    - platform: ios
+      create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+      base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+    - platform: linux
+      create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+      base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+    - platform: macos
+      create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+      base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+    - platform: web
+      create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+      base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+    - platform: windows
+      create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+      base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'

README.md

@@ -1,19 +1,4 @@
-# flutter_app
 
-A new Flutter application.
-
-## Getting Started
-
-This project is a starting point for a Flutter application.
-
-A few resources to get you started if this is your first Flutter project:
-
-- [Lab: Write your first Flutter app](https://flutter.dev/docs/get-started/codelab)
-- [Cookbook: Useful Flutter samples](https://flutter.dev/docs/cookbook)
-
-For help getting started with Flutter, view our
-[online documentation](https://flutter.dev/docs), which offers tutorials,
-samples, guidance on mobile development, and a full API reference.
 
 
 #1.0
@@ -85,6 +70,9 @@ samples, guidance on mobile development, and a full API reference.
     
     推送：使用腾讯云推送 tpns 需扫码登录 （有问题同华为➕微信｜｜或重新注册账号替换相关appKey）
 
+    友盟： wu_rong  密码:Zxc09876
+
+    
     https://pos.platform.lotus-wallet.com/app/ 生产环境
     http://192.168.10.236:8765/app/             测试环境
     https://pos.platform.lotus-wallet.com/app/  生产环境

analysis_options.yaml

@@ -0,0 +1,28 @@
+# This file configures the analyzer, which statically analyzes Dart code to
+# check for errors, warnings, and lints.
+#
+# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
+# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
+# invoked from the command line by running `flutter analyze`.
+
+# The following line activates a set of recommended lints for Flutter apps,
+# packages, and plugins designed to encourage good coding practices.
+include: package:flutter_lints/flutter.yaml
+
+linter:
+  # The lint rules applied to this project can be customized in the
+  # section below to disable rules from the `package:flutter_lints/flutter.yaml`
+  # included above or to enable additional rules. A list of all available lints
+  # and their documentation is published at https://dart.dev/lints.
+  #
+  # Instead of disabling a lint rule for the entire project in the
+  # section below, it can also be suppressed for a single line of code
+  # or a specific dart file by using the `// ignore: name_of_lint` and
+  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
+  # producing the lint.
+  rules:
+    # avoid_print: false  # Uncomment to disable the `avoid_print` rule
+    # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
+
+# Additional information about this file can be found at
+# https://dart.dev/guides/language/analysis-options

android/app/build.gradle

@@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 apply plugin: 'com.mob.sdk'
 
-apply plugin: 'com.huawei.agconnect'
+//apply plugin: 'com.huawei.agconnect'
 
 MobSDK {
     appKey "m33ee7650da86a"
@@ -90,7 +90,7 @@ def mfph = [
 ]
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 34
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -106,16 +106,13 @@ android {
     defaultConfig {
         applicationId "com.zsw.huixiang"
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
 
-        ndk {
-            /// 选择要添加的对应.so 库。
-            abiFilters 'armeabi-v7a', 'arm64-v8a','x86'
-        }
-
         manifestPlaceholders = mfph
+
+        multiDexEnabled true
     }
 
     signingConfigs {
@@ -145,6 +142,11 @@ android {
             minifyEnabled false
             signingConfig signingConfigs.config
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+
+            ndk {
+                /// 选择要添加的对应.so 库。
+                abiFilters 'armeabi-v7a','arm64-v8a','x86'
+            }
         }
         debug {
 //            debuggable true
@@ -152,6 +154,11 @@ android {
             minifyEnabled false
             signingConfig signingConfigs.config
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+
+            ndk {
+                /// 选择要添加的对应.so 库。
+                abiFilters 'armeabi-v7a', 'arm64-v8a','x86','x86_64'
+            }
         }
     }
 
@@ -161,6 +168,10 @@ android {
         exclude 'assets/main_icon_zoomin.png'
         exclude 'assets/cfg/a/mode_1/reduct.sty'
         exclude 'assets/SDK_Default_Traffic_Texture_SevereCongestion.png'
+        pickFirst 'lib/x86/libc++_shared.so'
+        pickFirst 'lib/x86_64/libc++_shared.so'
+        pickFirst 'lib/armeabi-v7a/libc++_shared.so'
+        pickFirst 'lib/arm64-v8a/libc++_shared.so'
     }
     aaptOptions {
         additionalParameters '--auto-add-overlay'
@@ -179,7 +190,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
-    implementation 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:6.6.5'
+//    implementation 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:6.6.5'
 
     implementation fileTree(include: ['*.aar'], dir: 'libs')
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
@@ -192,7 +203,7 @@ dependencies {
 
     implementation 'com.tencent.tpns:xiaomi:1.2.7.1-release'
 
-    implementation 'com.tencent.tpns:huawei:1.2.6.0-release'
+//    implementation 'com.tencent.tpns:huawei:1.2.6.0-release'
     // HMS Core Push 模块依赖包
-    implementation 'com.huawei.hms:push:5.3.0.304'
+//    implementation 'com.huawei.hms:push:5.3.0.304'
 }

android/app/src/main/AndroidManifest.xml

@@ -1,11 +1,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.zsw.huixiang">
 
-    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
+<!--    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>-->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
 
-    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"></uses-permission>
+<!--    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />-->
-    <uses-permission android:name="android.permission.READ_LOGS"></uses-permission>
+<!--    <uses-permission android:name="android.permission.READ_LOGS" />-->
     <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
     <!--允许程序打开网络套接字-->
     <uses-permission android:name="android.permission.INTERNET" />
@@ -35,13 +36,14 @@
     </queries>
 
     <application
-        android:label="回乡"
+        android:label="海峡姐妹"
         android:name=".HxApplication"
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
             android:launchMode="singleTask"
             android:theme="@style/LaunchTheme"
+            android:exported="true"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize">
@@ -71,69 +73,48 @@
         <meta-data
             android:name="XG_SERVER_SUFFIX"
             android:value="tpns.sh.tencent.com" />
-        <meta-data  android:name="WX_APPID"  android:value="wx3b269e795ed23e5f" />
+<!--        <meta-data  android:name="WX_APPID"  android:value="wx3b269e795ed23e5f" />-->
-        <meta-data  android:name="weChatAppId"  android:value="wx3b269e795ed23e5f" />
+<!--        <meta-data  android:name="weChatAppId"  android:value="wx3b269e795ed23e5f" />-->
-        <meta-data android:name="WX_SECRET" android:value="c7e6d17959743ca40602acb402292e2b"/>
+<!--        <meta-data android:name="WX_SECRET" android:value="c7e6d17959743ca40602acb402292e2b"/>-->
 
-        <activity
+<!--        <activity-->
-            android:name="com.zsw.huixiang.wxapi.WXPayEntryActivity"
+<!--            android:name="com.zsw.huixiang.wxapi.WXPayEntryActivity"-->
-            android:exported="true"
+<!--            android:exported="true"-->
-            android:theme="@android:style/Theme.Translucent.NoTitleBar"
+<!--            android:theme="@android:style/Theme.Translucent.NoTitleBar"-->
-            android:launchMode="singleTop" >
+<!--            android:launchMode="singleTop" >-->
-            <intent-filter>
+<!--            <intent-filter>-->
-                <action android:name="android.intent.action.VIEW" />
+<!--                <action android:name="android.intent.action.VIEW" />-->
-                <category android:name="android.intent.category.DEFAULT" />
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
-                <data android:scheme="sdksample" />
+<!--                <data android:scheme="sdksample" />-->
-            </intent-filter>
+<!--            </intent-filter>-->
-        </activity>
+<!--        </activity>-->
-        <activity
+<!--        <activity-->
-            android:name="com.zsw.huixiang.wxapi.WXEntryActivity"
+<!--            android:name="com.zsw.huixiang.wxapi.WXEntryActivity"-->
-            android:exported="true"
+<!--            android:exported="true"-->
-            android:theme="@android:style/Theme.Translucent.NoTitleBar"
+<!--            android:theme="@android:style/Theme.Translucent.NoTitleBar"-->
-            android:launchMode="singleTop" >
+<!--            android:launchMode="singleTop" >-->
-            <intent-filter>
+<!--            <intent-filter>-->
-                <action android:name="android.intent.action.VIEW" />
+<!--                <action android:name="android.intent.action.VIEW" />-->
-                <category android:name="android.intent.category.DEFAULT" />
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
-                <data android:scheme="sdksample" />
+<!--                <data android:scheme="sdksample" />-->
-            </intent-filter>
+<!--            </intent-filter>-->
-        </activity>
+<!--        </activity>-->
 
         <activity
             android:name="com.yalantis.ucrop.UCropActivity"
             android:screenOrientation="portrait"/>
 
-        <activity
-            android:name="io.dcloud.PandoraEntryActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize|mcc|mnc|fontScale|keyboard"
-            android:hardwareAccelerated="true"
-            android:launchMode="singleTask"
-            android:permission="com.miui.securitycenter.permission.AppPermissionsEditor"
-            android:screenOrientation="user"
-            android:theme="@style/DCloudTheme"
-            android:windowSoftInputMode="adjustResize">
-            <intent-filter>
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <action android:name="android.intent.action.VIEW" />
-                <data android:scheme="h56131bcf" />
-            </intent-filter>
-        </activity>
-
         <service android:name="com.amap.api.location.APSService"/>
-        <meta-data
-            android:name="dcloud_appkey"
-            android:value="" />
-        <meta-data
-            android:name="com.amap.api.v2.apikey"
-            android:value="f39d1daa020a56f208eb2519f63e9534"/>
-
-        <meta-data
-            android:name="com.baidu.lbsapi.API_KEY"
-            android:value="cdM5EPFACARrrHRjCwUEoYuzIlfFWdYP" />
 
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />
 
+        <receiver android:name="com.huawei.hms.support.api.push.PushMsgReceiver"
+            android:exported="true"/>
+
+        <receiver android:name="com.huawei.hms.support.api.push.PushReceiver"
+            android:exported="true"/>
+
     </application>
 </manifest>

android/app/src/main/assets/data/dcloud_control.xml

@@ -1,7 +0,0 @@
-<hbuilder version="1.9.9.80110" debug="false" syncDebug="false">
-    <apps>
-        <app appid="__UNI__ACD00DA" appver="1.0"/>
-        <app appid="__UNI__E60E056" appver="1.0"/>
-    </apps>
-</hbuilder>
-

android/app/src/main/assets/data/dcloud_error.html

@@ -1,92 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
-	<meta name="HandheldFriendly" content="true"/>
-	<meta name="MobileOptimized" content="320"/>
-	<title>Error</title>
-	<script type="text/javascript">
-// H5 plus事件处理
-var ws=null;
-function plusReady(){
-	// Android处理返回键
-	plus.key.addEventListener('backbutton',function(){
-		(history.length==1)&&ws.close();
-		var c=setTimeout(function(){
-			ws.close();
-		},1000);
-		window.onbeforeunload=function(){
-			clearTimeout(c);
-		}
-		history.go(-2);
-	},false);
-	ws=plus.webview.currentWebview();
-}
-if(window.plus){
-	plusReady();
-}else{
-	document.addEventListener('plusready',plusReady,false);
-}
-document.addEventListener('touchstart',function(){
-    return false;
-},true);
-// 禁止选择
-document.oncontextmenu=function(){
-	return false;
-};
-// 获取错误信息
-document.addEventListener("error",function(e){
-	info.innerText="请求的页面（"+e.url+"）无法打开";
-	console.log("请求的页面无法打开："+e.href);
-},false);
-	</script>
-	<style>
-*{
-	-webkit-user-select: none;
-}
-html,body{
-	margin: 0px;
-	padding: 0px;
-	width: 100%;
-	height: 100%;
-	text-align: center;
-	word-break: break-all;
-	-webkit-touch-callout:none;
-	-webkit-tap-highlight-color:rgba(0,0,0,0);
-}
-.button{
-	width: 50%;
-	font-size: 18px;
-	font-weight: normal;
-	text-decoration: none;
-	text-align: center;
-	padding: .5em 0em;
-	margin: .5em auto;
-	color: #333333;
-	background-color: #EEEEEE;
-	border: 1px solid #CCCCCC;
-	-webkit-border-radius: 5px;
-	border-radius: 5px;
-}
-.button:active{
-	background-color: #CCCCCC;
-}
-	</style>
-</head>
-<body>
-	<div style="width:100%;height:20%;"></div>
-	<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 512 512" style="height:20%;width:30%"> 
-	<g id="icomoon-ignore">
-		<line stroke-width="1" x1="" y1="" x2="" y2="" stroke="#449FDB" opacity=""></line>
-	</g>
-	<path d="M256 0c-141.385 0-256 114.615-256 256s114.615 256 256 256 256-114.615 256-256-114.615-256-256-256zM352 128c17.673 0 32 14.327 32 32s-14.327 32-32 32-32-14.327-32-32 14.327-32 32-32zM160 128c17.673 0 32 14.327 32 32s-14.327 32-32 32-32-14.327-32-32 14.327-32 32-32zM352.049 390.37c-19.587-32.574-55.272-54.37-96.049-54.37s-76.462 21.796-96.049 54.37l-41.164-24.698c27.98-46.535 78.958-77.672 137.213-77.672s109.232 31.137 137.213 77.672l-41.164 24.698z" fill="#666666"></path>
-    </svg>
-	<p style="font-size:18px;font-weight:bolder;">We're sorry ...</p>
-	<p id="info" style="font-size:12px;"></p>
-	<!--<div class="button" onclick="history.back()">Retry</div>-->
-	<div class="button" onclick="if(history.length == 1){ws.close();}else{ws.back();ws.back();}">Back</div>
-	<div class="button" onclick="ws.close()">Close</div>
-	<div class="button" onclick="plus.runtime.restart()">Restart</div>
-</body>
-</html>

android/app/src/main/assets/data/dcloud_properties.xml

@@ -1,73 +0,0 @@
-<properties>
-	<features>
-		<feature name="Barcode" value="io.dcloud.feature.barcode2.BarcodeFeatureImpl"/>
-        <feature name="Speech" value="io.dcloud.feature.speech.SpeechFeatureImpl">
-            <module name="iFly" value="io.dcloud.feature.speech.IflySpeechEngine"/>
-            <module name="baidu" value="io.dcloud.feature.speech.BaiduSpeechEngine"/>
-        </feature>
-		<feature name="Maps" value="io.dcloud.js.map.amap.JsMapPluginImpl"/>
-        <!--<feature name="Maps" value="io.dcloud.js.map.JsMapPluginImpl"/>-->
-		<feature name="Contacts" value="io.dcloud.feature.contacts.ContactsFeatureImpl"/>
-		<feature name="Messaging" value="io.dcloud.adapter.messaging.MessagingPluginImpl"/>
-		<feature name="Camera" value="io.dcloud.js.camera.CameraFeatureImpl"/>
-		<feature name="Console" value="io.dcloud.feature.pdr.LoggerFeatureImpl"/>
-		<feature name="Device" value="io.dcloud.feature.device.DeviceFeatureImpl"/>
-		<feature name="File" value="io.dcloud.js.file.FileFeatureImpl"/>
-		<feature name="Proximity" value="io.dcloud.feature.sensor.ProximityFeatureImpl"/>
-		<feature name="Storage" value="io.dcloud.feature.pdr.NStorageFeatureImpl"/>
-		<feature name="Cache" value="io.dcloud.feature.pdr.CoreCacheFeatureImpl"/>
-		<feature name="Invocation" value="io.dcloud.invocation.Invocation"/>
-		<feature name="Navigator" value="io.dcloud.feature.ui.navigator.NavigatorUIFeatureImpl"/>
-		<feature name="NativeUI" value="io.dcloud.feature.ui.nativeui.NativeUIFeatureImpl"/>
-		<feature name="UI" value="io.dcloud.feature.ui.UIFeatureImpl">
-			<module name="Navigator" value="io.dcloud.feature.ui.NavView"/>
-		</feature>
-		<feature name="Gallery" value="io.dcloud.js.gallery.GalleryFeatureImpl"/>
-		<feature name="Downloader" value="io.dcloud.net.DownloaderFeatureImpl"/>
-		<feature name="Uploader" value="io.dcloud.net.UploadFeature"/>
-		<feature name="Push" value="io.dcloud.feature.aps.APSFeatureImpl">
-			<module name="igexin" value="io.dcloud.feature.apsGt.GTPushService"/>
-			<!-- mkeypush -->
-		</feature>
-		<feature name="Zip" value="io.dcloud.feature.pdr.ZipFeature"/>
-		<feature name="Audio" value="io.dcloud.feature.audio.AudioFeatureImpl"/>
-		<feature name="Runtime" value="io.dcloud.feature.pdr.RuntimeFeatureImpl"/>
-        <feature name="VideoPlayer" value="io.dcloud.media.MediaFeatureImpl"/>
-        <feature name="LivePusher" value="io.dcloud.media.live.LiveMediaFeatureImpl"/>
-		<feature name="XMLHttpRequest" value="io.dcloud.net.XMLHttpRequestFeature"/>
-		<feature name="Statistic" value="io.dcloud.feature.statistics.StatisticsFeatureImpl"/>
-		<feature name="Accelerometer" value="io.dcloud.feature.sensor.AccelerometerFeatureImpl"/>
-		<feature name="Orientation" value="io.dcloud.feature.sensor.OrientationFeatureImpl"/>
-		<feature name="NativeObj" value="io.dcloud.feature.nativeObj.FeatureImpl"/>		
-		<feature name="Geolocation" value="io.dcloud.js.geolocation.GeolocationFeatureImpl"/>
-		<feature name="Payment" value="io.dcloud.feature.payment.PaymentFeatureImpl">
-			<module name="AliPay" value="io.dcloud.feature.payment.alipay.AliPay"/>
-			<module name="Payment-Weixin" value="io.dcloud.feature.payment.weixin.WeiXinPay"/>
-			<module name="Payment-Qihoo" value="io.dcloud.feature.payment.qihoopay.QihooPay"/>
-		</feature>
-		<feature name="Share" value="io.dcloud.share.ShareFeatureImpl">
-			<module name="Sina" value="io.dcloud.share.sina.SinaWeiboApiManager"/>
-			<module name="Tencent" value="io.dcloud.share.tencent.TencentWeiboApiManager"/>
-			<module name="Weixin" value="io.dcloud.share.mm.WeiXinApiManager"/>
-			<module name="QQ" value="io.dcloud.share.qq.QQApiManager"/>
-		</feature>
-		<feature name="OAuth" value="io.dcloud.feature.oauth.OAuthFeatureImpl">
-			<module name="OAuth-Weixin" value="io.dcloud.feature.oauth.weixin.WeiXinOAuthService"/>
-			<module name="OAuth-QQ" value="io.dcloud.feature.oauth.qq.QQOAuthService"/>
-			<module name="OAuth-Sina" value="io.dcloud.feature.oauth.sina.SinaOAuthService"/>
-			<module name="OAuth-Qihoo" value="io.dcloud.oauth.qihoo.QihooOAuthService"/>
-			<module name="OAuth-MiUi" value="io.dcloud.feature.oauth.miui.MiUiOAuthService"/>
-		</feature>
-		<feature name="Stream" value="io.dcloud.appstream.js.StreamAppFeatureImpl"/>
-		<feature name="Fingerprint" value="io.dcloud.feature.fingerprint.FingerPrintsImpl"/>
-		<feature name="iBeacon" value="io.dcloud.feature.iBeacon.WxBluetoothFeatureImpl"/>
-		<feature name="Bluetooth" value="io.dcloud.feature.bluetooth.BluetoothFeature"/>
-	</features>
-
-	<services>
-		<service name="push" value="io.dcloud.feature.aps.APSFeatureImpl"/>
-		<service name="Statistic" value="io.dcloud.feature.statistics.StatisticsBootImpl"/>
-		<service name="Downloader" value="io.dcloud.net.DownloaderBootImpl"/>
-		<service name="Maps" value="io.dcloud.js.map.MapInitImpl"/>
-	</services>
-</properties>

android/app/src/main/kotlin/com/zsw/huixiang/HxApplication.kt

@@ -1,9 +1,9 @@
 package com.zsw.huixiang
 
 import android.app.Application
-import com.baidu.mapapi.base.BmfMapApplication
 
-class HxApplication : BmfMapApplication() {
+
+class HxApplication : Application() {
 
 
     override fun onCreate() {

android/app/src/main/kotlin/com/zsw/huixiang/MainActivity.kt

@@ -3,7 +3,6 @@ package com.zsw.huixiang
 import android.content.Intent
 import android.os.Bundle
 import android.util.Log
-import io.dcloud.feature.sdk.DCUniMPSDK
 import io.flutter.embedding.android.FlutterActivity
 
 
@@ -17,7 +16,7 @@ class MainActivity: FlutterActivity() {
 
         Log.e("intentUrl:", "url: ${intent.data}" )
 
-        flutterEngine?.plugins?.add(MinPlugin())
+//        flutterEngine?.plugins?.add(MinPlugin())
         
         bridgePlugin = BridgePlugin()
         if (intent.data != null) {
@@ -36,7 +35,7 @@ class MainActivity: FlutterActivity() {
 
     override fun onDestroy() {
         super.onDestroy()
-        DCUniMPSDK.getInstance().closeCurrentApp()
+//        DCUniMPSDK.getInstance().closeCurrentApp()
     }
 
 }

android/app/src/main/kotlin/com/zsw/huixiang/MinPlugin.kt

@@ -1,129 +0,0 @@
-
-
-
-  package com.zsw.huixiang
-
-import android.content.Context
-import androidx.annotation.NonNull
-import io.dcloud.common.adapter.util.Logger
-import io.dcloud.feature.sdk.DCSDKInitConfig
-import io.dcloud.feature.sdk.DCUniMPSDK
-import io.dcloud.feature.sdk.MenuActionSheetItem
-import io.flutter.embedding.engine.plugins.FlutterPlugin
-import io.flutter.plugin.common.MethodCall
-import io.flutter.plugin.common.MethodChannel
-import io.flutter.plugin.common.MethodChannel.MethodCallHandler
-import io.flutter.plugin.common.MethodChannel.Result
-import org.json.JSONObject
-
-
-/** MinPlugin */
-class MinPlugin: FlutterPlugin, MethodCallHandler {
-  /// The MethodChannel that will the communication between Flutter and native Android
-  ///
-  /// This local reference serves to register the plugin with the Flutter Engine and unregister it
-  /// when the Flutter Engine is detached from the Activity
-  private lateinit var channel : MethodChannel
-  private lateinit var context : Context
-
-  override fun onAttachedToEngine(@NonNull flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
-    context = flutterPluginBinding.applicationContext;
-    channel = MethodChannel(flutterPluginBinding.binaryMessenger, "min")
-    channel.setMethodCallHandler(this)
-  }
-
-  override fun onMethodCall(@NonNull call: MethodCall, @NonNull result: Result) {
-    if (call.method == "initialize") {
-      if (!DCUniMPSDK.getInstance().isInitialize) {
-        val item = MenuActionSheetItem("退出", "tc");
-        val sheetItems: MutableList<MenuActionSheetItem> = ArrayList()
-        sheetItems.add(item)
-        val config = DCSDKInitConfig.Builder()
-                .setCapsule(true)
-                .setMenuDefFontSize("16px")
-                .setMenuDefFontColor("#000000")
-                .setMenuDefFontWeight("normal")
-                .setMenuActionSheetItems(sheetItems)
-                .setEnableBackground(false) //后台运行
-                .build()
-        DCUniMPSDK.getInstance().initialize(context, config) {
-          result.success(it)
-        }
-        DCUniMPSDK.getInstance().setDefMenuButtonClickCallBack { p0, p1 ->
-          Logger.e("p0: $p0   p1:$p1");
-          when (p1) {
-            "tc" -> {
-              Logger.e("用户点击了退出");
-              DCUniMPSDK.getInstance().closeCurrentApp()
-            }
-          }
-        }
-        DCUniMPSDK.getInstance().setUniMPOnCloseCallBack {
-          Logger.e("用户点击了退出 it: $it")
-          DCUniMPSDK.getInstance().closeCurrentApp()
-        }
-      }
-    } else if (call.method == "isInitialize") {
-      result.success(DCUniMPSDK.getInstance().isInitialize)
-    } else if (call.method == "isExistsApp") {
-      var appid = call.argument<String>("appid");
-      result.success(DCUniMPSDK.getInstance().isExistsApp(appid))
-    } else if (call.method == "getAppVersionInfo") {
-      var appid = call.argument<String>("appid");
-      result.success(DCUniMPSDK.getInstance().getAppVersionInfo(appid)["name"])
-    } else if (call.method == "closeCurrentApp") {
-      result.success(DCUniMPSDK.getInstance().closeCurrentApp())
-    } else if (call.method == "getAppBasePath") {
-      result.success(DCUniMPSDK.getInstance().getAppBasePath(context))
-    } else if (call.method == "runingAppid") {
-      result.success(DCUniMPSDK.getInstance().runingAppid)
-    } else if (call.method == "currentPageUrl") {
-      result.success(DCUniMPSDK.getInstance().currentPageUrl)
-    } else if (call.method == "startMin") {
-      try {
-        var appid = call.argument<String>("appid")
-        var hashMap = call.argument<HashMap<String, Object>>("json")
-        Logger.e("startMin_json: ${JSONObject(hashMap as Map<*, *>)}")
-        DCUniMPSDK.getInstance().startApp(context, appid, JSONObject(hashMap as Map<*, *>))
-      } catch (e: Exception) {
-        e.printStackTrace()
-      }
-      result.success("")
-    } else if (call.method == "clickListener") {
-      DCUniMPSDK.getInstance().setDefMenuButtonClickCallBack { p0, p1 ->
-        Logger.e("p0: $p0   p1:$p1");
-        when (p1) {
-          "tc" -> {
-            Logger.e("用户点击了退出");
-            DCUniMPSDK.getInstance().closeCurrentApp()
-          }
-        }
-      }
-      DCUniMPSDK.getInstance().setUniMPOnCloseCallBack {
-        Logger.e("用户点击了退出 it: $it")
-      }
-    } else if (call.method == "reloadWgt") {
-      try {
-        var appid = call.argument<String>("appid");
-        var wgtPath = call.argument<String>("wgtPath");
-        DCUniMPSDK.getInstance().releaseWgtToRunPathFromePath(appid, wgtPath) { code, pArgs ->
-          if (code == 1) { //释放wgt完成
-            result.success(true)
-          } else {
-            result.success(false)
-          }
-          null
-        }
-      } catch (e: Exception) {
-        e.printStackTrace()
-      }
-    } else {
-      result.notImplemented()
-    }
-  }
-
-  override fun onDetachedFromEngine(@NonNull binding: FlutterPlugin.FlutterPluginBinding) {
-    channel.setMethodCallHandler(null)
-  }
-}
-

android/app/src/main/kotlin/com/zsw/huixiang/wxapi/WXEntryActivity.kt

@@ -1,67 +0,0 @@
-package com.zsw.huixiang.wxapi
-
-import android.content.Intent
-import android.os.Bundle
-import cn.sharesdk.wechat.utils.WechatHandlerActivity
-import io.dcloud.feature.payment.weixin.AbsWXPayCallbackActivity
-import io.flutter.Log
-
-class WXEntryActivity : WechatHandlerActivity() {
-
-
-    // IWXAPI 是第三方app和微信通信的openapi接口
-
-    public override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        Log.e("wx:", "onCreate:")
-
-//        try {
-//            if (!WXAPiHandler.wxApiRegistered) {
-//                var appInfo = packageManager.getApplicationInfo(packageName, PackageManager.GET_META_DATA)
-//                val wechatAppId = appInfo.metaData.getString("weChatAppId")
-//                if (wechatAppId != null ){
-//                    WXAPiHandler.setupWxApi(wechatAppId,this)
-//                    WXAPiHandler.setCoolBool(true)
-//                    Log.d("fluwx","weChatAppId:" + wechatAppId)
-//                }else {
-//                    Log.e("fluwx","can't load meta-data weChatAppId")
-//                }
-//            }
-//            WXAPiHandler.wxApi?.handleIntent(intent, this)
-//        } catch (e: Exception) {
-//            e.printStackTrace()
-//            startSpecifiedActivity(defaultFlutterActivityAction())
-//            finish()
-//        }
-    }
-
-//    override fun onNewIntent(intent: Intent) {
-//        super.onNewIntent(intent)
-//        Log.e("wx:", "onNewIntent:")
-
-//        setIntent(intent)
-
-//        try {
-//            WXAPiHandler.wxApi?.handleIntent(intent, this)
-//        } catch (e: Exception) {
-//            e.printStackTrace()
-//            startSpecifiedActivity(defaultFlutterActivityAction())
-//            finish()
-//        }
-//    }
-
-
-//    override fun onReq(baseReq: BaseReq) {
-//        Log.e("wx:", "onReq: ${baseReq.toString()}")
-        // FIXME: 可能是官方的Bug，从微信拉起APP的Intent类型不对，无法跳转回Flutter Activity
-        // 稳定复现场景：微信版本为7.0.5，小程序SDK为2.7.7
-//        FluwxRequestHandler.onReq(baseReq,this)
-//    }
-    // 第三方应用发送到微信的请求处理后的响应结果，会回调到该方法
-//    override fun onResp(resp: BaseResp) {
-//        Log.e("wx:", "onResp: ${resp.toString()}")
-//        FluwxResponseHandler.handleResponse(resp)
-//        finish()
-//    }
-
-}

android/app/src/main/kotlin/com/zsw/huixiang/wxapi/WXPayEntryActivity.kt

@@ -1,86 +0,0 @@
-package com.zsw.huixiang.wxapi
-
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.os.Bundle
-import android.util.Log
-import com.jarvan.fluwx.handlers.FluwxRequestHandler
-import com.jarvan.fluwx.handlers.FluwxResponseHandler
-import com.jarvan.fluwx.handlers.WXAPiHandler
-import com.tencent.mm.opensdk.modelbase.BaseReq
-import com.tencent.mm.opensdk.modelbase.BaseResp
-import io.dcloud.feature.payment.weixin.AbsWXPayCallbackActivity
-
-
-class WXPayEntryActivity : AbsWXPayCallbackActivity() {
-    
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        try {
-            if (!WXAPiHandler.wxApiRegistered) {
-                var appInfo = packageManager.getApplicationInfo(packageName, PackageManager.GET_META_DATA)
-                val wechatAppId = appInfo.metaData.getString("weChatAppId")
-                if (wechatAppId != null ){
-                    WXAPiHandler.setupWxApi(wechatAppId, this)
-                    WXAPiHandler.setCoolBool(true)
-                    io.flutter.Log.d("fluwx", "weChatAppId:$wechatAppId")
-                }else {
-                    io.flutter.Log.e("fluwx", "can't load meta-data weChatAppId")
-                }
-            }
-            WXAPiHandler.wxApi?.handleIntent(intent, this)
-        } catch (e: Exception) {
-            e.printStackTrace()
-            startSpecifiedActivity(defaultFlutterActivityAction())
-            finish()
-        }
-        Log.e("WXPayEntryActivity", "onCreate")
-    }
-
-    override fun onNewIntent(intent: Intent) {
-        super.onNewIntent(intent)
-
-        setIntent(intent)
-
-        try {
-            WXAPiHandler.wxApi?.handleIntent(intent, this)
-        } catch (e: Exception) {
-            e.printStackTrace()
-            startSpecifiedActivity(defaultFlutterActivityAction())
-            finish()
-        }
-    }
-    
-    override fun onReq(req: BaseReq) {
-        super.onReq(req)
-        FluwxRequestHandler.onReq(req, this)
-        Log.e("WXPayEntryActivity", "req: $req")
-
-    }
-
-    override fun onResp(resp: BaseResp) {
-        FluwxResponseHandler.handleResponse(resp)
-        super.onResp(resp)
-        Log.e("WXPayEntryActivity", "resp: $resp")
-    }
-
-
-
-    private fun startSpecifiedActivity(action: String, bundle: Bundle? = null, bundleKey: String? = null) {
-        Intent(action).run {
-            bundleKey?.let {
-                putExtra(bundleKey, bundle)
-            }
-            addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT)
-            packageManager?.let {
-                resolveActivity(packageManager)?.also {
-                    startActivity(this)
-                    finish()
-                }
-            }
-        }
-    }
-
-    private fun defaultFlutterActivityAction(): String = "$packageName.FlutterActivity"
-    
-}

android/app/src/main/kotlin/com/zsw/huixiang_app/MainActivity.kt

@@ -0,0 +1,5 @@
+package com.zsw.huixiang_app
+
+import io.flutter.embedding.android.FlutterActivity
+
+class MainActivity: FlutterActivity()

android/app/src/main/res/drawable-v21/launch_background.xml

@@ -4,22 +4,22 @@
     <item android:drawable="?android:colorBackground" />
 
     <!-- You can insert your own image assets here -->
-    <item android:width="100dp" android:height="100dp" android:bottom="153dp" android:gravity="bottom|center">
+<!--    <item android:width="100dp" android:height="100dp" android:bottom="153dp" android:gravity="bottom|center">-->
-        <bitmap
+<!--        <bitmap-->
-            android:gravity="center"
+<!--            android:gravity="center"-->
-            android:src="@mipmap/icon_splash_logo" />
+<!--            android:src="@mipmap/icon_splash_logo" />-->
-    </item>
+<!--    </item>-->
 
     <item android:width="130dp" android:height="30dp" android:bottom="80dp" android:gravity="bottom|center">
         <bitmap
             android:gravity="center"
-            android:src="@mipmap/icon_splash_bottom" />
+            android:src="@mipmap/icon_splash2" />
     </item>
 
-    <item android:bottom="222dp" android:gravity="center">
+    <item android:bottom="107dp" android:gravity="center">
         <bitmap
             android:gravity="center"
-            android:src="@mipmap/icon_splash_center" />
+            android:src="@mipmap/icon_splash1" />
     </item>
 
 </layer-list>

android/app/src/main/res/drawable/launch_background.xml

@@ -4,22 +4,22 @@
     <item android:drawable="@android:color/white" />
 
     <!-- You can insert your own image assets here -->
-    <item android:width="100dp" android:height="100dp" android:bottom="153dp" android:gravity="bottom|center">
+<!--    <item android:width="100dp" android:height="100dp" android:bottom="153dp" android:gravity="bottom|center">-->
-        <bitmap
+<!--        <bitmap-->
-            android:gravity="center"
+<!--            android:gravity="center"-->
-            android:src="@mipmap/icon_splash_logo" />
+<!--            android:src="@mipmap/icon_splash_logo" />-->
-    </item>
+<!--    </item>-->
 
     <item android:width="130dp" android:height="30dp" android:bottom="80dp" android:gravity="bottom|center">
         <bitmap
             android:gravity="center"
-            android:src="@mipmap/icon_splash_bottom" />
+            android:src="@mipmap/icon_splash2" />
     </item>
 
     <item android:bottom="107dp" android:gravity="center">
         <bitmap
             android:gravity="center"
-            android:src="@mipmap/icon_splash_center" />
+            android:src="@mipmap/icon_splash1" />
     </item>
 
 <!--    <item>-->

android/build.gradle

@@ -1,6 +1,9 @@
 buildscript {
-    ext.kotlin_version = '1.4.10'
+    ext.kotlin_version = '1.8.10'
     repositories {
+        maven { url "https://www.jitpack.io" }
+        maven {url 'https://developer.huawei.com/repo/'}
+        maven { url 'https://repo1.maven.org/maven2/' }
         maven {
             url 'https://maven.aliyun.com/repository/google'
         }
@@ -8,26 +11,24 @@ buildscript {
             url 'https://maven.aliyun.com/repository/jcenter'
         }
         maven {
+            allowInsecureProtocol = true
             url 'http://maven.aliyun.com/nexus/content/groups/public'
         }
-//        google()
-//        jcenter()
-        jcenter(){
-            url "http://jcenter.bintray.com/"
-        }
         maven {
+            allowInsecureProtocol = true
             url "http://mvn.mob.com/android"
         }
-        maven { url "https://www.jitpack.io" }
-        maven {url 'https://developer.huawei.com/repo/'}
     }
 
     dependencies {
-//        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:7.4.2'
-        classpath 'com.android.tools.build:gradle:4.1.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.huawei.agconnect:agcp:1.4.1.300'
+//        classpath 'com.huawei.agconnect:agcp:1.4.1.300'
         classpath 'com.mob.sdk:MobSDK:+'
+        classpath fileTree(include:['*.jar'], dir:'libs')
+        classpath 'com.umeng.umsdk:common:9.4.7'
+        classpath 'com.umeng.umsdk:asms:1.4.0'
+        classpath 'com.umeng.umsdk:abtest:1.0.0'
     }
 }
 
@@ -37,18 +38,14 @@ allprojects {
             url 'https://maven.aliyun.com/repository/google'
         }
         maven {
-            url 'https://maven.aliyun.com/repository/jcenter'
+            allowInsecureProtocol = true
-        }
-        maven {
             url 'http://maven.aliyun.com/nexus/content/groups/public'
         }
-//        google()
-//        jcenter()
         maven {
+            allowInsecureProtocol = true
             url "http://mvn.mob.com/android"
         }
-        maven { url "https://www.jitpack.io" }
+        google()
-        maven { url 'https://developer.huawei.com/repo/'}
     }
 }
 
@@ -58,6 +55,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

android/gradle.properties

@@ -3,3 +3,5 @@ org.gradle.jvmargs=-Xmx4096m
 android.useAndroidX=true
 android.enableJetifier=true
 MobSDK.mobEnv=x
+MobSDK.spEdition=FP
+android.injected.testOnly=false

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,8 +1,5 @@
-#Fri Jun 23 08:50:38 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-#distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
-#distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip

android/tmpmob/ShareSDK/assets/ShareSDK.xml

@@ -55,4 +55,5 @@
 <Littleredbook Enable="false" />
 <Watermelonvideo Enable="false" />
 <Tiktok Enable="false" />
+<Taptap Enable="false" />
 </DevInfor>