ios,更改

ios/Podfile.lock

@@ -213,10 +213,10 @@ PODS:
   - SSZipArchive (2.4.2)
   - thumbnails (0.0.1):
     - Flutter
-  - TPNS-iOS (1.3.3.0)
-  - tpns_flutter_plugin (1.1.2):
+  - TPNS-iOS (1.3.4.1)
+  - tpns_flutter_plugin (1.1.4):
     - Flutter
-    - TPNS-iOS (= 1.3.3.0)
+    - TPNS-iOS (= 1.3.4.1)
   - url_launcher (0.0.1):
     - Flutter
   - video_player (0.0.1):
@@ -317,7 +317,7 @@ SPEC CHECKSUMS:
   flutter_baidu_mapapi_search: 4cffaa74e739a4114595c4f82f790e1783bb612d
   flutter_baidu_mapapi_utils: a5bd582b91ecd35be1bc45558b38f49d5684f70a
   flutter_bmflocation: 12f1ba91bae4b16d78d4f475023e0254ed351f1c
-  fluwx: c192ef1ea3617badb813fa1a761ffc5c9c12208a
+  fluwx: 02670633ce7509206f62b366e9734e7dda81e100
   image_pickers: 5e6ec7083f9363d014c0fb061f1b9cd97bb5e451
   mob_sharesdk: c771f001e00739d24301a9fa250247601efe7a3c
   MOBFoundation: 2abd23c80c33d1337d30dc4b0018ed914cef8f8e
@@ -330,8 +330,8 @@ SPEC CHECKSUMS:
   sharesdk_plugin: 5a59e49d2d5e55c8e8f67cc9ddf05172c2494a6b
   SSZipArchive: e7b4f3d9e780c2acc1764cd88fbf2de28f26e5b2
   thumbnails: bb4f4e9bb4b51c8ae4e6ad9a2fa81373f9b634ad
-  TPNS-iOS: 57a146496858ba2fb5d43e5f240feb19243b69cb
-  tpns_flutter_plugin: a366649c8ad71f19dfb864d3c994ed0480b69daa
+  TPNS-iOS: 36c335eff80670de6ede780ab827f679d78f64ff
+  tpns_flutter_plugin: 9bbb12c9cc9682a5aec38a7def5c01ddb0cf0723
   url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
   video_player: 9cc823b1d9da7e8427ee591e8438bfbcde500e6e
   wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f

ios/Runner.xcodeproj/project.pbxproj

@@ -616,7 +616,7 @@
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 79;
+				CURRENT_PROJECT_VERSION = 82;
 				DEVELOPMENT_TEAM = YF3Q8DVP52;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -666,7 +666,7 @@
 					"$(PROJECT_DIR)/baidu",
 					"$(PROJECT_DIR)/Runner/baidu",
 				);
-				MARKETING_VERSION = 1.0.79;
+				MARKETING_VERSION = 1.0.82;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -816,7 +816,7 @@
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 79;
+				CURRENT_PROJECT_VERSION = 82;
 				DEVELOPMENT_TEAM = YF3Q8DVP52;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -866,7 +866,7 @@
 					"$(PROJECT_DIR)/baidu",
 					"$(PROJECT_DIR)/Runner/baidu",
 				);
-				MARKETING_VERSION = 1.0.79;
+				MARKETING_VERSION = 1.0.82;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -907,7 +907,7 @@
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 79;
+				CURRENT_PROJECT_VERSION = 82;
 				DEVELOPMENT_TEAM = YF3Q8DVP52;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -957,7 +957,7 @@
 					"$(PROJECT_DIR)/baidu",
 					"$(PROJECT_DIR)/Runner/baidu",
 				);
-				MARKETING_VERSION = 1.0.79;
+				MARKETING_VERSION = 1.0.82;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",

ios/Runner/AppDelegate.mm

@@ -1,6 +1,5 @@
 #import "AppDelegate.h"
 #import "GeneratedPluginRegistrant.h"
-#import "WXApi.h"
 
 
 @implementation AppDelegate
@@ -10,12 +9,28 @@
   [GeneratedPluginRegistrant registerWithRegistry:self];
   // Override point for customization after application launch.
 
