Skip to content

Commit 0615052

Browse files
committed
增加主页列表messageFree、以及增肌预览页
1 parent 6fab7c4 commit 0615052

25 files changed

+168
-130
lines changed

README.md

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,35 @@
3939

4040
### 五、预览
4141

42-
###### 5.1 通讯录模块
42+
###### 闪屏模块
43+
![](./snapshots/splash/splash_page_0.png) | ![](./snapshots/splash/splash_page_1.png) | ![](./snapshots/splash/splash_page_2.png)
44+
:-: | :-: | :-:
45+
46+
###### 登陆/注册模块
47+
![](./snapshots/login/login_page.png) | ![](./snapshots/login/register_page.png) | ![](./snapshots/login/other_login_page.png)
48+
:-: | :-: | :-:
49+
![](./snapshots/login/phone_login_page.png) | ![](./snapshots/login/current_login_page.png) | ![](./snapshots/login/language_picker_page.png)
50+
51+
###### 微信模块
52+
![](./snapshots/mainframe/mainframe_page_0.png) | 虚位以待 | 虚位以待
53+
:-: | :-: | :-:
4354

55+
###### 通讯录模块
4456
![](./snapshots/contacts/contacts_page_0.png) | ![](./snapshots/contacts/contacts_page_1.png) | ![](./snapshots/contacts/contacts_page_2.png)
4557
:-: | :-: | :-:
4658

59+
###### 发现模块
60+
![](./snapshots/discover/discover_page_0.png) | 虚位以待 | 虚位以待
61+
:-: | :-: | :-:
62+
63+
###### 我模块
64+
![](./snapshots/profile/profile_page_0.png) | ![](./snapshots/profile/user_info_page.png) | ![](./snapshots/profile/more_info_page.png)
65+
:-: | :-: | :-:
4766

67+
###### 设置模块
68+
![](./snapshots/setting/setting_page.png) | ![](./snapshots/setting/account_security_page.png) | ![](./snapshots/setting/message_notify_page.png)
69+
:-: | :-: | :-:
70+
![](./snapshots/setting/privates_page.png) | ![](./snapshots/setting/general_page.png) | ![](./snapshots/setting/about_wechat_page.png)
4871

4972

5073

ios/Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ DEPENDENCIES:
2424
- webview_flutter (from `.symlinks/plugins/webview_flutter/ios`)
2525

2626
SPEC REPOS:
27-
https://github.com/CocoaPods/Specs.git:
27+
https://github.com/cocoapods/specs.git:
2828
- FMDB
2929

3030
EXTERNAL SOURCES:
@@ -52,4 +52,4 @@ SPEC CHECKSUMS:
5252

5353
PODFILE CHECKSUM: 545ae53bd1d0bdac26cae6ddb8a02d47a0916981
5454

55-
COCOAPODS: 1.8.4
55+
COCOAPODS: 1.7.3

