Commit a2652a11 authored by 林生雨's avatar 林生雨

commit :

parent 044cdd08
...@@ -28,6 +28,10 @@ class PlanItem extends StatelessWidget { ...@@ -28,6 +28,10 @@ class PlanItem extends StatelessWidget {
} }
i++; i++;
}); });
String rate = plans.positiveRate;
if (rate != null && rate.contains(".")) {
rate = rate.split(".")[0];
}
return Container( return Container(
margin: EdgeInsets.only(top: 10, left: 10, right: 10), margin: EdgeInsets.only(top: 10, left: 10, right: 10),
child: Container( child: Container(
...@@ -84,7 +88,7 @@ class PlanItem extends StatelessWidget { ...@@ -84,7 +88,7 @@ class PlanItem extends StatelessWidget {
Container( Container(
width: 4, width: 4,
), ),
baseText(plans.positiveRate, 14, Color(0xffFF5963)) baseText("${rate}%", 14, Color(0xffFF5963))
], ],
), ),
), ),
......
...@@ -10,6 +10,7 @@ import 'package:flutter/cupertino.dart'; ...@@ -10,6 +10,7 @@ import 'package:flutter/cupertino.dart';
import 'package:extended_nested_scroll_view/extended_nested_scroll_view.dart' import 'package:extended_nested_scroll_view/extended_nested_scroll_view.dart'
as extend; as extend;
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_boost/flutter_boost.dart';
import 'package:gm_flutter/ClueModel/page/common/StickyTabBarDelegate.dart'; import 'package:gm_flutter/ClueModel/page/common/StickyTabBarDelegate.dart';
import 'package:gm_flutter/ClueModel/page/top/TopModel.dart'; import 'package:gm_flutter/ClueModel/page/top/TopModel.dart';
import 'package:gm_flutter/ClueModel/util/PosUtil.dart'; import 'package:gm_flutter/ClueModel/util/PosUtil.dart';
...@@ -19,6 +20,7 @@ import 'package:gm_flutter/commonModel/eventbus/SimpleEventBus.dart'; ...@@ -19,6 +20,7 @@ import 'package:gm_flutter/commonModel/eventbus/SimpleEventBus.dart';
import 'package:gm_flutter/commonModel/net/DioUtil.dart'; import 'package:gm_flutter/commonModel/net/DioUtil.dart';
import 'package:gm_flutter/commonModel/util/DartUtil.dart'; import 'package:gm_flutter/commonModel/util/DartUtil.dart';
import 'package:gm_flutter/commonModel/view/baseRefreshIndicator.dart'; import 'package:gm_flutter/commonModel/view/baseRefreshIndicator.dart';
import 'package:gm_flutter/main.mark.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart'; import 'package:pull_to_refresh/pull_to_refresh.dart';
import 'TopList.dart'; import 'TopList.dart';
...@@ -138,7 +140,11 @@ class TopPageState extends BaseState<TopPage> with TickerProviderStateMixin { ...@@ -138,7 +140,11 @@ class TopPageState extends BaseState<TopPage> with TickerProviderStateMixin {
), ),
), ),
baseSliverBack(() { baseSliverBack(() {
Navigator.of(context).pop(); if(RouterCenterImpl().findMainRouter().isWithNative()){
FlutterBoost.singleton.closeCurrent();
}else{
Navigator.of(context).pop();
}
}), }),
baseSliverTitle( baseSliverTitle(
"title", MediaQuery.of(context).size.width, _model.textLive) "title", MediaQuery.of(context).size.width, _model.textLive)
......
...@@ -486,8 +486,11 @@ Widget baseSliverBack(VoidCallback tap) { ...@@ -486,8 +486,11 @@ Widget baseSliverBack(VoidCallback tap) {
decoration: decoration:
BoxDecoration(color: Color(0x99FFFFFF), shape: BoxShape.circle), BoxDecoration(color: Color(0x99FFFFFF), shape: BoxShape.circle),
alignment: Alignment.center, alignment: Alignment.center,
child: Container( child: Hero(
child: Image.asset("assets/left_arrow.png"), tag: "baseSliverBack",
child: Container(
child: Image.asset("assets/left_arrow.png"),
),
), ),
)), )),
); );
......
...@@ -89,9 +89,8 @@ class DioInterceptorManager { ...@@ -89,9 +89,8 @@ class DioInterceptorManager {
.get(MEMORY_CACHE) .get(MEMORY_CACHE)
.get(ANDROID_DEVICE_ID) != .get(ANDROID_DEVICE_ID) !=
null) { null) {
opt.queryParameters[ANDROID_DEVICE_ID] = "${CacheManager.getInstance() opt.queryParameters[ANDROID_DEVICE_ID] =
.get(MEMORY_CACHE) "${CacheManager.getInstance().get(MEMORY_CACHE).get(ANDROID_DEVICE_ID)}";
.get(ANDROID_DEVICE_ID)}";
} }
} else { } else {
if (CacheManager.getInstance().get(MEMORY_CACHE).get(RELEASE) != null) { if (CacheManager.getInstance().get(MEMORY_CACHE).get(RELEASE) != null) {
...@@ -122,7 +121,7 @@ class DioInterceptorManager { ...@@ -122,7 +121,7 @@ class DioInterceptorManager {
} }
} }
print("请求之前 onRequest${opt.headers}"); print("请求之前 onRequest${opt.uri}${opt.queryParameters}${opt.headers}");
}, onResponse: (response) { }, onResponse: (response) {
print("响应之前 onResponse${response}"); print("响应之前 onResponse${response}");
}, onError: (e) { }, onError: (e) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment