Skip to content

G
gm_flutter
Commit 588397a9 authored by 杜欣's avatar 杜欣
Browse files
Options

Merge branch 'test' into featrue/duxin

parents bcb05383 1ec9376c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 58 deletions
lib/ClueModel/page/PlansCompareFeed/PlansCompareFeedItemView.dart
View file @ 588397a9
......@@ -164,7 +164,7 @@ class _PlansCompareFeedItemViewState
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Container(
margin: EdgeInsets.only(top: 13.0, bottom: 12),
margin: EdgeInsets.only(top: 13.0, bottom: 13),
child: baseText(widget.plan.name, 14, Color(0xFF282828),
bold: true),
),
......
lib/ClueModel/page/levelOne/LevelOneList.dart
View file @ 588397a9
......@@ -175,7 +175,8 @@ class LevelOneListState extends State<LevelOneList>
buried_on_click_button(index, "consult",
"level_two_plan", "${data2.plan.plan_id}");
BaseBottomPicker()
..setPicker(MechanismBox(data2.plan.plan_id))
..setPicker(MechanismBox(
data2.plan.plan_id, widget.pageName))
..show(context);
}
},
......
lib/ClueModel/page/levelOne/LevelOneModel.dart
View file @ 588397a9
......@@ -71,8 +71,6 @@ class LevelOneModel extends BaseModel {
"position": position,
"from_tab_name": from_tab_name,
};
RouterCenterImpl()
.findMainRouter()
.buriedEvent("on_click_button", buriedMap);
RouterCenterImpl().findMainRouter().buriedEvent("on_click_tab", buriedMap);
}
}
lib/ClueModel/page/levelOne/LevelOnePage.dart
View file @ 588397a9
......@@ -552,7 +552,7 @@ class LevelOneState extends BaseState<LevelOnePage>
return;
}
BaseBottomPicker()
..setPicker(MechanismBox(widget.planId))
..setPicker(MechanismBox(widget.planId, widget.PAGE_NAME))
..show(context);
},
child: Container(
......
lib/ClueModel/page/levelTwo/LevelTwoPage.dart
View file @ 588397a9
......@@ -348,10 +348,10 @@ class LevelTwoState extends BaseState<LevelTwoPage>
children: <Widget>[
Container(
margin: EdgeInsets.only(left: 2, right: 2),
child: baseText(element.attrName, 14, Color(0xff282828),
child: baseText(element.attrValue, 14, Color(0xff282828),
bold: true),
),
baseText(element.attrValue, 11, Color(0xff999999)),
baseText(element.attrName, 11, Color(0xff999999)),
],
),
),
......@@ -517,7 +517,7 @@ class LevelTwoState extends BaseState<LevelTwoPage>
return;
}
BaseBottomPicker()
..setPicker(MechanismBox(widget.planId))
..setPicker(MechanismBox(widget.planId, widget.PAGE_NAME))
..show(context);
},
child: Container(
......
lib/ClueModel/page/mechanismBox/MechanismBoxPage.dart
View file @ 588397a9
......@@ -28,8 +28,9 @@ class MechanismBox implements IBottomPicker {
@required
final int plan_id;
final String pageName;
MechanismBox(this.plan_id) : super();
MechanismBox(this.plan_id, this.pageName) : super();
@override
initState(dismissCall, BuildContext context) {
......@@ -38,12 +39,20 @@ class MechanismBox implements IBottomPicker {
_model.tab_type = "hospital";
_model.getQuestions(plan_id);
_model.refreshView(true);
RouterCenterImpl().findMainRouter().buriedEvent("popup_view", buriedData());
refresh = (str) {
_model.stateLive.notifyView(LOADING);
_model.refreshView(true);
};
}
Map<String, dynamic> buriedData() {
Map<String, dynamic> params = Map();
params['page_name'] = this.pageName;
params['popup_name'] = 'consult';
return params;
}
Widget build(BuildContext context) {
MediaQueryData mq = MediaQuery.of(context);
double keyHeight = MediaQuery.of(context).viewInsets.bottom;
......@@ -76,20 +85,6 @@ class MechanismBox implements IBottomPicker {
@override
void dispose() {
focusNode.unfocus();
Map<String, dynamic> map = {
"business_id": "level_two_plan_compare_deatil",
"page_name": "",
"referrer": "",
"referrer_id": "",
"referrer_link": [],
"referrer_tab_name": "",
"in": "${_dateTime / 1000 / 1000}",
"out": "${DateTime.now().millisecondsSinceEpoch / 1000 / 1000}",
"is_push": 1,
"fake": 1,
"is_first": 1
};
RouterCenterImpl().findMainRouter().buriedEvent("page_view", map);
textController.dispose();
refreshController.dispose();
_model.dispose();
......
lib/ClueModel/page/plan/FilterView.dart
View file @ 588397a9
......@@ -56,22 +56,14 @@ class FilterViewState extends State<FilterView> {
height: 186,
child: Stack(
children: <Widget>[
Positioned(
top: 0,
child: Container(
width: MediaQuery.of(context).size.width,
height: 1,
decoration: BoxDecoration(
boxShadow: [
BoxShadow(
color: Color(0x08000000),
offset: Offset(0.0,1.0),
blurRadius: 6.0,
spreadRadius: 0.0),
],
),
),
),
// Positioned(
// top: 0,
// child: Container(
// width: MediaQuery.of(context).size.width,
// height: 6,
// child: Image.asset("assets/shadow.png"),
// ),
// ),
Positioned(
top: 54.5,
right: 15,
......
lib/ClueModel/page/plan/PlanItem.dart
View file @ 588397a9
......@@ -28,7 +28,7 @@ class PlanItem extends StatelessWidget {
if (i != plans.baseAttrs.length - 1) {
list.add(Container(
width: 8.5,
height: 10,
height: 11,
alignment: Alignment.topCenter,
child: Container(
width: 0.5,
......@@ -56,11 +56,14 @@ class PlanItem extends StatelessWidget {
showOprea = showOprea.length > 4 ? showOprea.substring(0, 4) : showOprea;
}
return Container(
margin: EdgeInsets.only(top: 4, left: 10, right: 10),
width: double.maxFinite,
margin: EdgeInsets.only(top: 4, left: 8, right: 8),
child: Card(
elevation: 3.0,
shadowColor: Color(0x08000000),
elevation: 2.0,
child: Container(
height: 90,
width: double.maxFinite,
decoration: BoxDecoration(
color: Colors.white, borderRadius: BorderRadius.circular(4)),
child: Stack(
......@@ -98,17 +101,18 @@ class PlanItem extends StatelessWidget {
height: 0,
)
: Container(
// constraints: BoxConstraints(maxWidth: 60),
margin: EdgeInsets.only(left: 4),
child: Container(
padding: EdgeInsets.only(
top: 2, bottom: 2, left: 3, right: 3),
top: 0.5, bottom: 1, left: 3, right: 3),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(2),
color: Color(0xffF0F9F7)),
alignment: Alignment.center,
child:
baseText(showOprea, 11, Color(0xff3FB5AF)),
child: baseText(
showOprea,
11,
Color(0xff3FB5AF),
),
),
)
],
......@@ -133,7 +137,7 @@ class PlanItem extends StatelessWidget {
),
Positioned(
left: 91,
bottom: 8,
bottom: 12,
child: Container(
width: MediaQuery.of(context).size.width - 30 - 91 - 10,
child: Row(
......@@ -164,7 +168,7 @@ class PlanItem extends StatelessWidget {
),
Positioned(
left: 92,
top: 36,
top: 32,
child: Row(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.end,
......
lib/ClueModel/page/plan/PlanPage.dart
View file @ 588397a9
This diff is collapsed.
lib/ClueModel/page/plan/PlanProgressBar.dart
View file @ 588397a9
......@@ -108,7 +108,7 @@ class PlanProgressBarState extends State<PlanProgressBar> {
widget.highLive.notifyView(textStr);
}
double textWidth = textStr.length * 12.0+6;
double textWidth =13+ (textStr.length-1) * 6.0+21;
if (textStr == "无限") {
textWidth = textStr.length * 14.0+12;
}
......@@ -152,13 +152,13 @@ class PlanProgressBarState extends State<PlanProgressBar> {
// textLeft >= 0
child: Container(
width: textWidth,
height: 42,
height: 37,
child: Stack(
alignment: AlignmentDirectional.topCenter,
children: <Widget>[
Container(
width: textWidth,
height: 37,
height: 32,
color: Colors.white,
child: Container(
decoration: BoxDecoration(
......@@ -168,7 +168,7 @@ class PlanProgressBarState extends State<PlanProgressBar> {
),
),
Positioned(
top: 36.9,
top: 31.9,
child: Container(
width: 9,
height: 5,
......@@ -178,7 +178,7 @@ class PlanProgressBarState extends State<PlanProgressBar> {
),
),
Positioned(
top: 10,
top: 6,
child: Container(
width: textWidth,
alignment: Alignment.topCenter,
......
lib/ClueModel/page/top/TopList.dart
View file @ 588397a9
......@@ -17,6 +17,7 @@ class TopList extends StatefulWidget {
double topHeight;
final String rankId;
String tabName;
TopList(this.rankId, this.id, this.topHeight, this.tabName);
@override
......@@ -75,6 +76,12 @@ class TopListState extends State<TopList> with AutomaticKeepAliveClientMixin {
// extend.SliverOverlapInjector(
// handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
// ),
SliverToBoxAdapter(
child: Container(
height: 6,
color: Color(0xffF7F6FA),
),
),
StreamBuilder<List<Plans>>(
stream: _model.datasLive.stream,
initialData: _model.datas ?? [],
......
lib/commonModel/base/BaseComponent.dart
View file @ 588397a9
......@@ -319,7 +319,7 @@ Widget baseRefreshView(RefreshController refreshController,
// body = baseText("加载失败", 12, Color(0xff545454));
// } else
if (mode == LoadStatus.noMore) {
body = baseText("我们是有底线的", 12, Color(0xff545454));
body = baseText("我们是有底线的", 12, Color(0xff999999));
}
// else {
// body = Container();
......@@ -485,7 +485,8 @@ Widget baseSliverAppBar(String url,
imageUrl: url ?? '',
fit: BoxFit.cover,
)
: Container(),
: Container(
),
),
);
}
......
updateAar.sh
View file @ 588397a9
......@@ -17,6 +17,7 @@ rm -rf ${projectDir}/build
flutter build aar --release --target-platform android-arm
#rm -rf /Users/apple/lsy/gengmei_android/gm-flutter/libs/flutterApp.aar
cp -r ${projectDir}/build/host/outputs/repo/com/example/gm_flutter/flutter_release/1.0/flutter_release-1.0.aar /Users/zcc/Downloads/gm-flutter/libs/flutterApp.aar
#cp -r ${projectDir}/build/host/outputs/repo/com/example/gm_flutter/flutter_release/1.0/flutter_release-1.0.aar /Users/zcc/Downloads/gm-flutter/libs/flutterApp.aar
cp -r ${projectDir}/build/host/outputs/repo/com/example/gm_flutter/flutter_release/1.0/flutter_release-1.0.aar /Users/apple/lsy/gengmei_android/libs/flutterApp.aar
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