+FlutterViewController* controller = (FlutterViewController*)self.window.rootViewController;
+__block NSDictionary *remoteNotification = [launchOptions objectForKey:UIApplicationLaunchOptionsRemoteNotificationKey];
 
-  return [super application:application didFinishLaunchingWithOptions:launchOptions];
-
+    FlutterMethodChannel* bridgeAppChannel = [FlutterMethodChannel methodChannelWithName:@"bridge" binaryMessenger:(NSObject<FlutterBinaryMessenger> *)controller];
+    [bridgeAppChannel setMethodCallHandler:^(FlutterMethodCall * _Nonnull call, FlutterResult  _Nonnull result) {
+        NSString * method = call.method;
+        if ([method isEqual:@"action"]) {
+            if (remoteNotification != NULL) {
+                result(remoteNotification[@"custom"]);
+                remoteNotification = nil;
             }
+            result(@"");
+        }
+        if ([method isEqual:@"toAppStore"]) {
+            NSString *appURL = @"https://itunes.apple.com/cn/app/1575124838?action=write-review";
+            [[UIApplication sharedApplication] openURL:[NSURL URLWithString:appURL]];
+            result(@"");
+        }
+        //result(FlutterMethodNotImplemented);
+    }];
 
-
-
+  return [super application:application didFinishLaunchingWithOptions:launchOptions];
+}
 
 @end

lib/community/community_view/class_details_video.dart

@@ -97,8 +97,8 @@ class ClassDetailsVideoState extends State<ClassDetailsVideo> {
   Widget build(BuildContext context) {
     return Container(
         key: globalKey,child:(videoPlayerController?.value?.isInitialized ?? false) ?videoWidget(
-      MediaQuery.of(context).size.width,
-      (MediaQuery.of(context).size.width/videoPlayerController.value.aspectRatio)-43,
+      MediaQuery.of(context).size.height,
+      (MediaQuery.of(context).size.height/videoPlayerController.value.aspectRatio)-43,
       widget.coverImg,
     ):Container());
   }

lib/community/headlines/article_page.dart

@@ -134,7 +134,7 @@ class _ArticlePage extends State<ArticlePage>
       articles.addAll(baseData.data.list);
       else
       articleTop.addAll(baseData.data.list);
-      if (baseData.data.pageNum == baseData.data.pages) {
+      if (baseData.data.pageNum == baseData.data.pages && !isHot) {
         refreshController.loadNoData();
       } else {
         pageNum += 1;

lib/login/login_page.dart

@@ -342,7 +342,7 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
         EasyLoading.dismiss();
 
       } else {
-        SmartDialog.showToast("${value?.msg ??""}", alignment: Alignment.center);
+        // SmartDialog.showToast("${value?.msg ??""}", alignment: Alignment.center);
       }
     });
   }

lib/main_page.dart

