08/07

android/app/src/main/AndroidManifest.xml

@@ -1,4 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.yuanren.dianjing">
 
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
@@ -11,7 +12,8 @@
         android:icon="@mipmap/ic_launcher"
         android:label="EMMC战神竞技场"
         android:networkSecurityConfig="@xml/network_security_config"
-        android:usesCleartextTraffic="true">
+        android:usesCleartextTraffic="true"
+        tools:ignore="GoogleAppIndexingWarning">
         <activity
             android:name="com.yalantis.ucrop.UCropActivity"
             android:screenOrientation="portrait"

ios/Podfile.lock

@@ -1,14 +1,29 @@
 PODS:
+  - battery (0.0.1):
+    - Flutter
+  - Bugly (2.5.0)
   - file_picker (0.0.1):
     - Flutter
   - Flutter (1.0.0)
+  - flutter_bugly (0.0.1):
+    - Bugly
+    - Flutter
   - flutter_picker (0.0.1):
     - Flutter
+  - fluwx (0.0.1):
+    - Flutter
+  - FMDB (2.7.5):
+    - FMDB/standard (= 2.7.5)
+  - FMDB/standard (2.7.5)
+  - get_ip (0.0.1):
+    - Flutter
   - image_cropper (0.0.1):
     - Flutter
-    - TOCropViewController (~> 2.4.0)
-  - JCore (2.0.0)
-  - JPush (3.2.0):
+    - TOCropViewController (~> 2.5.0)
+  - image_picker (0.0.1):
+    - Flutter
+  - JCore (2.1.1)
+  - JPush (3.2.2):
     - JCore (< 3.0.0, >= 2.0.0)
   - jpush_flutter (0.0.2):
     - Flutter
@@ -25,44 +40,65 @@ PODS:
     - SCLAlertView-Objective-C
   - shared_preferences (0.0.1):
     - Flutter
-  - TOCropViewController (2.4.0)
-  - TXLiteAVSDK_Professional (6.3.7088)
+  - sqflite (0.0.1):
+    - Flutter
+    - FMDB (~> 2.7.2)
+  - TOCropViewController (2.5.1)
+  - TXLiteAVSDK_Professional (6.5.7273)
   - url_launcher (0.0.1):
     - Flutter
   - video_player (0.0.1):
     - Flutter
 
 DEPENDENCIES:
+  - battery (from `.symlinks/plugins/battery/ios`)
   - file_picker (from `.symlinks/plugins/file_picker/ios`)
-  - Flutter (from `.symlinks/flutter/ios-release`)
+  - Flutter (from `.symlinks/flutter/ios`)
+  - flutter_bugly (from `.symlinks/plugins/flutter_bugly/ios`)
   - flutter_picker (from `.symlinks/plugins/flutter_picker/ios`)
+  - fluwx (from `.symlinks/plugins/fluwx/ios`)
+  - get_ip (from `.symlinks/plugins/get_ip/ios`)
   - image_cropper (from `.symlinks/plugins/image_cropper/ios`)
+  - image_picker (from `.symlinks/plugins/image_picker/ios`)
   - jpush_flutter (from `.symlinks/plugins/jpush_flutter/ios`)
   - package_info (from `.symlinks/plugins/package_info/ios`)
   - path_provider (from `.symlinks/plugins/path_provider/ios`)
   - screen (from `.symlinks/plugins/screen/ios`)
   - screen_stream_plugin (from `.symlinks/plugins/screen_stream_plugin/ios`)
   - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
+  - sqflite (from `.symlinks/plugins/sqflite/ios`)
   - TXLiteAVSDK_Professional (from `http://pod-1252463788.cosgz.myqcloud.com/liteavsdkspec/TXLiteAVSDK_Professional.podspec`)
   - url_launcher (from `.symlinks/plugins/url_launcher/ios`)
   - video_player (from `.symlinks/plugins/video_player/ios`)
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
+    - Bugly
+    - FMDB
     - JCore
     - JPush
     - SCLAlertView-Objective-C
     - TOCropViewController
 
 EXTERNAL SOURCES:
+  battery:
+    :path: ".symlinks/plugins/battery/ios"
   file_picker:
     :path: ".symlinks/plugins/file_picker/ios"
   Flutter:
-    :path: ".symlinks/flutter/ios-release"
+    :path: ".symlinks/flutter/ios"
+  flutter_bugly:
+    :path: ".symlinks/plugins/flutter_bugly/ios"
   flutter_picker:
     :path: ".symlinks/plugins/flutter_picker/ios"
+  fluwx:
+    :path: ".symlinks/plugins/fluwx/ios"
+  get_ip:
+    :path: ".symlinks/plugins/get_ip/ios"
   image_cropper:
     :path: ".symlinks/plugins/image_cropper/ios"
+  image_picker:
+    :path: ".symlinks/plugins/image_picker/ios"
   jpush_flutter:
     :path: ".symlinks/plugins/jpush_flutter/ios"
   package_info:
