Skip to content

G
gm_flutter
Commit 2bb4c8a5 authored by 朱璇's avatar 朱璇
Browse files
Options

Merge branch 'test' of git.wanmeizhensuo.com:linshengyu/gm_flutter into zx/gmFlutter

parents f764c0bd da098708
Hide whitespace changes
Inline Side-by-side
Showing with 114 additions and 61 deletions
lib/ClueModel/page/levelOne/LevelOneModel.dart
View file @ 2bb4c8a5
......@@ -26,6 +26,7 @@ class LevelOneModel extends BaseModel {
int plan_id = 0;
PlanOverData planoverItem;
String imageUrl = "";
String name = "";
void init(VoidCallback callback) {
ClueTApiImpl.getInstance()
......@@ -33,6 +34,7 @@ class LevelOneModel extends BaseModel {
.listen((event) {
if (event.error == 0) {
planoverItem = event.data;
name = event.data.name;
imageUrl = event.data.banner.imageUrl;
tabsList = event.data.tabs;
stateLive.notifyView(ENDLOADING);
......
lib/ClueModel/page/levelOne/LevelOnePage.dart
View file @ 2bb4c8a5
......@@ -53,6 +53,7 @@ class LevelOneState extends BaseState<LevelOnePage>
@override
void initState() {
// DioUtil.getInstance().setProxy("172.30.8.245");
super.initState();
_model.plan_id = widget.planId;
_model.init(() {
......
lib/ClueModel/page/levelTwo/LevelTwoPage.dart
View file @ 2bb4c8a5
......@@ -53,6 +53,7 @@ class LevelTwoState extends BaseState<LevelTwoPage>
@override
void initState() {
// DioUtil.getInstance().setProxy("172.30.8.245");
super.initState();
_model.plan_id = widget.planId;
_model.init(() {
......@@ -166,11 +167,12 @@ class LevelTwoState extends BaseState<LevelTwoPage>
child: newHome(),
)),
Positioned(
top: 57,
top: 44,
left: 60,
child: Container(
alignment: Alignment.center,
width: MediaQuery.of(context).size.width,
child: baseText("文案", 18, Color(0xff333333)),
width: MediaQuery.of(context).size.width - 100,
child: baseText(_model.name, 18, Color(0xff333333)),
),
),
baseSliverBack(() {
......@@ -202,7 +204,7 @@ class LevelTwoState extends BaseState<LevelTwoPage>
handle: extend.NestedScrollView.sliverOverlapAbsorberHandleFor(
context),
sliver: baseSliverAppBar(_model.imageUrl,
height: pinnedHeaderHeight, needpic: false)),
height: 0, needpic: false)),
SliverList(
delegate: SliverChildBuilderDelegate((BuildContext c, int i) {
if (i == 0) {
......@@ -256,7 +258,7 @@ class LevelTwoState extends BaseState<LevelTwoPage>
);
}
return Padding(
padding: EdgeInsets.only(left: 15.0, right: 15.0, top: 8.0, bottom: 20),
padding: EdgeInsets.only(left: 15.0, right: 15.0, bottom: 20),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.max,
......@@ -438,7 +440,7 @@ class LevelTwoState extends BaseState<LevelTwoPage>
behavior: HitTestBehavior.opaque,
onTap: () {
BaseBottomPicker()
..setPicker(MechanismBox(12))
..setPicker(MechanismBox(widget.planId))
..show(context);
},
child: Container(
......
lib/ClueModel/page/mechanismBox/MechanismBoxPage.dart
View file @ 2bb4c8a5
......@@ -8,6 +8,7 @@ import 'package:gm_flutter/ClueModel/view/FiveStarView.dart';
import 'package:gm_flutter/commonModel/base/BaseComponent.dart';
import 'package:gm_flutter/ClueModel/page/mechanismBox/MechanismModel.dart';
import 'package:gm_flutter/commonModel/bean/Pair.dart';
import 'package:gm_flutter/commonModel/net/DioUtil.dart';
import 'package:gm_flutter/main.mark.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart';
......@@ -15,13 +16,15 @@ class MechanismBox implements IBottomPicker {
VoidCallback dismissCall;
TextEditingController textController = TextEditingController();
MechanismModel _model = new MechanismModel();
List doctor_ids = new List();
List<String> doctor_ids = new List();
LevelOneListModel _levelModel = LevelOneListModel();
RefreshController refreshController = RefreshController();
Function(String str) refresh;
DateTime _dateTime = DateTime.now();
@required
final int plan_id;
......@@ -29,21 +32,9 @@ class MechanismBox implements IBottomPicker {
@override
initState(dismissCall, BuildContext context) {
Map<String, dynamic> map = {
"business_id": "level_two_plan_compare_deatil",
"page_name": "",
"referrer": "",
"referrer_id": "",
"referrer_link": [],
"referrer_tab_name": "",
"in": "",
"out": "",
"is_push": 1,
"fake": 1,
"is_first": 1
};
RouterCenterImpl().findMainRouter().buriedEvent("page_view", map);
this.dismissCall = dismissCall;
_levelModel.plan_id = plan_id;
_levelModel.tab_type = "hospital";
_model.getQuestions(plan_id);
_levelModel.refreshView(true);
refresh = (str) {
......@@ -75,7 +66,7 @@ class MechanismBox implements IBottomPicker {
if (data.data == LOADING) {
return loadingItem();
}
return setupHome(mq, keyHeight);
return setupHome(mq, keyHeight, context);
},
)),
);
......@@ -83,18 +74,55 @@ class MechanismBox implements IBottomPicker {
@override
void dispose() {
Map<String, dynamic> map = {
"business_id": "level_two_plan_compare_deatil",
"page_name": "",
"referrer": "",
"referrer_id": "",
"referrer_link": [],
"referrer_tab_name": "",
"in": _dateTime,
"out": DateTime.now(),
"is_push": 1,
"fake": 1,
"is_first": 1
};
RouterCenterImpl().findMainRouter().buriedEvent("page_view", map);
textController.dispose();
refreshController.dispose();
_levelModel.dispose();
_model.dispose();
}
setupHome(mq, keyHeight) {
setupHome(mq, keyHeight, BuildContext context) {
return Column(
mainAxisSize: MainAxisSize.max,
children: <Widget>[
title(mq),
mechanismList(mq, keyHeight),
StreamBuilder(
stream: _levelModel.stateLive.stream,
initialData: _levelModel.stateLive.data ?? LOADING,
builder: (c, data) {
if (data.data == LOADING) {
return Container(
width: MediaQuery.of(context).size.width,
height: mq.size.height - 140 - 96 - 50 - keyHeight,
child: loadingItem(),
);
}
if (data.data == FAIL) {
return errorItem(MediaQuery.of(context).size.width,
mq.size.height - 140 - 96 - 50 - keyHeight, () {
_levelModel.refreshView(true);
});
}
if (data.data == EMPTY) {
return emptyItem(MediaQuery.of(context).size.width,
mq.size.height - 140 - 96 - 50 - keyHeight);
}
return mechanismList(mq, keyHeight);
},
),
bottomMessage()
],
);
......@@ -147,13 +175,8 @@ class MechanismBox implements IBottomPicker {
padding: EdgeInsets.only(left: 15, right: 15),
child: baseRefreshView(refreshController, () {}, null, null,
customScrollView: CustomScrollView(
// physics: NeverScrollableScrollPhysics(),
physics: ClampingScrollPhysics(),
// shrinkWrap: true,
slivers: <Widget>[
// SliverOverlapInjector(
// handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
// ),
StreamBuilder<List<Cards>>(
stream: _levelModel.cardsLive.stream,
initialData: _levelModel.cardsLive.data ?? [],
......@@ -173,9 +196,8 @@ class MechanismBox implements IBottomPicker {
);
}
if (_levelModel.data[index].cardType == 'hospital') {
Hospital hospital =
_levelModel.data[index].hospital;
return HospitalItem(hospital);
return HospitalItem(
_levelModel.data[index].hospital);
} else {
return Container();
}
......@@ -194,7 +216,9 @@ class MechanismBox implements IBottomPicker {
// 机构卡片
Widget HospitalItem(Hospital hospital) {
return GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () {
print(hospital.toJson());
if (doctor_ids.indexOf(hospital.hosiptalId) != -1) {
doctor_ids.remove(hospital.hosiptalId);
} else {
......@@ -204,7 +228,10 @@ class MechanismBox implements IBottomPicker {
_levelModel.cardsLive.notifyView(_levelModel.cardsLive.data);
},
child: Container(
height: 94.5,
height: 91.5,
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(width: 1, color: Color(0xffE5E5E5)))),
child: Stack(
children: <Widget>[
Positioned(
......@@ -224,22 +251,18 @@ class MechanismBox implements IBottomPicker {
width: 45,
height: 45,
child: ClipOval(
child: CachedNetworkImage(
// imageUrl: cards.hospital.portrait,
imageUrl: hospital.portrait),
child: CachedNetworkImage(imageUrl: hospital.portrait),
),
),
),
Positioned(
left: 89,
top: 17.5,
// child: baseText(cards.hospital.name, 15, Color(0xff333333),
// bold: true),
top: 15,
child:
baseText(hospital.name, 15, Color(0xff333333), bold: true),
),
Positioned(
top: 42.5,
top: 38,
right: 0,
child: Row(
crossAxisAlignment: CrossAxisAlignment.end,
......@@ -254,8 +277,10 @@ class MechanismBox implements IBottomPicker {
Positioned(
bottom: 21,
left: 89,
// child: baseText(cards.hospital.address, 12, Color(0xff666666)),
child: baseText(hospital.address, 12, Color(0xff666666)),
child: Container(
width: 230,
child: baseText(hospital.address, 12, Color(0xff666666)),
),
),
Positioned(
left: 89,
......@@ -353,8 +378,13 @@ class MechanismBox implements IBottomPicker {
if (doctor_ids.length > 3 || doctor_ids.length < 1) {
NativeToast.showNativeToast('请选择1-3个机构咨询');
} else {
if (txt != '') {
_model.sendMessage(doctor_ids, txt, plan_id, (i) {
if (txt.isNotEmpty) {
print(doctor_ids.join(','));
_model.sendMessage(
doctor_ids.join(','), txt, plan_id, (i) {
print(doctor_ids);
print(txt);
print(plan_id);
if (i == 0) {
dismissCall();
textController.text = '';
......
lib/ClueModel/page/mechanismBox/MechanismModel.dart
View file @ 2bb4c8a5
......@@ -42,12 +42,13 @@ class MechanismModel extends BaseModel {
});
}
sendMessage(List<int> doctor_ids, String question, int plan_id,
sendMessage(String doctor_ids, String question, int plan_id,
Function(int state) func) {
ClueApiImpl.getInstance()
.sendMessage(
DioUtil.getInstance().getDio(), doctor_ids, question, plan_id)
.listen((event) {
print(event.toJson());
if (event.error == 0) {
func(0);
messageLive.notifyView(event.data.success);
......
lib/ClueModel/page/plan/PlanPage.dart
View file @ 2bb4c8a5
......@@ -54,9 +54,11 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
GlobalKey globalKey = GlobalKey();
PlanBarView planBarView;
double stateBarHeight;
double topHeight;
@override
void initState() {
// DioUtil.getInstance().setProxy("172.30.8.245");
super.initState();
_model.init();
planBarView =
......@@ -82,7 +84,7 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
@override
Widget buildItem(BuildContext context) {
stateBarHeight = MediaQueryData.fromWindow(window).padding.top;
topHeight=stateBarHeight+kToolbarHeight;
return Scaffold(
body: MediaQuery.removePadding(
removeTop: true,
......@@ -102,7 +104,7 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
children: <Widget>[
Container(
width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.height - stateBarHeight,
height: MediaQuery.of(context).size.height - topHeight,
child: child(),
),
StreamBuilder<List<double>>(
......@@ -285,7 +287,7 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
Widget head() {
return Container(
height: stateBarHeight,
height: topHeight,
// child: Container(
// margin: EdgeInsets.only(top: 48, left: 15, right: 15),
// width: double.maxFinite,
......@@ -454,7 +456,7 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
double bottom =
// WidgetUtil.buttonLeftMenuPosition(globalKey.currentContext)?.top ??
topPos == null ? 0.0 : topPos.dy + 45 - stateBarHeight;
topPos == null ? 0.0 : topPos.dy + 45 - topHeight;
if (bottom < 45) {
bottom = 45;
}
......@@ -530,7 +532,7 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
void _onScroll(double offset) {
var topPos = PosUtil.findPos(globalKey);
if (topPos != null) {
if (topPos.dy > stateBarHeight) {
if (topPos.dy > topHeight) {
_model.showTab.notifyView(false);
} else {
_model.showTab.notifyView(true);
......
lib/ClueModel/server/api/ClueApi.dart
View file @ 2bb4c8a5
......@@ -11,7 +11,6 @@ import 'package:gm_flutter/ClueModel/server/entity/LevelOneFeedList.dart';
import 'package:gm_flutter/ClueModel/server/entity/PlanBarBean.dart';
import 'package:gm_flutter/ClueModel/server/entity/PlanCompareDetail.dart';
import 'package:gm_flutter/ClueModel/server/entity/PlanConsultBean.dart';
import 'package:gm_flutter/ClueModel/server/entity/PlanOverViewBean.dart';
import 'package:gm_flutter/ClueModel/server/entity/PlansCompareFeed.dart';
import 'package:gm_flutter/ClueModel/server/entity/ProjectDetailsItem.dart';
import 'package:gm_flutter/ClueModel/server/entity/PlanBean.dart';
......
lib/ClueModel/server/api/ClueApi.serv.dart
View file @ 2bb4c8a5
......@@ -160,7 +160,7 @@ class ClueApiImpl {
}
Stream<PlanConsultBean> sendMessage(
Dio _dio, List<int> doctor_ids, String question, int plan_id) {
Dio _dio, String doctor_ids, String question, int plan_id) {
return Stream.fromFuture(post(_dio, 'api/janus/plans/plan_consult', data: {
'doctor_ids': doctor_ids,
'question': question,
......
lib/ClueModel/server/entity/LevelOneFeedList.dart
View file @ 2bb4c8a5
......@@ -217,7 +217,7 @@ class Hospital {
Hospital.fromJson(Map<String, dynamic> json) {
portrait = json['portrait'];
hosiptalId = json['hosiptal_id'];
hosiptalId = json['hospital_id'];
name = json['name'];
minPrice = json['min_price'];
maxPrice = json['max_price'];
......@@ -230,7 +230,7 @@ class Hospital {
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['portrait'] = this.portrait;
data['hosiptal_id'] = this.hosiptalId;
data['hospital_id'] = this.hosiptalId;
data['name'] = this.name;
data['min_price'] = this.minPrice;
data['max_price'] = this.maxPrice;
......
lib/MainRouter/MainRouter.dart
View file @ 2bb4c8a5
......@@ -16,4 +16,6 @@ abstract class MainRouter extends RouterBaser {
void buriedEvent(String name, Map<String, dynamic> map);
void jumpPage(BuildContext context,String pageName, Map<String, dynamic> params,bool nativePage);
Widget getProxyPage();
}
lib/MainRouter/MainRouterImpl.dart
View file @ 2bb4c8a5
......@@ -5,6 +5,7 @@
import 'package:flutter/src/widgets/framework.dart';
import 'package:gm_flutter/MainRouter/manager/JumpManager.dart';
import 'package:gm_flutter/MainRouter/manager/MainManager.dart';
import 'package:gm_flutter/MainRouter/page/proxy/NetProxyPage.dart';
import 'package:gm_flutter/MainRouter/page/test/TestPage.dart';
import 'MainRouter.dart';
......@@ -30,4 +31,9 @@ class MainRouterImpl implements MainRouter {
BuildContext context, String pageName, Map<String, dynamic> params,bool nativePage) {
JumpManager.instance().jumpToPage(context, pageName, params,nativePage);
}
@override
Widget getProxyPage() {
return NetProxyPage();
}
}
lib/MainRouter/manager/MainManager.dart
View file @ 2bb4c8a5
......@@ -36,7 +36,8 @@ class MainManager {
flutterChannel = MethodChannel('gm_method_channel');
flutterEvent = EventChannel('gm_method_event');
flutterEvent.receiveBroadcastStream().listen((data) {
if (data is Map<String, String>) {
if (data is Map) {
print("LSY STATEINIT OKKK ${data}");
var map = Map<String, String>.from(data);
innerSetData(map, APP_NAME);
innerSetData(map, VERSION);
......@@ -52,19 +53,26 @@ class MainManager {
innerSetData(map, UUID);
innerSetData(map, ANDROID_DEVICE_ID);
innerSetData(map, CURRENT_CITY_ID);
innerSetData(map, USER_AGENT);
innerSetData(map, RELEASE);
innerSetData(map, IDFA);
innerSetData(map, IDFV);
innerSetData(map, IS_WIFI);
innerSetData(map, HARDWARE_MODEL);
innerSetData(map, USER_ID);
innerSetData(map, COOKIE);
// innerSetData(map, COOKIE);
innerSetData(map, USER_AGENT);
innerSetData(map, BASE_URL);
DioUtil.setDefOptions(
baseUrl: map[BASE_URL] + "/",
baseUrl: "${map[BASE_URL]}/",
cookie: map[COOKIE],
agent: map[USER_AGENT]);
if (map[COOKIE] == null) {
CacheManager.getInstance().get(MEMORY_CACHE).save(COOKIE,
"_gm_token=1da6071594101423; csrftoken=rUrkkYYMOVZfIIQnU2IH09QIGmsfe8tE; sessionid=uz7f70uap76r6og48znci5l2hbr9vm5c; _gtid=5af9a5deba8511ea8d4082a085c393c93393");
}
print(
"LSY QQWWEERRTTYY ${CacheManager.getInstance().get(MEMORY_CACHE).get(COOKIE)}");
DioUtil.getInstance().changeOpt();
}
});
......
lib/commonModel/net/Api.dart
View file @ 2bb4c8a5
......@@ -13,7 +13,7 @@ import 'DioUtil.dart';
/**
* 生产环境
*/
const String APP_HOST_RELEASE = "https://x6cgr5y5-gengmei.mock.coding.io";
const String APP_HOST_RELEASE = "http://backend.paas-merchant.env";
/**
* 测试环境
*/
......
lib/main.dart
View file @ 2bb4c8a5
......@@ -81,6 +81,8 @@ class MyApp extends State<MyAppWidget> {
RouterCenterImpl().findClueRouter().getTopPage(params),
'hot_plan': (pageName, params, _) =>
RouterCenterImpl().findClueRouter().getTopPage(params),
'proxy': (pageName, params, _) =>
RouterCenterImpl().findMainRouter().getProxyPage(),
});
FlutterBoost.singleton
.addBoostContainerLifeCycleObserver((state, settings) {
......@@ -95,8 +97,6 @@ class MyApp extends State<MyAppWidget> {
@override
Widget build(BuildContext context) {
WindowUtil.setBarStatus(true);
CacheManager.getInstance().get(MEMORY_CACHE).save(COOKIE,
"_gm_token=1da6071594101423; csrftoken=rUrkkYYMOVZfIIQnU2IH09QIGmsfe8tE; sessionid=uz7f70uap76r6og48znci5l2hbr9vm5c; _gtid=5af9a5deba8511ea8d4082a085c393c93393");
return MaterialApp(
theme: ThemeData(
primaryColor: Colors.white,
......
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