@@ -191,8 +191,7 @@ class _MainPage extends State<MainPage> with WidgetsBindingObserver {
     if (sharedPreferences.getString("token") == null ||
         sharedPreferences.getString("token") == "") return;
     String startIntent;
-    if(Platform.isAndroid)
-      startIntent = await Bridge.getStartIntent();
+    if(Platform.isAndroid) startIntent= await Bridge.getStartIntent();
     print("intent:$startIntent");
     String pushData = "";
     if (startIntent != null && startIntent != "") {

lib/retrofit/min_api.dart

@@ -21,15 +21,15 @@ import 'data/shoppingCart.dart';
 
 part 'min_api.g.dart';
 
-// const base_url = "https://pos.api.lotus-wallet.com/app/"; ///正式
-// const baseUrl = "https://pos.api.lotus-wallet.com/app/"; ///正式
+const base_url = "https://pos.api.lotus-wallet.com/app/"; ///正式
+const baseUrl = "https://pos.api.lotus-wallet.com/app/"; ///正式
 
 
 // const base_url = "http://user.prod.kunqi.lotus-wallet.com/app/"; ///222
 // const baseUrl = "http://user.prod.kunqi.lotus-wallet.com/app/"; ///222
 
-const base_url = "http://192.168.10.236:8765/app/";///费韬
-const baseUrl = "http://192.168.10.236:8765/app/";///费韬
+// const base_url = "http://192.168.10.236:8765/app/";///费韬
+// const baseUrl = "http://192.168.10.236:8765/app/";///费韬
 
 
 // const base_url = "http://192.168.10.143:8765/app/";///詹云久

lib/retrofit/min_api.g.dart

@@ -9,7 +9,7 @@ part of 'min_api.dart';
 class _MinApiService implements MinApiService {
   _MinApiService(this._dio, {this.baseUrl}) {
     ArgumentError.checkNotNull(_dio, '_dio');
-    baseUrl ??= 'http://192.168.10.236:8765/app/';
+    baseUrl ??= 'https://pos.api.lotus-wallet.com/app/';
   }
 
   final Dio _dio;

lib/retrofit/retrofit_api.dart

@@ -57,14 +57,14 @@ import 'data/vip_rule_details.dart';
 
 part 'retrofit_api.g.dart';
 
-// const base_url = "https://pos.platform.lotus-wallet.com/app/"; ///正式
-// const baseUrl = "https://pos.platform.lotus-wallet.com/app/"; ///正式
+const base_url = "https://pos.platform.lotus-wallet.com/app/"; ///正式
+const baseUrl = "https://pos.platform.lotus-wallet.com/app/"; ///正式
 
 // const base_url = "http://platform.prod.kunqi.lotus-wallet.com/app/"; ///222
 // const baseUrl = "http://platform.prod.kunqi.lotus-wallet.com/app/"; ///222
 
-const base_url = "http://192.168.10.236:8766/app/";   ///费韬
-const baseUrl = "http://192.168.10.236:8766/app/";    ///费韬
+// const base_url = "http://192.168.10.236:8766/app/";   ///费韬
+// const baseUrl = "http://192.168.10.236:8766/app/";    ///费韬
 
 // const base_url = "http://192.168.10.37:8766/app/";
 // const baseUrl = "http://192.168.10.37:8766/app/";

lib/retrofit/retrofit_api.g.dart

@@ -9,7 +9,7 @@ part of 'retrofit_api.dart';
 class _ApiService implements ApiService {
   _ApiService(this._dio, {this.baseUrl}) {
     ArgumentError.checkNotNull(_dio, '_dio');
-    baseUrl ??= 'http://192.168.10.236:8766/app/';
+    baseUrl ??= 'https://pos.platform.lotus-wallet.com/app/';
   }
 
   final Dio _dio;
@@ -1837,7 +1837,7 @@ class _ApiService implements ApiService {
     const _extra = <String, dynamic>{};
     final queryParameters = <String, dynamic>{};
     final _data = <String, dynamic>{};
-    final _result = await _dio.request<Map<String, dynamic>>('coupon/detail/',
+    final _result = await _dio.request<Map<String, dynamic>>('/coupon/detail/',
         queryParameters: queryParameters,
         options: RequestOptions(
             method: 'GET',
@@ -1858,7 +1858,8 @@ class _ApiService implements ApiService {
     const _extra = <String, dynamic>{};
     final queryParameters = <String, dynamic>{};
     final _data = <String, dynamic>{};
-    final _result = await _dio.request<Map<String, dynamic>>('/member/detail/$id',
+    final _result = await _dio.request<Map<String, dynamic>>(
+        '/member/detail/$id',
         queryParameters: queryParameters,
         options: RequestOptions(
             method: 'GET',
@@ -1873,14 +1874,12 @@ class _ApiService implements ApiService {
     return value;
   }
 
-
   @override
   Future<BaseData<ActivityPos>> appPopup() async {
     const _extra = <String, dynamic>{};
     final queryParameters = <String, dynamic>{};
     final _data = <String, dynamic>{};
-    final _result = await _dio.request<Map<String, dynamic>>(
-        '/home/appPopup',
+    final _result = await _dio.request<Map<String, dynamic>>('/home/appPopup',
         queryParameters: queryParameters,
         options: RequestOptions(
             method: 'GET',
@@ -1900,7 +1899,8 @@ class _ApiService implements ApiService {
     const _extra = <String, dynamic>{};
     final queryParameters = <String, dynamic>{};
     final _data = <String, dynamic>{};
-    final _result = await _dio.request<Map<String, dynamic>>('/member/deleteMine',
+    final _result = await _dio.request<Map<String, dynamic>>(
+        '/member/deleteMine',
         queryParameters: queryParameters,
         options: RequestOptions(
             method: 'GET',
@@ -1914,5 +1914,4 @@ class _ApiService implements ApiService {
     );
     return value;
   }
-
 }

lib/setting/about_page.dart

@@ -50,6 +50,8 @@ class _AboutPage extends State<AboutPage> {
             ),
             padding: EdgeInsets.only(top: 25.h),
             alignment: Alignment.center,
+            child: SingleChildScrollView(
+              physics: BouncingScrollPhysics(),
               child:Column(
               children: [
                 Image.asset(
@@ -95,13 +97,13 @@ class _AboutPage extends State<AboutPage> {
                   GestureDetector(
                     child: settingSingleItem(S.of(context).geiwopingfen),
                     onTap: () {
-                      Bridge.toAppStore().then((value) {
-                        if (Platform.isAndroid && value == "0") {
-                          SmartDialog.showToast("手机没有安装应用市场app",
-                              alignment: Alignment.center);
-                        }
-                      });
-                      // showAlertDialog(version);
+                      // Bridge.toAppStore().then((value) {
+                        // if (Platform.isAndroid && value == "0") {
+                        //   SmartDialog.showToast("手机没有安装应用市场app",
+                        //       alignment: Alignment.center);
+                        // }
+                      // });
+                      showAlertDialog(version);
                     },
                   ),
                 GestureDetector(
@@ -124,8 +126,11 @@ class _AboutPage extends State<AboutPage> {
                     color: Colors.grey,
                   ),
                 ),
-              ],
+                SizedBox(
+                  height:100.h,
                 ),
+              ],
+            ),)
           ),
           Container(
             margin: EdgeInsets.only(bottom: 23.h),

lib/setting/logout_ing.dart

@@ -336,7 +336,7 @@ class _LogoutIng extends State<LogoutIng> {
         return AlertDialog(
           content:Container(
             width: double.infinity,
-            height: 350.h,
+            height: 400.h,
             child: Column(
               mainAxisAlignment: MainAxisAlignment.center,
               crossAxisAlignment: CrossAxisAlignment.center,

lib/view_widget/update_dialog.dart

@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:flutter/material.dart';
 import 'package:huixiang/utils/bridge.dart';
@@ -23,7 +25,7 @@ class _UpdateDialog extends State<UpdateDialog> {
       child: Center(
         child: Container(
           width: MediaQuery.of(context).size.width - 80.w,
-          height: 150.h,
+          height: 180.h,
           decoration: BoxDecoration(
             color: Colors.white,
             borderRadius: BorderRadius.circular(8),
@@ -32,7 +34,7 @@ class _UpdateDialog extends State<UpdateDialog> {
             children: [
               Container(
                 width: double.infinity,
-                height: 90.h,
+                height: 110.h,
                 alignment: Alignment.center,
                 padding: EdgeInsets.all(20),
                 child: Column(
@@ -61,7 +63,7 @@ class _UpdateDialog extends State<UpdateDialog> {
                 height: 1.h,
               ),
               Container(
-                height: 55.h,
+                height: 69.h,
                 child: Row(
                   mainAxisSize: MainAxisSize.max,
                   children: [

pubspec.lock

@@ -701,10 +701,12 @@ packages:
   tpns_flutter_plugin:
     dependency: "direct main"
     description:
-      name: tpns_flutter_plugin
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.1.0"
+      path: "."
+      ref: "V1.1.4"
+      resolved-ref: "9494908d3d974899dd6d8494a332b89998b5ac8b"
+      url: "git://github.com/TencentCloud/TPNS-Flutter-Plugin"
+    source: git
+    version: "1.1.4"
   transformer_page_view:
     dependency: transitive
     description:

pubspec.yaml

@@ -19,10 +19,10 @@ dependencies:
 
   keframe: ^2.0.2 #滑动组件卡顿优化
 
-  tpns_flutter_plugin: ^1.1.0
-#    git:
-#      url: git://github.com/TencentCloud/TPNS-Flutter-Plugin
-#      ref: V1.1.4
+  tpns_flutter_plugin:
+    git:
+      url: git://github.com/TencentCloud/TPNS-Flutter-Plugin
+      ref: V1.1.4
 
   like_button: ^2.0.2
   cupertino_icons: ^1.0.2