@@ -75,6 +111,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/screen_stream_plugin/ios"
   shared_preferences:
     :path: ".symlinks/plugins/shared_preferences/ios"
+  sqflite:
+    :path: ".symlinks/plugins/sqflite/ios"
   TXLiteAVSDK_Professional:
     :podspec: http://pod-1252463788.cosgz.myqcloud.com/liteavsdkspec/TXLiteAVSDK_Professional.podspec
   url_launcher:
@@ -83,12 +121,19 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/video_player/ios"
 
 SPEC CHECKSUMS:
+  battery: 8397f8af82e33419d2e07140c96ce2023957cc7d
+  Bugly: 3ca9f255c01025582df26f9222893b383c7e4b4e
   file_picker: 78c3344d9b2c343bb3090c2f032b796242ebaea7
   Flutter: 9d0fac939486c9aba2809b7982dfdbb47a7b0296
+  flutter_bugly: 86e034e3ce7165745c676cc3fe0895e9e676cfd3
   flutter_picker: 8cd16302a9806a9789ba6e3ce85558c70c43b7f4
-  image_cropper: 43c1f7f5ea92b68f43cae9340f55c84bdaad54bb
-  JCore: b962a2a1a61dc911ce5e79ba3ff21a95edaf5d23
-  JPush: 8459e7a709ad86f95884fcb49cbd57a6da24744e
+  fluwx: 9cbb1181ef8fd772f7388714ec9b5dfd3a5d0108
+  FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
+  get_ip: d2244f845cd4d285368dfbdb84997c20467c6c5f
+  image_cropper: e0a40e80b2107490926d0f15e3b42f44867c15b4
+  image_picker: 86b84c4fe89267356a1f17297a45b5d317ebd2e7
+  JCore: 4072327557f0b83cc22dd4041f2f839740c0077b
+  JPush: 0e9088c85c73275629facc311fe5992dfac36eeb
   jpush_flutter: 1cc882286b5cac7a307a635fbd2a7c296730ca59
   package_info: d7c98b64f60add4c2908b9d94d82a45d3c8827ad
   path_provider: 09407919825bfe3c2deae39453b7a5b44f467873
@@ -96,8 +141,9 @@ SPEC CHECKSUMS:
   screen: 22ab9c4a784112d4b21ad7d80e81729e0afdaa65
   screen_stream_plugin: 6eb868d62a7a7f7c734fcfdfe2a37896ea5857b8
   shared_preferences: 5a1d487c427ee18fcd3ea1f2a131569481834b53
-  TOCropViewController: 368d8df3ea43b62c3dc5a61f11b9048274d240bd
-  TXLiteAVSDK_Professional: d723079dab26cb85e70db9a3bf673753f45625ea
+  sqflite: d1612813fa7db7c667bed9f1d1b508deffc56999
+  TOCropViewController: 00dc36c4e4a0f4a45efa91adbf22df8a4fae01d3
+  TXLiteAVSDK_Professional: f966aa6847d5a6e79f5c79f460d7aa396e1faf7b
   url_launcher: 92b89c1029a0373879933c21642958c874539095
   video_player: 906796a841943c8d370ac7c13b18039aa9b56498
 

ios/Runner.xcodeproj/project.pbxproj

