add read scene

README.md

@@ -8,12 +8,16 @@
 
 <img src="https://github.com/huanxsd/flutter_shuqi/blob/master/screenshot/ios_1.png">
 
+<img src="https://github.com/huanxsd/flutter_shuqi/blob/master/screenshot/ios_2.png">
+
 ## screen shot for Android
 
 <img src="https://github.com/huanxsd/flutter_shuqi/blob/master/screenshot/android_0.png">
 
 <img src="https://github.com/huanxsd/flutter_shuqi/blob/master/screenshot/android_1.png">
 
+<img src="https://github.com/huanxsd/flutter_shuqi/blob/master/screenshot/android_2.png">
+
 ## Setup
 
 1. **Clone the repo**

lib/app/app_navigator.dart

@@ -5,6 +5,7 @@ import 'package:shuqi/public.dart';
 import 'package:shuqi/novel_detail/novel_detail_scene.dart';
 import 'package:shuqi/me/login_scene.dart';
 import 'package:shuqi/me/web_scene.dart';
+import 'package:shuqi/reader/reader_scene.dart';
 
 class AppNavigator {
  static push(BuildContext context, Widget scene) {
@@ -31,4 +32,10 @@ class AppNavigator {
  return WebScene(url: url, title: title);
  }));
  }
+
+ static pushReader(BuildContext context, int articleId) {
+ Navigator.push(context, MaterialPageRoute(builder: (context) {
+ return ReaderScene(articleId: articleId);
+ }));
+ }
 }

lib/bookshelf/bookshelf_scene.dart

@@ -70,7 +70,7 @@ class BookshelfState extends State<BookshelfScene> with RouteAware {
  this.favoriteNovels = favoriteNovels;
  });
  } catch (e) {
- print(e);
+ Toast.show(e.toString());
  }
  }
 

lib/home/home_list_view.dart