lib/model/mainframe/message.dart

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,17 @@ class Message {
1010
String text;
1111
Badge badge;
1212

13+
/// 消息免打扰
14+
bool messageFree;
15+
1316
Message({
1417
this.idstr,
1518
this.users,
1619
this.screenName,
1720
this.createdAt,
1821
this.text,
1922
this.badge,
23+
this.messageFree,
2024
});
2125

2226
Message.fromJson(Map<String, dynamic> json) {
@@ -31,6 +35,7 @@ class Message {
3135
createdAt = json['created_at'];
3236
text = json['text'];
3337
badge = json['badge'] != null ? new Badge.fromJson(json['badge']) : null;
38+
messageFree = json['messageFree'];
3439
}
3540

3641
Map<String, dynamic> toJson() {
@@ -42,6 +47,7 @@ class Message {
4247
data['screen_name'] = this.screenName;
4348
data['created_at'] = this.createdAt;
4449
data['text'] = this.text;
50+
data['messageFree'] = this.messageFree;
4551
if (this.badge != null) {
4652
data['badge'] = this.badge.toJson();
4753
}

lib/views/login/language_picker/language_picker_page.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ class _LanguagePickerPageState extends State<LanguagePickerPage> {
128128
return Scaffold(
129129
appBar: AppBar(
130130
title: Text(
131-
'设置性别',
131+
'设置语言',
132132
textAlign: TextAlign.center,
133133
textScaleFactor: 1.0,
134134
),

lib/views/mainframe/mainframe_page.dart

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,6 @@ class _MainframePageState extends State<MainframePage> {
5555
_dataSource.add(m);
5656
});
5757

58-
// rootBundle.loadString(Constant.mockData + 'mainframe.json').then((onValue) {
59-
// print(onValue);
60-
// final List mainframeJson = json.decode(onValue);
61-
// }).catchError((err) {
62-
// print(err);
63-
// }).whenComplete(() {
64-
// print('object');
65-
// });
66-
6758
setState(() {});
6859
}
6960

@@ -137,7 +128,7 @@ class _MainframePageState extends State<MainframePage> {
137128
),
138129
),
139130
Offstage(
140-
offstage: m.screenName != '貂蝉',
131+
offstage: !m.messageFree,
141132
child: Image.asset(
142133
Constant.assetsImagesMainframe +
143134
'AlbumMessageDisableNotifyIcon_15x15.png',

lib/views/splash/splash_page.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,12 @@ class _SplashPageState extends State<SplashPage> {
9494
_skipMode = MHSplashSkipMode.newFeature;
9595
});
9696
} else {
97-
_switchRootView();
98-
// setState(() {
99-
// _skipMode = MHSplashSkipMode.ad;
100-
// });
101-
// // 配置定时器
102-
// _configureCountDown();
97+
// _switchRootView();
98+
setState(() {
99+
_skipMode = MHSplashSkipMode.ad;
100+
});
101+
// 配置定时器
102+
_configureCountDown();
103103
}
104104
});
105105
}

mock/mainframe.json

Lines changed: 75 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
"text": "2",
1616
"show": true,
1717
"dot": false
18-
}
18+
},
19+
"messageFree": false
1920
},
2021
{
2122
"idstr": "10001",
@@ -27,7 +28,8 @@
2728
"screen_name": "芈月",
2829
"created_at": "Tue Apr 09 00:05:03 +0800 2019",
2930
"text": "整容手术都是骗人的,青春美貌全靠把你吸干",
30-
"badge": null
31+
"badge": null,
32+
"messageFree": false
3133
},
3234
{
3335
"idstr": "10002",
@@ -45,7 +47,8 @@
4547
"text": "4",
4648
"show": true,
4749
"dot": false
48-
}
50+
},
51+
"messageFree": false
4952
},
5053
{
5154
"idstr": "10003",
@@ -57,7 +60,8 @@
5760
"screen_name": "貂蝉",
5861
"created_at": "Tue Apr 09 00:05:03 +0800 2019",
5962
"text": "想欣赏妾身的舞姿吗?",
60-
"badge": null
63+
"badge": null,
64+
"messageFree": false
6165
},
6266
{
6367
"idstr": "10004",
@@ -75,7 +79,8 @@
7579
"text": "1",
7680
"show": true,
7781
"dot": false
78-
}
82+
},
83+
"messageFree": false
7984
},
8085
{
8186
"idstr": "10005",
@@ -87,7 +92,8 @@
8792
"screen_name": "不知火舞",
8893
"created_at": "Tue Apr 09 00:05:03 +0800 2019",
8994
"text": "りゅうえんぶ",
90-
"badge": null
95+
"badge": null,
96+
"messageFree": false
9197
},
9298
{
9399
"idstr": "10006",
@@ -99,7 +105,8 @@
99105
"screen_name": "花木兰",
100106
"created_at": "Tue Apr 09 00:05:03 +0800 2019",
101107
"text": "[动画表情]",
102-
"badge": null
108+
"badge": null,
109+
"messageFree": false
103110
},
104111
{
105112
"idstr": "10007",
@@ -117,7 +124,8 @@
117124
"text": "9",
118125
"show": true,
119126
"dot": false
120-
}
127+
},
128+
"messageFree": false
121129
},
122130
{
123131
"idstr": "10008",
@@ -129,7 +137,8 @@
129137
"screen_name": "武则天",
130138
"created_at": "Tue Apr 09 00:05:03 +0800 2019",
131139
"text": "普天之下莫非王土 做女人难做女帝更难....",
132-
"badge": null
140+
"badge": null,
141+
"messageFree": false
133142
},
134143
{
135144
"idstr": "10009",
@@ -147,7 +156,8 @@
147156
"text": "7",
148157
"show": true,
149158
"dot": false
150-
}
159+
},
160+
"messageFree": false
151161
},
152162
{
153163
"idstr": "10010",
@@ -159,7 +169,8 @@
159169
"screen_name": "元歌",
160170
"created_at": "Tue Apr 09 00:05:03 +0800 2019",
161171
"text": "用头脑,而不是武力。",
162-
"badge": null
172+
"badge": null,
173+
"messageFree": false
163174
},
164175
{
165176
"idstr": "10011",
@@ -177,7 +188,8 @@
177188
"text": "6",
178189
"show": true,
179190
"dot": false
180-
}
191+
},
192+
"messageFree": false
181193
},
182194
{
183195
"idstr": "10012",
@@ -195,7 +207,8 @@
195207
"screen_name": "草丛三婊",
196208
"created_at": "Tue Apr 09 00:05:03 +0800 2019",
197209
"text": "王昭君:凛冬已至,故乡的梅花开了吗?",
198-
"badge": null
210+
"badge": null,
211+
"messageFree": false
199212
},
200213
{
201214
"idstr": "10013",
@@ -213,7 +226,8 @@
213226
"text": "",
214227
"show": true,
215228
"dot": true
216-
}
229+
},
230+
"messageFree": false
217231
},
218232
{
219233
"idstr": "10014",
@@ -234,7 +248,8 @@
234248
"screen_name": "回血四人帮",
235249
"created_at": "Tue Apr 09 00:05:03 +0800 2019",
236250
"text": "蔡文姬:左三圈~右三圈~扭一扭转一转~人家也作萝莉控~",
237-
"badge": null
251+
"badge": null,
252+
"messageFree": true
238253
},
239254
{
240255
"idstr": "10015",
@@ -264,7 +279,8 @@
264279
"text": "136",
265280
"show": true,
266281
"dot": false
267-
}
282+
},
283+
"messageFree": false
268284
},
269285
{
270286
"idstr": "10016",
@@ -291,7 +307,8 @@
291307
"screen_name": "六亲不认",
292308
"created_at": "Tue Apr 09 00:05:03 +0800 2019",
293309
"text": "程咬金:一个字,干!",
294-
"badge": null
310+
"badge": null,
311+
"messageFree": false
295312
},
296313
{
297314
"idstr": "10017",
@@ -321,7 +338,8 @@
321338
"screen_name": "刺客信条",
322339
"created_at": "Tue Apr 09 00:05:03 +0800 2019",
323340
"text": "李白:可以赶尽,无法杀绝。",
324-
"badge": null
341+
"badge": null,
342+
"messageFree": false
325343
},
326344
{
327345
"idstr": "10018",
@@ -354,6 +372,44 @@
354372
"screen_name": "仙侠豪情",
355373
"created_at": "Tue Apr 09 00:05:03 +0800 2019",
356374
"text": "孙悟空:超出三界之外,不在五行之中",
357-
"badge": null
375+
"badge": null,
376+
"messageFree": false
377+
},
378+
{
379+
"idstr": "10019",
380+
"users": [
381+
{
382+
"profile_image_url": "https://game.gtimg.cn/images/yxzj/img201606/heroimg/199/199.jpg"
383+
},
384+
{
385+
"profile_image_url": "https://game.gtimg.cn/images/yxzj/img201606/heroimg/111/111.jpg"
386+
},
387+
{
388+
"profile_image_url": "https://game.gtimg.cn/images/yxzj/img201606/heroimg/174/174.jpg"
389+
},
390+
{
391+
"profile_image_url": "https://game.gtimg.cn/images/yxzj/img201606/heroimg/523/523.jpg"
392+
},
393+
{
394+
"profile_image_url": "https://game.gtimg.cn/images/yxzj/img201606/heroimg/515/515.jpg"
395+
},
396+
{
397+
"profile_image_url": "https://game.gtimg.cn/images/yxzj/img201606/heroimg/191/191.jpg"
398+
},
399+
{
400+
"profile_image_url": "https://game.gtimg.cn/images/yxzj/img201606/heroimg/106/106.jpg"
401+
},
402+
{
403+
"profile_image_url": "https://game.gtimg.cn/images/yxzj/img201606/heroimg/127/127.jpg"
404+
},
405+
{
406+
"profile_image_url": "https://game.gtimg.cn/images/yxzj/img201606/heroimg/513/513.jpg"
407+
}
408+
],
409+
"screen_name": "小姐姐✨",
410+
"created_at": "Tue Apr 09 00:05:03 +0800 2019",
411+
"text": "孙尚香:大小姐驾到,通通闪开!",
412+
"badge": null,
413+
"messageFree": false
358414
}
359415
]

0 commit comments

Comments
 (0)