@@ -349,7 +349,7 @@
 			);
 			inputPaths = (
 				"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
-				"${PODS_ROOT}/../.symlinks/flutter/ios-release/Flutter.framework",
+				"${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (

ios/Runner/Info.plist

@@ -20,10 +20,25 @@
 	<string>$(FLUTTER_BUILD_NAME)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>wechat</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>wx62f8a9c1d3d70245</string>
+			</array>
+		</dict>
+	</array>
 	<key>CFBundleVersion</key>
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
+		<string>weixin</string>
+		<string>wechat</string>
 		<string>pubgmhd1106467070</string>
 	</array>
 	<key>LSRequiresIPhoneOS</key>

lib/pages/ChoosePay.dart

@@ -100,11 +100,12 @@ class _ChoosePayState extends State<ChoosePay> with WidgetsBindingObserver {
             });
             print(StoreProvider.of<AppState>(context).state.userInfo.id);
             if (res.success) {
-              fluwx.launchMiniProgram(username: "gh_a6a98cd9b3cd", path: "page/component/confirm/index?data=" + res.data["data"]);
-
+              fluwx.launchMiniProgram(username: "gh_a6a98cd9b3cd", path: "page/component/confirm/index?data=" + res.data["data"]).then((res) {
+                print(res);
+              });
               MyDialog.showDialog(context, '已经成功调起微信支付', submitText: '支付完成', isCancel: true, onsubmit: () async {
                 final Result res2 = await HttpManager.get('wxpayTemp/getWxpayTemp', data: {'id': res.data["id"]});
-                if (res2.success && res2.data!=new Map()) {
+                if (res2.success && res2.data != new Map()) {
                   if (res2.data['resultCode'] == 'NOT_PAY') {
                     Toast.show(context, '支付取消', 1500, 'info');
                   } else {
@@ -116,6 +117,8 @@ class _ChoosePayState extends State<ChoosePay> with WidgetsBindingObserver {
               });
             }
 
+            //  String str= 'eyJhbW91bnQiOiIxIiwiYX
+
             //  String str= 'eyJhbW91bnQiOiIxIiwiYXR0YWNoIjoie1widG90YWxcIjoxLFwicHJvZHVjdElkXCI6XCIxXCIsXCJ1c2VySWRcIjpcIjg0NzA1XCIsXCJjYXNoXCI6MTB9IiwiYm9keSI6IjHpl6jnpagiLCJtY2hfaWQiOiIxMDAwMDAwODM1NDEiLCJub25jZV9zdHIiOiI1ZmM3NWVlZmY0MjA0MGEwYmEwMWQwZDE2NGJhYmU2YyIsIm5vdGlmeV91cmwiOiJodHRwOi8vMTIzLjU4LjI0MC4xMzg6OTAwMC8iLCJvdXRfdHJhZGVfbm8iOiIxNTY0OTkzMjYwNDc0NjQxNTcyNyIsInBheW1lbnRfdHlwZSI6InRyYWRlLndlaXhpbi5hcHAiLCJyZXR1cm5fdXJsIjoiaHR0cDovLzEyMy41OC4yNDAuMTM4OjkwMDAvbHlmL25vdGlmeSIsInNpZ24iOiIxYjg0NWE4ZjNmYWI0OTA1NTViYWE5MGZkYzFkODc1MyIsInNpZ25fdHlwZSI6Ik1ENSIsInNwYmlsbF9jcmVhdGVfaXAiOiIxMTkuMTM3LjU1LjE4OSJ9';            fluwx.launchMiniProgram(username: "gh_a6a98cd9b3cd",path:"page/component/confirm/index?data="+str);
             // fluwx.launchMiniProgram(username: "gh_a6a98cd9b3cd",path:"page/component/confirm/index?data="+str);
             // Toast.show(context, '加载中', -1, 'loading');

lib/pages/RoomInfo.dart

@@ -156,12 +156,12 @@ class RoomInfoState extends State<RoomInfo> with SingleTickerProviderStateMixin
         if (await canLaunch(url)) {
           Timer(Duration(seconds: 1), () async {
             await launch(url);
-            showSucessInfo();
+            showSucessInfo(3);
           });
         } else {
           MyDialog.showDialog(context, '自动启动游戏失败，请手动切换到游戏app开始竞赛', submitText: '知道了');
           Timer(Duration(seconds: 10), () {
-            showSucessInfo();
+            showSucessInfo(3);
           });
 
           throw 'Could not launch $url';
@@ -173,9 +173,10 @@ class RoomInfoState extends State<RoomInfo> with SingleTickerProviderStateMixin
   }
 
 //开始录屏提示框
-  void showSucessInfo() {
+  void showSucessInfo(status) {
     MyDialog.showDialog(context, '您已经完成比赛了吗，确认完成，那就点击下方完成竞赛按钮，上传本次成绩，祝您赢取大奖', title: '完成比赛', submitText: '我已完成比赛', onsubmit: () async {
-      HttpManager.post('playerInfo/update', data: {'id': playerInfo.id, 'statusFlag': 3, 'endTime': DateTime.now().millisecondsSinceEpoch});
+    
+      HttpManager.post('playerInfo/update', data: {'id': playerInfo.id, 'statusFlag': status, 'endTime': DateTime.now().millisecondsSinceEpoch});
       bool success = await ScreenStreamPlugin.stop();
 
       Timer(Duration(seconds: 1), () {
@@ -307,7 +308,7 @@ class RoomInfoState extends State<RoomInfo> with SingleTickerProviderStateMixin
     }
 
     if (houseInfo.statusFlag == 2 && playerInfo.beginTime != null && playerInfo.endTime == null) {
-      showSucessInfo();
+      showSucessInfo(9);
     }
   }
 

pubspec.lock

@@ -250,9 +250,11 @@ packages:
   fluwx:
     dependency: "direct main"
     description:
-      name: fluwx
-      url: "https://pub.dartlang.org"
-    source: hosted
+      path: "."
+      ref: HEAD
+      resolved-ref: fd8b97739082a51b64afa26501c9c284088c460a
+      url: "https://github.com/x1ongzhu/fluwx.git"
+    source: git
     version: "1.0.4"
   front_end:
     dependency: transitive

pubspec.yaml

@@ -41,8 +41,10 @@ dependencies:
   battery: ^0.3.0+4
   cached_network_image: ^0.8.0
   image_picker: ^0.6.0+4
-  fluwx: ^1.0.4
   get_ip: ^0.3.0
+  fluwx:
+    git:
+      url: https://github.com/x1ongzhu/fluwx.git
 
 dev_dependencies:
   build_runner: ^1.1.1