@@ -43,34 +43,38 @@ class HomeListViewState extends State<HomeListView> with AutomaticKeepAliveClien
  bool get wantKeepAlive => true;
 
  Future<void> fetchData() async {
- var action;
- switch (this.widget.type) {
- case HomeListType.excellent:
- action = 'home_excellent';
- break;
- case HomeListType.female:
- action = 'home_female';
- break;
- case HomeListType.male:
- action = 'home_male';
- break;
- case HomeListType.cartoon:
- action = 'home_cartoon';
- break;
- default:
- break;
- }
- var responseJson = await Request.get(action: action);
- List moduleData = responseJson['module'];
- List<HomeModule> modules = [];
- moduleData.forEach((data) {
- modules.add(HomeModule.fromJson(data));
- });
+ try {
+ var action;
+ switch (this.widget.type) {
+ case HomeListType.excellent:
+ action = 'home_excellent';
+ break;
+ case HomeListType.female:
+ action = 'home_female';
+ break;
+ case HomeListType.male:
+ action = 'home_male';
+ break;
+ case HomeListType.cartoon:
+ action = 'home_cartoon';
+ break;
+ default:
+ break;
+ }
+ var responseJson = await Request.get(action: action);
+ List moduleData = responseJson['module'];
+ List<HomeModule> modules = [];
+ moduleData.forEach((data) {
+ modules.add(HomeModule.fromJson(data));
+ });
 
- setState(() {
- this.modules = modules;
- this.carouselInfos = carouselInfos;
- });
+ setState(() {
+ this.modules = modules;
+ this.carouselInfos = carouselInfos;
+ });
+ } catch (e) {
+ Toast.show(e.toString());
+ }
  }
 
  Widget bookCardWithInfo(HomeModule module) {

lib/me/login_scene.dart

@@ -20,27 +20,35 @@ class LoginSceneState extends State {
  if (phoneEditer.text.length == 0) {
  return;
  }
- await Request.post(
- action: 'sms',
- params: {'phone': phoneEditer.text, 'type': 'login'},
- );
- setState(() {
- coldDownSeconds = 60;
- });
- coldDown();
+ try {
+ await Request.post(
+ action: 'sms',
+ params: {'phone': phoneEditer.text, 'type': 'login'},
+ );
+ setState(() {
+ coldDownSeconds = 60;
+ });
+ coldDown();
+ } catch (e) {
+ Toast.show(e.toString());
+ }
  }
 
  login() async {
  var phone = phoneEditer.text;
  var code = codeEditer.text;
 
- var response = await Request.post(action: 'login', params: {
- 'phone': phone,
- 'code': code,
- });
- UserManager.instance.login(response);
+ try {
+ var response = await Request.post(action: 'login', params: {
+ 'phone': phone,
+ 'code': code,
+ });
+ UserManager.instance.login(response);
 
- Navigator.pop(context);
+ Navigator.pop(context);
+ } catch (e) {
+ Toast.show(e.toString());
+ }
  }
 
  @override

lib/model/article.dart

@@ -0,0 +1,30 @@
+class Article {
+ int id;
+ int novelId;
+ String title;
+ String content;
+ int price;
+ int idx;
+ int nextArticleId;
+ int preArticleId;
+
+ List<Map<String, int>> pageOffsets;
+
+ Article.fromJson(Map data) {
+ id = data['id'];
+ novelId = data['novel_id'];
+ title = data['title'];
+ content = data['content'];
+ content = '　　' + content;
+ content = content.replaceAll('\n', '\n　　');
+ price = data['welth'];
+ idx = data['idx'];
+ nextArticleId = data['next_id'];
+ preArticleId = data['prev_id'];
+ }
+
+ String stringAtPageIndex(int index) {
+ var offset = pageOffsets[index];
+ return this.content.substring(offset['start'], offset['end']);
+ }
+}

lib/model/novel.dart

@@ -17,6 +17,7 @@ class Novel {
  int chapterCount;
  int recommendCount;
  int commentCount;
+ int firstArticleId;
 
  List<String> roles;
  String status;
@@ -26,6 +27,7 @@ class Novel {
 
  Novel.fromJson(Map data) {
  id = data['bid'];
+ firstArticleId = data['first_article_id'];
  name = data['bookname'];
  imgUrl = data['book_cover'];
  firstChapter = data['topic_first'];

lib/novel_detail/novel_detail_header.dart

@@ -48,11 +48,11 @@ class NovelDetailHeader extends StatelessWidget {
  child: Column(
  crossAxisAlignment: CrossAxisAlignment.start,
  children: <Widget>[
- Text(novel.name, style: TextStyle(fontSize: 18, color: Colors.white, fontWeight: FontWeight.bold)),
+ Text(novel.name, style: TextStyle(fontSize: fixedFontSize(18), color: Colors.white, fontWeight: FontWeight.bold)),
  SizedBox(height: 10),
- Text(novel.author, style: TextStyle(fontSize: 14, color: SQColor.white)),
+ Text(novel.author, style: TextStyle(fontSize: fixedFontSize(14), color: SQColor.white)),
  SizedBox(height: 10),
- Text('${novel.wordCount}万字 ${novel.price}书豆/千字', style: TextStyle(fontSize: 14, color: SQColor.white)),
+ Text('${novel.wordCount}万字 ${novel.price}书豆/千字', style: TextStyle(fontSize: fixedFontSize(14), color: SQColor.white)),
  SizedBox(height: 10),
  buildScore(),
  SizedBox(height: 10),
@@ -63,7 +63,7 @@ class NovelDetailHeader extends StatelessWidget {
  Expanded(
  child: Text(
  ' 续费包月会员，万本小说免费读 >',
- style: TextStyle(fontSize: 14, color: Color(0xFFFEA900)),
+ style: TextStyle(fontSize: fixedFontSize(14), color: Color(0xFFFEA900)),
  maxLines: 1,
  ),
  ),
@@ -78,7 +78,7 @@ class NovelDetailHeader extends StatelessWidget {
  }
 
  Widget buildScore() {
- List<Widget> children = [Text('评分：${novel.score}分 ', style: TextStyle(fontSize: 14, color: Color(0xfff8e71c)))];
+ List<Widget> children = [Text('评分：${novel.score}分 ', style: TextStyle(fontSize: fixedFontSize(14), color: Color(0xfff8e71c)))];
 
  var star = novel.score;
 

lib/novel_detail/novel_detail_scene.dart

@@ -67,7 +67,7 @@ class NovelDetailSceneState extends State<NovelDetailScene> with RouteAware {
  void didPush() {
  // 间隔500毫秒后，再设置状态栏样式。否则设置无效（会被build覆盖？）。
  Timer(Duration(milliseconds: 500), () {
- Screen.updateStatusBarStyle(SystemUiOverlayStyle.light);
+ updateStatusBar();
  });
  }
 
@@ -105,27 +105,31 @@ class NovelDetailSceneState extends State<NovelDetailScene> with RouteAware {
  }
 
  fetchData() async {
- var novelId = this.widget.novelId;
+ try {
+ var novelId = this.widget.novelId;
 
- var novelResponse = await Request.post(action: 'novel_detail', params: {'id': novelId});
+  var novelResponse = await Request.post(action: 'novel_detail', params: {'id': novelId});
 
- var commentsResponse = await Request.post(action: 'novel_comment', params: {'id': novelId});
- List<NovelComment> comments = [];
- commentsResponse.forEach((data) {
- comments.add(NovelComment.fromJson(data));
- });
+  var commentsResponse = await Request.post(action: 'novel_comment', params: {'id': novelId});
+  List<NovelComment> comments = [];
+  commentsResponse.forEach((data) {
+  comments.add(NovelComment.fromJson(data));
+  });
 
- var recommendResponse = await Request.post(action: 'novel_recommend', params: {'id': novelId});
- List<Novel> recommendNovels = [];
- recommendResponse.forEach((data) {
- recommendNovels.add(Novel.fromJson(data));
- });
+  var recommendResponse = await Request.post(action: 'novel_recommend', params: {'id': novelId});
+  List<Novel> recommendNovels = [];
+  recommendResponse.forEach((data) {
+  recommendNovels.add(Novel.fromJson(data));
+  });
 
- setState(() {
- this.novel = Novel.fromJson(novelResponse);
- this.comments = comments;
- this.recommendNovels = recommendNovels;
- });
+ setState(() {
+ this.novel = Novel.fromJson(novelResponse);
+ this.comments = comments;
+ this.recommendNovels = recommendNovels;
+ });
+ } catch (e) {
+ Toast.show(e.toString());
+ }
  }
 
  Widget buildNavigationBar() {
@@ -274,7 +278,7 @@ class NovelDetailSceneState extends State<NovelDetailScene> with RouteAware {
  ],
  ),
  ),
- NovelDetailToolbar(),
+ NovelDetailToolbar(novel),
  ],
  ),
  buildNavigationBar(),

lib/novel_detail/novel_detail_toolbar.dart

@@ -3,6 +3,9 @@ import 'package:flutter/material.dart';
 import 'package:shuqi/public.dart';
 
 class NovelDetailToolbar extends StatelessWidget {
+ final Novel novel;
+ NovelDetailToolbar(this.novel);
+
  read() {}
  @override
  Widget build(BuildContext context) {
@@ -20,13 +23,18 @@ class NovelDetailToolbar extends StatelessWidget {
  ),
  ),
  Expanded(
- child: Container(
- height: 40,
- decoration: BoxDecoration(color: SQColor.primary, borderRadius: BorderRadius.circular(5)),
- child: Center(
- child: Text(
- '开始阅读',
- style: TextStyle(fontSize: 16, color: Colors.white),
+ child: GestureDetector(
+ onTap: () {
+ AppNavigator.pushReader(context, novel.firstArticleId);
+ },
+ child: Container(
+ height: 40,
+ decoration: BoxDecoration(color: SQColor.primary, borderRadius: BorderRadius.circular(5)),
+ child: Center(
+ child: Text(
+ '开始阅读',
+ style: TextStyle(fontSize: 16, color: Colors.white),
+ ),
  ),
  ),
  ),

lib/public.dart

@@ -1,11 +1,15 @@
 library public;
 
+// Vendor
+
 // Global
 export 'package:shuqi/global.dart';
 
 // Utility
+export 'package:shuqi/utility/utility.dart';
 export 'package:shuqi/utility/screen.dart';
 export 'package:shuqi/utility/event_bus.dart';
+export 'package:shuqi/utility/toast.dart';
 
 // Widget
 export 'package:shuqi/widget/novel_cover_image.dart';
@@ -23,3 +27,4 @@ export 'package:shuqi/app/app_scene.dart';
 export 'package:shuqi/model/novel.dart';
 export 'package:shuqi/model/chapter.dart';
 export 'package:shuqi/model/novel_comment.dart';
+export 'package:shuqi/model/article.dart';

lib/reader/article_provider.dart

@@ -0,0 +1,10 @@
+import 'package:shuqi/public.dart';
+
+class ArticleProvider {
+ static Future<Article> fetchArticle(int articleId) async {
+ var response = await Request.get(action: 'article_$articleId');
+ var article = Article.fromJson(response);
+
+ return article;
+ }
+}