Skip to content

B
book-app
提交 3fb9e044 authored 作者: 岳维路's avatar 岳维路
浏览文件
操作

合并分支 'test' 到 'sim'

Test 查看合并请求 kiwitap/zijing-app!17
上级 0f3d3747 8021a8e9
隐藏空白字符变更
内嵌 并排
正在显示 包含 107 行增加 和 77 行删除
lib/pages/library/view.dart
浏览文件 @ 3fb9e044
...@@ -108,16 +108,19 @@ class _LibraryPageState extends State<LibraryPage> { ...@@ -108,16 +108,19 @@ class _LibraryPageState extends State<LibraryPage> {
), ),
Visibility( Visibility(
visible: controller.show, visible: controller.show,
child: FilterPage( child: Container(
controller: controller, height: double.infinity,
sureTap: (){ child: FilterPage(
controller.setShow(controller.show); controller: controller,
controller.sureFilter(); sureTap: (){
}, controller.setShow(controller.show);
resetTap: (){ controller.sureFilter();
// controller.setShow(controller.show); },
controller.resetFilter(); resetTap: (){
},), // controller.setShow(controller.show);
controller.resetFilter();
},),
),
), ),
], ],
); );
......
lib/pages/library/widgets/filter.dart
浏览文件 @ 3fb9e044
...@@ -32,78 +32,82 @@ class _FilterPageState extends State<FilterPage> { ...@@ -32,78 +32,82 @@ class _FilterPageState extends State<FilterPage> {
}, },
child: Container( child: Container(
color: const Color(0xFF000000).withOpacity(0.5), color: const Color(0xFF000000).withOpacity(0.5),
child: Column( // color: Colors.red,
children: [ child: SingleChildScrollView(
GestureDetector( child: Column(
behavior: HitTestBehavior.opaque, // mainAxisSize: MainAxisSize.min,
onTap: (){}, children: [
child: Container( GestureDetector(
color: Colors.white, behavior: HitTestBehavior.opaque,
width: double.infinity, onTap: (){},
padding: EdgeInsets.only(bottom: 10.w), child: Container(
child: Column( color: Colors.white,
crossAxisAlignment: CrossAxisAlignment.start, width: double.infinity,
children: [ padding: EdgeInsets.only(bottom: 10.w),
Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
widget.controller.filterCategories.isEmpty?const SizedBox():_buildWrapWidget('分类', widget.controller.filterCategories), Column(
widget.controller.filterLabels.isEmpty?const SizedBox():_buildWrapWidget('标签', widget.controller.filterLabels), crossAxisAlignment: CrossAxisAlignment.start,
_buildWrapWidget('是否收费', widget.controller.filterFree), children: [
_buildWrapWidget('排序', widget.controller.filterDown), widget.controller.filterCategories.isEmpty?const SizedBox():_buildWrapWidget('分类', widget.controller.filterCategories),
], widget.controller.filterLabels.isEmpty?const SizedBox():_buildWrapWidget('标签', widget.controller.filterLabels),
) _buildWrapWidget('是否收费', widget.controller.filterFree),
], _buildWrapWidget('排序', widget.controller.filterDown),
), ],
)
],
),
),
), ),
), Container(
Container( padding: EdgeInsets.only(left:10.w,right:10.w,top:30.w,bottom:10.w),
padding: EdgeInsets.only(left:10.w,right:10.w,top:30.w,bottom:10.w), color: Colors.white,
color: Colors.white, // margin: const EdgeInsets.symmetric(horizontal: 15),
// margin: const EdgeInsets.symmetric(horizontal: 15), child: Row(
child: Row( mainAxisAlignment: MainAxisAlignment.spaceEvenly,
mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [
children: [ Expanded(
Expanded( child: GestureDetector(
child: GestureDetector( onTap: widget.resetTap,
onTap: widget.resetTap, child: Container(
child: Container( alignment: Alignment.center,
alignment: Alignment.center, height: 35.w,
height: 35.w, decoration: BoxDecoration(
decoration: BoxDecoration( borderRadius: BorderRadius.circular(17.5.w),
borderRadius: BorderRadius.circular(17.5.w), border:Border.all(
border:Border.all( width: 0.5.w,
width: 0.5.w, color: Colours.c9
color: Colours.c9 ),
// color: Colours.cE0.withOpacity(0.5),
), ),
// color: Colours.cE0.withOpacity(0.5), // padding: EdgeInsets.symmetric(vertical: 8),
child: Text('重置',style: TextStyle(fontSize: 13.w,color: Colours.c9,height: 1.5),),
), ),
// padding: EdgeInsets.symmetric(vertical: 8),
child: Text('重置',style: TextStyle(fontSize: 13.w,color: Colours.c9,height: 1.5),),
), ),
), ),
), Gaps.hGaps10,
Gaps.hGaps10, Expanded(
Expanded( child: GestureDetector(
child: GestureDetector( onTap: widget.sureTap,
onTap: widget.sureTap, child: Container(
child: Container( decoration: BoxDecoration(
decoration: BoxDecoration( borderRadius: BorderRadius.circular(17.5.w),
borderRadius: BorderRadius.circular(17.5.w), color: AppTheme.primary.withOpacity(0.1)
color: AppTheme.primary.withOpacity(0.1) ),
height: 35.w,
alignment: Alignment.center,
padding: EdgeInsets.symmetric(vertical: 8.w),
child: Text('确定',style: TextStyle(fontSize: 13.w,color: AppTheme.primary,height: 1.5),),
), ),
height: 35.w,
alignment: Alignment.center,
padding: EdgeInsets.symmetric(vertical: 8.w),
child: Text('确定',style: TextStyle(fontSize: 13.w,color: AppTheme.primary,height: 1.5),),
), ),
), )
) ],
], ),
), )
) ],
], ),
), ),
), ),
); );
......
lib/pages/read_info/index.dart
浏览文件 @ 3fb9e044
...@@ -5,6 +5,7 @@ import 'package:flutter/material.dart'; ...@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_inappwebview/flutter_inappwebview.dart'; import 'package:flutter_inappwebview/flutter_inappwebview.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
import '../../routes/index.dart';
import '../../utils/index.dart'; import '../../utils/index.dart';
part 'view.dart'; part 'view.dart';
\ No newline at end of file
lib/pages/read_info/view.dart
浏览文件 @ 3fb9e044
...@@ -26,7 +26,19 @@ class _ReadInfoPageState extends State<ReadInfoPage> { ...@@ -26,7 +26,19 @@ class _ReadInfoPageState extends State<ReadInfoPage> {
onLoadStop: (controller, url) { onLoadStop: (controller, url) {
String jsonStr = jsonEncode(widget.params); String jsonStr = jsonEncode(widget.params);
controller.evaluateJavascript(source: 'callbackInFlutterComponent($jsonStr)'); controller.evaluateJavascript(source: 'callbackInFlutterComponent($jsonStr)');
// 图片预览
controller.addJavaScriptHandler(handlerName: 'scaleImageCallback', callback: (args){
String url = args.first[0].toString();
String title = args.first[1].toString();
Map<String,String> params = {
'url':url,
'title':title,
};
Console.log('监听图片预览---------------给页面传参---------------------------------$params');
context.pushNamed(Routes.scaleImage,queryParameters: params);
});
}, },
onConsoleMessage: (controller, consoleMessage) { onConsoleMessage: (controller, consoleMessage) {
// 接收从 WebView 发送的消息 // 接收从 WebView 发送的消息
Console.log("画廊扩展阅读-------Received message from WebView-----------------------------: ${consoleMessage.message}"); Console.log("画廊扩展阅读-------Received message from WebView-----------------------------: ${consoleMessage.message}");
......
lib/pages/splash/index.dart
浏览文件 @ 3fb9e044
...@@ -7,5 +7,6 @@ import 'package:flutter_book/widgets/index.dart'; ...@@ -7,5 +7,6 @@ import 'package:flutter_book/widgets/index.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
import '../../routes/index.dart'; import '../../routes/index.dart';
import '../../utils/index.dart';
part 'view.dart'; part 'view.dart';
\ No newline at end of file
lib/pages/splash/view.dart
浏览文件 @ 3fb9e044
...@@ -15,13 +15,20 @@ class _SplashPageState extends State<SplashPage> { ...@@ -15,13 +15,20 @@ class _SplashPageState extends State<SplashPage> {
Future.wait([ Future.wait([
Future.delayed(const Duration(seconds: 2)) Future.delayed(const Duration(seconds: 2))
]).whenComplete(() async { ]).whenComplete(() async {
final ads = await CommonAPI.list(type: '1'); final netStatus = await Tools.checkCurrentNetStatus();
if (ads.isNotEmpty){ if (netStatus){
context.pushReplacementNamed(Routes.ad,extra: ads); final ads = await CommonAPI.list(type: '1');
if (ads.isNotEmpty) {
context.pushReplacementNamed(Routes.ad,extra: ads);
}
else {
context.pushReplacementNamed(Routes.main);
}
} }
else { else {
context.pushReplacementNamed(Routes.main); context.pushReplacementNamed(Routes.main);
} }
}); });
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论