Merge branch 'master' into dev

ios/Runner.xcodeproj/project.pbxproj

@@ -846,7 +846,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 20;
+				CURRENT_PROJECT_VERSION = 21;
 				DEVELOPMENT_TEAM = YF3Q8DVP52;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -880,7 +880,7 @@
 					"$(PROJECT_DIR)/UniMPSDK/Libs",
 					"$(PROJECT_DIR)/wx/Libs",
 				);
-				MARKETING_VERSION = 1.0.20;
+				MARKETING_VERSION = 1.0.21;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -1045,7 +1045,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 20;
+				CURRENT_PROJECT_VERSION = 21;
 				DEVELOPMENT_TEAM = YF3Q8DVP52;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1079,7 +1079,7 @@
 					"$(PROJECT_DIR)/UniMPSDK/Libs",
 					"$(PROJECT_DIR)/wx/Libs",
 				);
-				MARKETING_VERSION = 1.0.20;
+				MARKETING_VERSION = 1.0.21;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -1137,7 +1137,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 20;
+				CURRENT_PROJECT_VERSION = 21;
 				DEVELOPMENT_TEAM = YF3Q8DVP52;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1171,7 +1171,7 @@
 					"$(PROJECT_DIR)/UniMPSDK/Libs",
 					"$(PROJECT_DIR)/wx/Libs",
 				);
-				MARKETING_VERSION = 1.0.20;
+				MARKETING_VERSION = 1.0.21;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"$(inherited)",

ios/Runner/Info.plist

@@ -50,17 +50,19 @@
 		<string>weixinULAPI</string>
 		<string>weixin</string>
 		<string>wechat</string>
-        <!-- Facebook URL Scheme 白名单-->
-        <string>fbapi</string>
-        <string>fb-messenger-api</string>
-        <string>fbauth2</string>
-        <string>fbshareextension</string>
-        <!-- Twitter URL Scheme 白名单-->
-        <string>twitter</string>
-        <string>twitterauth</string>
+		<string>fbapi</string>
+		<string>fb-messenger-api</string>
+		<string>fbauth2</string>
+		<string>fbshareextension</string>
+		<string>twitter</string>
+		<string>twitterauth</string>
 	</array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>MOBAppKey</key>
+	<string>m33ee7650da86a</string>
+	<key>MOBAppSecret</key>
+	<string>876f2eaebfd2a88c89d5fc294397838c</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>

lib/main.dart

@@ -94,6 +94,7 @@ initSdk() async {
   xgFlutterPlugin.startXg("1680005688", "IYIB3R2XRE22");
 
   ShareSDKRegister shareSDKRegister = ShareSDKRegister();
+  // shareSDKRegister.setup
   shareSDKRegister.setupWechat("wx3b269e795ed23e5f", "64020361b8ec4c99936c0e3999a9f249", "https://hx.lotus-wallet.com/app/");
   shareSDKRegister.setupFacebook("523308712059457", "d3a1b6377100871799d8973fbe84794a", "回乡");
   SharesdkPlugin.regist(shareSDKRegister);