diff --git a/lib/home/home_page.dart b/lib/home/home_page.dart index dd5ba48c..8eb7af46 100644 --- a/lib/home/home_page.dart +++ b/lib/home/home_page.dart @@ -309,7 +309,6 @@ class _HomePage extends State with AutomaticKeepAliveClientMixin { totalMsg = 0; }); }); - }, child: Container( height: 24, diff --git a/lib/home/home_view/quick_order.dart b/lib/home/home_view/quick_order.dart index 34ea054d..869dd058 100644 --- a/lib/home/home_view/quick_order.dart +++ b/lib/home/home_view/quick_order.dart @@ -260,6 +260,7 @@ class _QuickOrder extends State { width: 32, height: 32, fit: BoxFit.cover, + isCircle: true, errorSrc: "assets/image/default_1.png", fadeSrc: "assets/image/default_1.png", ), diff --git a/lib/main.dart b/lib/main.dart index a41c627f..cdb186a8 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -168,7 +168,11 @@ class MyApp extends StatelessWidget { @override Widget build(BuildContext context) { - return ScreenUtilInit( + return MediaQuery( + data: const MediaQueryData( + size: Size(375, 812), + ), + child:ScreenUtilInit( designSize: Size(375, 812), builder: () => MaterialApp( debugShowCheckedModeBanner: false, @@ -200,6 +204,7 @@ class MyApp extends StatelessWidget { home: (isFirst ?? true) ? GuidePage() : LoginPage(), builder: EasyLoading.init( builder: (context, widget) { + ScreenUtil.setContext(context); return MediaQuery( data: MediaQuery.of(context).copyWith( textScaleFactor: AppUtils.textScale(context), @@ -230,7 +235,7 @@ class MyApp extends StatelessWidget { ); }, ), - ); + )); } } diff --git a/lib/message/system_details.dart b/lib/message/system_details.dart index cbf3de27..a433ad18 100644 --- a/lib/message/system_details.dart +++ b/lib/message/system_details.dart @@ -92,7 +92,7 @@ class _SystemDetails extends State { } } - //关注/取关会员 + ///关注/取关会员 _vipFollow(followId,isFollow) async { BaseData baseData = await apiService.follow(followId); if (baseData != null && baseData.isSuccess) { diff --git a/lib/retrofit/min_api.dart b/lib/retrofit/min_api.dart index 901bc3f1..8d0223bb 100644 --- a/lib/retrofit/min_api.dart +++ b/lib/retrofit/min_api.dart @@ -28,12 +28,12 @@ part 'min_api.g.dart'; // 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.88:8765/app/";///詹云久 -const baseUrl = "http://192.168.10.88:8765/app/";///詹云久 +// const base_url = "http://192.168.10.88:8765/app/";///詹云久 +// const baseUrl = "http://192.168.10.88:8765/app/";///詹云久 // const base_url = "http://192.168.10.37:8766/app/"; diff --git a/lib/retrofit/min_api.g.dart b/lib/retrofit/min_api.g.dart index 856ae6e1..1c1cc751 100644 --- a/lib/retrofit/min_api.g.dart +++ b/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.88:8765/app/'; + baseUrl ??= 'http://192.168.10.236:8765/app/'; } final Dio _dio; diff --git a/lib/retrofit/retrofit_api.dart b/lib/retrofit/retrofit_api.dart index b95d48d0..456c4536 100644 --- a/lib/retrofit/retrofit_api.dart +++ b/lib/retrofit/retrofit_api.dart @@ -60,8 +60,8 @@ part 'retrofit_api.g.dart'; // 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.159:8766/app/"; ///费韬 // const baseUrl = "http://192.168.10.159:8766/app/"; ///费韬 @@ -70,8 +70,8 @@ part 'retrofit_api.g.dart'; // const baseUrl = "http://192.168.10.37:8766/app/"; -const base_url = "http://192.168.10.88:8766/app/";///詹云久 -const baseUrl = "http://192.168.10.142:8766/app/";///詹云久 +// const base_url = "http://192.168.10.88:8766/app/";///詹云久 +// const baseUrl = "http://192.168.10.142:8766/app/";///詹云久 @RestApi(baseUrl: baseUrl) abstract class ApiService { diff --git a/lib/retrofit/retrofit_api.g.dart b/lib/retrofit/retrofit_api.g.dart index 527cc52a..71083690 100644 --- a/lib/retrofit/retrofit_api.g.dart +++ b/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.88:8766/app/'; + baseUrl ??= 'http://192.168.10.236:8766/app/'; } final Dio _dio; diff --git a/pubspec.lock b/pubspec.lock index 939a44cf..2be72f68 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -255,7 +255,7 @@ packages: name: flutter_screenutil url: "https://pub.flutter-io.cn" source: hosted - version: "5.1.0" + version: "5.1.1" flutter_smart_dialog: dependency: "direct main" description: @@ -708,10 +708,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.2" + resolved-ref: b814d62f4b82422459f786671f23dd535062d503 + url: "git://github.com/TencentCloud/TPNS-Flutter-Plugin" + source: git + version: "1.1.2" transformer_page_view: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index b9c86f7a..6f6affec 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -19,10 +19,10 @@ dependencies: keframe: ^2.0.2 #滑动组件卡顿优化 - tpns_flutter_plugin: ^1.0.8 -# git: -# url: git://github.com/TencentCloud/TPNS-Flutter-Plugin -# ref: V1.1.2 + tpns_flutter_plugin: + git: + url: git://github.com/TencentCloud/TPNS-Flutter-Plugin + ref: V1.1.2 like_button: ^2.0.2 cupertino_icons: ^1.0.2