Skip to content

G
gmalpha_flutter
Commit 026a4810 authored by 林生雨's avatar 林生雨
Browse files
Options

commit

parent 79a469d6
Hide whitespace changes
Inline Side-by-side
Showing with 420 additions and 121 deletions
lib/PrestigeModel/page/reputation/ReputationsModel.dart
View file @ 026a4810
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* @date 2019-09-16 * @date 2019-09-16
**/ **/
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:gmalpha_flutter/Annotations/RouterCenterRestore.mark.dart';
import 'package:gmalpha_flutter/PrestigeModel/service/PrestigeRepository.dart'; import 'package:gmalpha_flutter/PrestigeModel/service/PrestigeRepository.dart';
import 'package:gmalpha_flutter/PrestigeModel/service/remote/entity/PrestigeEntity.dart'; import 'package:gmalpha_flutter/PrestigeModel/service/remote/entity/PrestigeEntity.dart';
import 'package:gmalpha_flutter/commonModel/live/BaseModel.dart'; import 'package:gmalpha_flutter/commonModel/live/BaseModel.dart';
...@@ -20,8 +21,6 @@ class ReputationsModel extends BaseModel { ...@@ -20,8 +21,6 @@ class ReputationsModel extends BaseModel {
ReputationsModel(this.userId, this.userName, this.fromPage) { ReputationsModel(this.userId, this.userName, this.fromPage) {
prestigeLive = new LiveData(); prestigeLive = new LiveData();
titleLive = new LiveData(); titleLive = new LiveData();
print("lsy -->INIT!!!");
} }
init(BuildContext context) { init(BuildContext context) {
...@@ -40,6 +39,10 @@ class ReputationsModel extends BaseModel { ...@@ -40,6 +39,10 @@ class ReputationsModel extends BaseModel {
void dispose() { void dispose() {
prestigeLive.dispost(); prestigeLive.dispost();
titleLive.dispost(); titleLive.dispost();
print("lsy -->DISPOST!!!"); }
void pop(BuildContext context, String pageName) {
RouterCenterImpl().findBuriedRouter()?.onClick(pageName, "return");
Navigator.pop(context);
} }
} }
lib/PrestigeModel/page/reputation/ReputationsPage.dart
View file @ 026a4810
...@@ -39,82 +39,84 @@ class ReputationsState extends BasePage<ReputationsPage> { ...@@ -39,82 +39,84 @@ class ReputationsState extends BasePage<ReputationsPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
screenWidth = MediaQuery.of(context).size.width; screenWidth = MediaQuery.of(context).size.width;
return Scaffold( return WillPopScope(
appBar: AppBar( child: Scaffold(
title: StreamBuilder<String>( appBar: AppBar(
stream: _model.titleLive.stream, title: StreamBuilder<String>(
initialData: _model.titleLive.data, stream: _model.titleLive.stream,
builder: (context, data) { initialData: _model.titleLive.data,
if (data.data == null) { builder: (context, data) {
return MyText(16, '我的专家声望', 0xff323232); if (data.data == null) {
} return MyText(16, '我的专家声望', 0xff323232);
String titleWord = '${data.data}的专家声望';
if (titleWord.length > 10) {
titleWord = titleWord.substring(0, 10) + "...";
}
return MyText(16, titleWord, 0xff323232);
},
),
centerTitle: true,
leading: GestureDetector(
onTap: () {
RouterCenterImpl()
.findBuriedRouter()
?.onClick(pageName(), "return");
Navigator.pop(context, "");
},
child: Container(
alignment: Alignment.centerLeft,
padding: EdgeInsets.only(left: 22),
width: 30,
height: double.maxFinite,
child: SvgPicture.asset("images/left_arrow.svg",
color: Color(0xff323232)),
),
)),
body: StreamBuilder<PrestigeEntity>(
stream: _model.prestigeLive.stream,
initialData: _model.prestigeLive.data,
builder: (context, data) {
if (data.data == null) {
return loadingItem();
}
if (data.data.error != 0 || data.data.data == null) {
return errorItem(data.data.message);
}
return CustomScrollView(
slivers: <Widget>[
SliverList(
delegate: SliverChildBuilderDelegate(
(BuildContext context, int index) {
if (index == 0) {
return Container(
margin: EdgeInsets.fromLTRB(17, 24, 17, 0),
child: MyText(16.0, data.data.data.introduce[0].question,
0xff323232),
);
} }
if (index == 1) { String titleWord = '${data.data}的专家声望';
return Container( if (titleWord.length > 10) {
margin: EdgeInsets.fromLTRB(19, 16, 19, 32), titleWord = titleWord.substring(0, 10) + "...";
child: Text(
data.data.data.introduce[0].answer,
style:
TextStyle(fontSize: 13, color: Color(0xff8E8E8E)),
));
} }
if (index == data.data.data.reputations.length + 2) { return MyText(16, titleWord, 0xff323232);
//bottom margin },
return Container( ),
height: 20, centerTitle: true,
); leading: GestureDetector(
} onTap: () {
return listItem(data, index - 2); _model.pop(context, pageName());
}, childCount: data.data.data.reputations.length + 3)), },
], child: Container(
); alignment: Alignment.centerLeft,
}, padding: EdgeInsets.only(left: 22),
)); width: 30,
height: double.maxFinite,
child: SvgPicture.asset("images/left_arrow.svg",
color: Color(0xff323232)),
),
)),
body: StreamBuilder<PrestigeEntity>(
stream: _model.prestigeLive.stream,
initialData: _model.prestigeLive.data,
builder: (context, data) {
if (data.data == null) {
return loadingItem();
}
if (data.data.error != 0 || data.data.data == null) {
return errorItem(data.data.message);
}
return CustomScrollView(
slivers: <Widget>[
SliverList(
delegate: SliverChildBuilderDelegate(
(BuildContext context, int index) {
if (index == 0) {
return Container(
margin: EdgeInsets.fromLTRB(17, 24, 17, 0),
child: MyText(16.0,
data.data.data.introduce[0].question, 0xff323232),
);
}
if (index == 1) {
return Container(
margin: EdgeInsets.fromLTRB(19, 16, 19, 32),
child: Text(
data.data.data.introduce[0].answer,
style: TextStyle(
fontSize: 13, color: Color(0xff8E8E8E)),
));
}
if (index == data.data.data.reputations.length + 2) {
//bottom margin
return Container(
height: 20,
);
}
return listItem(data, index - 2);
}, childCount: data.data.data.reputations.length + 3)),
],
);
},
)),
onWillPop: () {
_model.pop(context, pageName());
},
);
} }
Widget listItem(AsyncSnapshot<PrestigeEntity> data, int index) { Widget listItem(AsyncSnapshot<PrestigeEntity> data, int index) {
......
lib/PrestigeModel/page/temp.dart deleted 100644 → 0
View file @ 79a469d6
/*
* @author lsy
* @date 2019-09-16
**/
\ No newline at end of file
lib/commonModel/base/BaseComponent.dart
View file @ 026a4810
...@@ -4,7 +4,9 @@ ...@@ -4,7 +4,9 @@
**/ **/
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_svg/flutter_svg.dart';
import 'package:gmalpha_flutter/res/GMRes.dart';
AppBar baseAppBar( AppBar baseAppBar(
{String title, {String title,
...@@ -12,7 +14,7 @@ AppBar baseAppBar( ...@@ -12,7 +14,7 @@ AppBar baseAppBar(
bool centerTitle, bool centerTitle,
VoidCallback backClick}) { VoidCallback backClick}) {
return AppBar( return AppBar(
title: title == null ? Container() : baseText(title, 16, 0xff323232), title: title == null ? Container() : baseText(title, 16, ALColors.Color323232),
centerTitle: centerTitle, centerTitle: centerTitle,
leading: GestureDetector( leading: GestureDetector(
onTap: backClick, onTap: backClick,
...@@ -30,13 +32,24 @@ AppBar baseAppBar( ...@@ -30,13 +32,24 @@ AppBar baseAppBar(
); );
} }
Text baseText(String text, double fontSize, int color) { Text baseText(String text, double fontSize, Color color) {
return Text( return Text(
text, text,
style: TextStyle(fontSize: fontSize, color: Color(color)), style: TextStyle(fontSize: fontSize, color: color),
); );
} }
Widget baseDivide(double height, int padding, Color color) {
return Container(
height: height,
margin: EdgeInsets.only(
right: ScreenUtil.instance.setWidth(padding),
left: ScreenUtil.instance.setWidth(padding)),
child: Container(
color: color,
));
}
Widget loadingItem() { Widget loadingItem() {
//TODO //TODO
return Center(child: CircularProgressIndicator()); return Center(child: CircularProgressIndicator());
......
lib/res/value/ALColors.dart
View file @ 026a4810
...@@ -5,13 +5,13 @@ import 'dart:ui' show Color; ...@@ -5,13 +5,13 @@ import 'dart:ui' show Color;
import 'package:flutter/painting.dart'; import 'package:flutter/painting.dart';
// 关于颜色的定义 // 关于颜色的定义
// Color(0xFF323232); // Color(0xFF323232);
// FF 表示透明度 323232 表示RGB颜色值 // FF 表示透明度 323232 表示RGB颜色值
class ALColors { class ALColors {
ALColors._(); ALColors._();
static const Color Color323232 = Color(0xFF323232); static const Color Color323232 = Color(0xFF323232);
static const Color Color464646 = Color(0xFF464646); static const Color Color464646 = Color(0xFF464646);
static const Color Color999999 = Color(0xFF999999); static const Color Color999999 = Color(0xFF999999);
...@@ -23,4 +23,4 @@ class ALColors { ...@@ -23,4 +23,4 @@ class ALColors {
static const Color ColorF4F3F8 = Color(0xFFf4f3f8); static const Color ColorF4F3F8 = Color(0xFFf4f3f8);
static const Color Color282828 = Color(0xFF282828); static const Color Color282828 = Color(0xFF282828);
static const Color ColorE5E5E5 = Color(0xFFe5e5e5); static const Color ColorE5E5E5 = Color(0xFFe5e5e5);
} }
\ No newline at end of file
lib/userModel/page/country/CountryJson.dart 0 → 100644
View file @ 026a4810
/*
* @author lsy
* @date 2019-10-16
**/
const STATIC_COUNTRY_JSON = """
{
"error": 0,
"message": "",
"extra": null,
"data": [
{
"title": "A",
"countries": [
{
"id": "America",
"name": "美国",
"language": "en"
},
{
"id": "Argentina",
"name": "阿根廷",
"language": "en"
},
{
"id": "Australia",
"name": "澳大利亚",
"language": "en"
}
]
},
{
"title": "B",
"countries": [
{
"id": "Belgium",
"name": "比利时",
"language": "en"
},
{
"id": "Brazil",
"name": "巴西",
"language": "en"
},
{
"id": "Brunei",
"name": "文莱",
"language": "en"
}
]
},
{
"title": "C",
"countries": [
{
"id": "Canada",
"name": "加拿大",
"language": "en"
},
{
"id": "china",
"name": "中国",
"language": "zh"
}
]
},
{
"title": "E",
"countries": [
{
"id": "Egypt",
"name": "埃及",
"language": "en"
},
{
"id": "England",
"name": "英国",
"language": "en"
}
]
},
{
"title": "F",
"countries": [
{
"id": "France",
"name": "法国",
"language": "fra"
}
]
},
{
"title": "H",
"countries": [
{
"id": "hanguo",
"name": "韩国",
"language": "kor"
}
]
},
{
"title": "I",
"countries": [
{
"id": "India",
"name": "印度",
"language": "en"
},
{
"id": "Indonesia",
"name": "印度尼西亚",
"language": "en"
},
{
"id": "Ireland",
"name": "爱尔兰",
"language": "en"
}
]
},
{
"title": "J",
"countries": [
{
"id": "Japan",
"name": "日本",
"language": "jp"
}
]
},
{
"title": "L",
"countries": [
{
"id": "Libya",
"name": "利比亚",
"language": "en"
}
]
},
{
"title": "M",
"countries": [
{
"id": "Malaysia",
"name": "马来西亚",
"language": "en"
},
{
"id": "Maldives",
"name": "马尔代夫",
"language": "en"
},
{
"id": "Mexico",
"name": "墨西哥",
"language": "en"
},
{
"id": "Morocco",
"name": "摩洛哥",
"language": "en"
}
]
},
{
"title": "N",
"countries": [
{
"id": "Netherlands",
"name": "荷兰",
"language": "en"
},
{
"id": "NewZealand",
"name": "新西兰",
"language": "en"
}
]
},
{
"title": "P",
"countries": [
{
"id": "Pakistan",
"name": "巴基斯坦",
"language": "en"
},
{
"id": "Paraguay",
"name": "巴拉圭",
"language": "en"
},
{
"id": "Portugal",
"name": "葡萄牙",
"language": "pt"
}
]
},
{
"title": "R",
"countries": [
{
"id": "Russia",
"name": "俄罗斯",
"language": "ru"
}
]
},
{
"title": "S",
"countries": [
{
"id": "singapore",
"name": "新加坡",
"language": "en"
},
{
"id": "Spain",
"name": "西班牙",
"language": "spa"
},
{
"id": "SriLanka",
"name": "斯里兰卡",
"language": "en"
}
]
},
{
"title": "T",
"countries": [
{
"id": "thailand",
"name": "泰国",
"language": "en"
}
]
},
{
"title": "U",
"countries": [
{
"id": "Uruguay",
"name": "乌拉圭",
"language": "en"
}
]
},
{
"title": "V",
"countries": [
{
"id": "Vietnam",
"name": "越南",
"language": "vie"
}
]
}
],
"user_type": {}
}
""";
lib/userModel/page/country/CountryModel.dart
View file @ 026a4810
...@@ -2,9 +2,12 @@ ...@@ -2,9 +2,12 @@
* @author lsy * @author lsy
* @date 2019-10-15 * @date 2019-10-15
**/ **/
import 'dart:convert';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:gmalpha_flutter/commonModel/GMBase.dart'; import 'package:gmalpha_flutter/commonModel/GMBase.dart';
import 'package:gmalpha_flutter/commonModel/toast/toast.dart'; import 'package:gmalpha_flutter/commonModel/toast/toast.dart';
import 'package:gmalpha_flutter/userModel/page/country/CountryJson.dart';
import 'package:gmalpha_flutter/userModel/service/UserRepository.dart'; import 'package:gmalpha_flutter/userModel/service/UserRepository.dart';
import 'package:gmalpha_flutter/userModel/service/remote/entity/CountryBean.dart'; import 'package:gmalpha_flutter/userModel/service/remote/entity/CountryBean.dart';
...@@ -17,6 +20,19 @@ class CountryModel extends BaseModel { ...@@ -17,6 +20,19 @@ class CountryModel extends BaseModel {
CountryModel(this.refer); CountryModel(this.refer);
getCountries(BuildContext context) { getCountries(BuildContext context) {
getStaticCountry().then((value) {
if (value != null) {
liveData.notifyView(value);
} else {
getCountryFromNet(context);
}
}).catchError((error) {
Toast.debugShow(context, error);
print(error);
});
}
getCountryFromNet(BuildContext context) {
UserRepository.getInstance().getCountries().listen((value) { UserRepository.getInstance().getCountries().listen((value) {
liveData.notifyView(value); liveData.notifyView(value);
}).onError((error) { }).onError((error) {
...@@ -25,6 +41,10 @@ class CountryModel extends BaseModel { ...@@ -25,6 +41,10 @@ class CountryModel extends BaseModel {
}); });
} }
Future getStaticCountry() async {
return await CountryBean.fromJson(json.decode(STATIC_COUNTRY_JSON));
}
@override @override
void dispose() { void dispose() {
liveData.dispost(); liveData.dispost();
......
lib/userModel/page/country/CountryPage.dart
View file @ 026a4810
...@@ -86,7 +86,7 @@ class CountryState extends BasePage { ...@@ -86,7 +86,7 @@ class CountryState extends BasePage {
padding: EdgeInsets.only( padding: EdgeInsets.only(
left: ScreenUtil.instance.setWidth(12), left: ScreenUtil.instance.setWidth(12),
), ),
child: baseText(head, 15, 0xFF323232), child: baseText(head, 15, ALColors.Color323232),
); );
} }
...@@ -101,19 +101,23 @@ class CountryState extends BasePage { ...@@ -101,19 +101,23 @@ class CountryState extends BasePage {
margin: EdgeInsets.only( margin: EdgeInsets.only(
left: ScreenUtil.instance.setWidth(12), left: ScreenUtil.instance.setWidth(12),
), ),
child: baseText(country.name, 15, 0xFF323232), child: baseText(country.name, 15, ALColors.Color323232),
)); ));
} }
@override
void dispose() {
super.dispose();
_scrollController.dispose();
}
@override @override
String pageName() { String pageName() {
// TODO: implement pageName return "country_page";
return null;
} }
@override @override
String referrer() { String referrer() {
// TODO: implement referrer return _model.refer;
return null;
} }
} }
lib/userModel/page/userSetting/UserSettingModel.dart
View file @ 026a4810
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:gmalpha_flutter/Annotations/RouterCenterRestore.mark.dart'; import 'package:gmalpha_flutter/Annotations/RouterCenterRestore.mark.dart';
import 'package:gmalpha_flutter/commonModel/GMBase.dart';
import 'package:gmalpha_flutter/commonModel/base/BaseUtil.dart'; import 'package:gmalpha_flutter/commonModel/base/BaseUtil.dart';
import 'package:gmalpha_flutter/commonModel/live/BaseModel.dart'; import 'package:gmalpha_flutter/commonModel/live/BaseModel.dart';
import 'package:gmalpha_flutter/commonModel/net/Api.dart'; import 'package:gmalpha_flutter/commonModel/net/Api.dart';
...@@ -91,8 +92,9 @@ class UserSettingModel extends BaseModel { ...@@ -91,8 +92,9 @@ class UserSettingModel extends BaseModel {
saveLive.dispost(); saveLive.dispost();
} }
void jumpToCAM(BuildContext context) { void jumpToCAM(BuildContext context, String pageName) {
jumpToCamera(context, refere, Api.PROVIDER_NAME, true, 1, null) clickEvent(pageName, "quit");
jumpToCamera(context, pageName, Api.PROVIDER_NAME, true, 1, null)
.then((value) { .then((value) {
if (value != null) { if (value != null) {
selectImgPath = value[0]; selectImgPath = value[0];
...@@ -116,4 +118,8 @@ class UserSettingModel extends BaseModel { ...@@ -116,4 +118,8 @@ class UserSettingModel extends BaseModel {
print(error); print(error);
}); });
} }
void quit(BuildContext context, String pageName) {
clickEvent(pageName, "quit");
}
} }
lib/userModel/page/userSetting/UserSettingPage.dart
View file @ 026a4810
...@@ -14,6 +14,7 @@ import 'package:gmalpha_flutter/commonModel/base/BaseBuried.dart'; ...@@ -14,6 +14,7 @@ import 'package:gmalpha_flutter/commonModel/base/BaseBuried.dart';
import 'package:gmalpha_flutter/commonModel/base/BaseComponent.dart'; import 'package:gmalpha_flutter/commonModel/base/BaseComponent.dart';
import 'package:gmalpha_flutter/commonModel/base/BasePage.dart'; import 'package:gmalpha_flutter/commonModel/base/BasePage.dart';
import 'package:gmalpha_flutter/commonModel/net/Responce/SimpleResponce.dart'; import 'package:gmalpha_flutter/commonModel/net/Responce/SimpleResponce.dart';
import 'package:gmalpha_flutter/res/GMRes.dart';
import 'package:gmalpha_flutter/userModel/page/userSetting/UserSettingModel.dart'; import 'package:gmalpha_flutter/userModel/page/userSetting/UserSettingModel.dart';
import 'package:gmalpha_flutter/userModel/service/remote/entity/TestUserEntity.dart'; import 'package:gmalpha_flutter/userModel/service/remote/entity/TestUserEntity.dart';
import 'package:gmalpha_flutter/userModel/service/remote/entity/UserEntity.dart'; import 'package:gmalpha_flutter/userModel/service/remote/entity/UserEntity.dart';
...@@ -66,7 +67,7 @@ class UserState extends BasePage<UserSettingPage> { ...@@ -66,7 +67,7 @@ class UserState extends BasePage<UserSettingPage> {
padding: EdgeInsets.only( padding: EdgeInsets.only(
right: ScreenUtil.instance.setWidth(30)), right: ScreenUtil.instance.setWidth(30)),
child: Center( child: Center(
child: baseText("保存", 14, 0xffC4C4C4), child: baseText("保存", 14, ALColors.ColorC4C4C4),
), ),
); );
} else { } else {
...@@ -76,7 +77,7 @@ class UserState extends BasePage<UserSettingPage> { ...@@ -76,7 +77,7 @@ class UserState extends BasePage<UserSettingPage> {
padding: EdgeInsets.only( padding: EdgeInsets.only(
right: ScreenUtil.instance.setWidth(30)), right: ScreenUtil.instance.setWidth(30)),
child: Center( child: Center(
child: baseText("保存", 14, 0xff323232), child: baseText("保存", 14, ALColors.Color323232),
), ),
)); ));
} }
...@@ -89,7 +90,7 @@ class UserState extends BasePage<UserSettingPage> { ...@@ -89,7 +90,7 @@ class UserState extends BasePage<UserSettingPage> {
Container( Container(
margin: EdgeInsets.fromLTRB(ScreenUtil.instance.setWidth(29), margin: EdgeInsets.fromLTRB(ScreenUtil.instance.setWidth(29),
ScreenUtil.instance.setWidth(25), 0, 0), ScreenUtil.instance.setWidth(25), 0, 0),
child: baseText("设置", 30, 0xff323232), child: baseText("设置", 30, ALColors.Color323232),
), ),
Container( Container(
width: ScreenUtil.instance.setWidth(127), width: ScreenUtil.instance.setWidth(127),
...@@ -101,7 +102,7 @@ class UserState extends BasePage<UserSettingPage> { ...@@ -101,7 +102,7 @@ class UserState extends BasePage<UserSettingPage> {
ScreenUtil.instance.setWidth(23)), ScreenUtil.instance.setWidth(23)),
child: GestureDetector( child: GestureDetector(
onTap: () { onTap: () {
_model.jumpToCAM(context); _model.jumpToCAM(context, pageName());
}, },
child: Stack( child: Stack(
alignment: Alignment.bottomRight, alignment: Alignment.bottomRight,
...@@ -114,6 +115,7 @@ class UserState extends BasePage<UserSettingPage> { ...@@ -114,6 +115,7 @@ class UserState extends BasePage<UserSettingPage> {
// return SvgPicture.asset("images/replace_head.svg"); // return SvgPicture.asset("images/replace_head.svg");
return Container(); return Container();
} else { } else {
startTime = DateTime.now().millisecondsSinceEpoch;
return Container( return Container(
alignment: Alignment.center, alignment: Alignment.center,
width: ScreenUtil.instance.setWidth(127), width: ScreenUtil.instance.setWidth(127),
...@@ -149,12 +151,12 @@ class UserState extends BasePage<UserSettingPage> { ...@@ -149,12 +151,12 @@ class UserState extends BasePage<UserSettingPage> {
initialData: _model.nameLive.data, initialData: _model.nameLive.data,
builder: (con, data) { builder: (con, data) {
return Center( return Center(
child: baseText(data.data ?? "", 13, 0xff323232), child: baseText(data.data ?? "", 13, ALColors.Color323232),
); );
}, },
), ),
false), false),
divideLine(), baseDivide(1, 30, ALColors.ColorE4E4E4),
baseItem(() { baseItem(() {
_model.jumpToCTY(context, pageName()); _model.jumpToCTY(context, pageName());
}, },
...@@ -166,18 +168,18 @@ class UserState extends BasePage<UserSettingPage> { ...@@ -166,18 +168,18 @@ class UserState extends BasePage<UserSettingPage> {
return Container( return Container(
margin: EdgeInsets.only( margin: EdgeInsets.only(
right: ScreenUtil.instance.setWidth(19)), right: ScreenUtil.instance.setWidth(19)),
child: baseText(data.data ?? "", 13, 0xff323232), child: baseText(data.data ?? "", 13, ALColors.Color323232),
); );
}, },
), ),
true), true),
divideLine(), baseDivide(1, 30, ALColors.ColorE4E4E4),
baseItem(() { baseItem(() {
jumpToComment(context, pageName()); jumpToComment(context, pageName());
}, "意见与建议", null, true), }, "意见与建议", null, true),
divideLine(), baseDivide(1, 30, ALColors.ColorE4E4E4),
baseItem(() {}, "隐私声明", null, true), baseItem(() {}, "隐私声明", null, true),
divideLine(), baseDivide(1, 30, ALColors.ColorE4E4E4),
], ],
), ),
Expanded( Expanded(
...@@ -191,8 +193,10 @@ class UserState extends BasePage<UserSettingPage> { ...@@ -191,8 +193,10 @@ class UserState extends BasePage<UserSettingPage> {
left: ScreenUtil.instance.setWidth(30), left: ScreenUtil.instance.setWidth(30),
right: ScreenUtil.instance.setWidth(30)), right: ScreenUtil.instance.setWidth(30)),
child: OutlineButton( child: OutlineButton(
onPressed: () {}, onPressed: () {
child: baseText("退出登入", 14, 0xff323232), _model.quit(context, pageName());
},
child: baseText("退出登入", 14, ALColors.Color323232),
borderSide: new BorderSide(color: Color(0xff323232)), borderSide: new BorderSide(color: Color(0xff323232)),
), ),
) )
...@@ -201,17 +205,6 @@ class UserState extends BasePage<UserSettingPage> { ...@@ -201,17 +205,6 @@ class UserState extends BasePage<UserSettingPage> {
); );
} }
divideLine() {
return Container(
height: 1,
margin: EdgeInsets.only(
right: ScreenUtil.instance.setWidth(30),
left: ScreenUtil.instance.setWidth(30)),
child: Container(
color: Color(0xffE4E4E4),
));
}
baseItem(VoidCallback ontap, String left, Widget center, bool needRight) { baseItem(VoidCallback ontap, String left, Widget center, bool needRight) {
return GestureDetector( return GestureDetector(
onTap: () => ontap(), onTap: () => ontap(),
...@@ -223,7 +216,7 @@ class UserState extends BasePage<UserSettingPage> { ...@@ -223,7 +216,7 @@ class UserState extends BasePage<UserSettingPage> {
width: double.maxFinite, width: double.maxFinite,
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
baseText(left, 13, 0xff323232), baseText(left, 13, ALColors.Color323232),
Expanded( Expanded(
child: Text(""), child: Text(""),
), ),
...@@ -244,7 +237,7 @@ class UserState extends BasePage<UserSettingPage> { ...@@ -244,7 +237,7 @@ class UserState extends BasePage<UserSettingPage> {
@override @override
String pageName() { String pageName() {
return "TODO"; return "page_setting_up";
} }
@override @override
......
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