diff --git a/lib/home/home_view/featured_acticvity.dart b/lib/home/home_view/featured_acticvity.dart index 0e7b41d9..a53fbca4 100644 --- a/lib/home/home_view/featured_acticvity.dart +++ b/lib/home/home_view/featured_acticvity.dart @@ -197,38 +197,43 @@ class _FeaturedActivity extends State { ], ), ), - Container( - width: 48.w, - margin: EdgeInsets.only(left: 8, bottom: 8), - padding: EdgeInsets.symmetric( - vertical: 4.h, - horizontal: 8.w, - ), - decoration: BoxDecoration( - color: Color(0xFF32A060), - borderRadius: BorderRadius.circular(20), - ), - alignment: Alignment.center, - child: Row( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Text( - "了解", - style: TextStyle( - fontSize: 10.sp, - fontWeight: MyFontWeight.medium, - color: Colors.white, - ), + Row( + children: [ + Container( + // width: 52.w, + margin: EdgeInsets.only(left: 8, bottom: 8), + padding: EdgeInsets.symmetric( + vertical: 4.h, + horizontal: 8.w, ), - Icon( - Icons.keyboard_arrow_right, - color: Colors.white, - size: 12, + decoration: BoxDecoration( + color: Color(0xFF32A060), + borderRadius: BorderRadius.circular(20), ), - ], - ), - ), + alignment: Alignment.center, + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Text( + "了解", + style: TextStyle( + fontSize: 10.sp, + fontWeight: MyFontWeight.medium, + color: Colors.white, + ), + ), + Icon( + Icons.keyboard_arrow_right, + color: Colors.white, + size: 12, + ), + ], + ), + ), + Spacer() + ], + ) ], )); } diff --git a/lib/main_page.dart b/lib/main_page.dart index 86870f12..4df0ed88 100644 --- a/lib/main_page.dart +++ b/lib/main_page.dart @@ -337,10 +337,10 @@ class _MainPage extends State with WidgetsBindingObserver { PackageInfo packageInfo = await PackageInfo.fromPlatform(); BaseData baseData = await apiService.appVersion().catchError((onError) {}); if (baseData != null && baseData.isSuccess) { - baseData.data.appLastVersion = "1.0.5"; - baseData.data.appLastVersionUp = "1.0.1"; + // baseData.data.appLastVersion = "1.0.95"; + // baseData.data.appLastVersionUp = "1.0.95"; if(AppUtils.versionCompare(packageInfo.version,baseData.data?.appLastVersion) - && AppUtils.versionCompare(value.getString("appLastVersion")??"1.0.0",baseData.data?.appLastVersion)){ + && AppUtils.versionCompare(value.getString("appLastVersion"),baseData.data?.appLastVersion)){ showDialog( context: context, barrierDismissible: false, diff --git a/lib/retrofit/min_api.dart b/lib/retrofit/min_api.dart index 5868e31d..cc2cfcbc 100644 --- a/lib/retrofit/min_api.dart +++ b/lib/retrofit/min_api.dart @@ -32,7 +32,7 @@ part 'min_api.g.dart'; // const base_url = "http://192.168.10.37:8765/app/"; -const localBaseUrl = "http://192.168.10.236:8766/app/";///本地 +const localBaseUrl = "http://192.168.10.236:8765/app/";///本地 const serviceBaseUrl = "https://pos.api.lotus-wallet.com/app/";///线上 diff --git a/lib/retrofit/retrofit_api.dart b/lib/retrofit/retrofit_api.dart index 75508c21..252cd821 100644 --- a/lib/retrofit/retrofit_api.dart +++ b/lib/retrofit/retrofit_api.dart @@ -170,8 +170,7 @@ abstract class ApiService { @Part(name: "file") File data, @Part(name: "folderId") int folderId,bool isVideo); /// 周边搜索 - @GET( - "https://restapi.amap.com/v3/place/around?key=542b46afa8e4b88fe1eb3c4d0ba0872f&location={lat},{lng}&keywords={keywords}&offset={size}&page={page}&extensions=all") + @GET("https://restapi.amap.com/v3/place/around?key=542b46afa8e4b88fe1eb3c4d0ba0872f&location={lat},{lng}&keywords={keywords}&offset={size}&page={page}&extensions=all") Future searchPoi(@Path("lat") String lat, @Path("lng") String lng, @Path("keywords") String keywords, int size, int page); diff --git a/lib/view_widget/update_dialog.dart b/lib/view_widget/update_dialog.dart index 3e93e1ad..a3d3cd4c 100644 --- a/lib/view_widget/update_dialog.dart +++ b/lib/view_widget/update_dialog.dart @@ -102,9 +102,7 @@ class _UpdateDialog extends State { Expanded( child: InkWell( onTap: () { - (Theme.of(context).platform == TargetPlatform.android) ? - androidUpdate():Bridge.toAppStore().then((value) { - }); + updateApp(); // Navigator.of(context).pop(); }, child: Container( @@ -139,7 +137,7 @@ class _UpdateDialog extends State { Navigator.of(context).pop(); } - androidUpdate() async { + updateApp() async { String url = Platform.isIOS ? "itms-apps://itunes.apple.com/app/id1575124838":"http://application.lotus-wallet.com/huixaing?release_id=627cadff23389f2fe6d57cb1"; if (await canLaunch(url)) { await launch(url); diff --git a/pubspec.yaml b/pubspec.yaml index 67e729b8..866f830d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,7 +3,7 @@ description: 一心回乡. publish_to: 'none' # Remove this line if you wish to publish to pub.dev -version: 1.0.1+2 +version: 1.0.94+3 environment: sdk: ">=2.7.0 <3.0.0"