Skip to content

Commit de1db2b

Browse files
honjowhonjow
committed
Fix: 修复通过url链接打开应用后无法通过tag搜索的问题。修复一些搜索相关的问题
1 parent a73c173 commit de1db2b

File tree

11 files changed

+1264
-99
lines changed

11 files changed

+1264
-99
lines changed

‎lib/common/global.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -202,11 +202,6 @@ class Global {
202202

203203
canCheckBiometrics = await localAuth.canCheckBiometrics;
204204

205-
// 代理初始化
206-
if (Platform.isIOS || Platform.isAndroid) {
207-
await CustomHttpsProxy.instance.init();
208-
}
209-
210205
//statusBar设置为透明，去除半透明遮罩
211206
// SystemChrome.setSystemUIOverlayStyle(
212207
// const SystemUiOverlayStyle(statusBarColor: Colors.transparent));
@@ -228,6 +223,11 @@ class Global {
228223
initLogger();
229224
}
230225

226+
// 代理初始化
227+
if (Platform.isIOS || Platform.isAndroid) {
228+
await CustomHttpsProxy.instance.init();
229+
}
230+
231231
logger.i('doc $appDocPath \napps $appSupportPath \ntemp $tempPath');
232232

233233
dbPath = path.join(Global.appSupportPath, EHConst.DB_NAME);

‎lib/get_init.dart

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
import 'package:get/get.dart';
2+
3+
import 'common/controller/advance_search_controller.dart';
4+
import 'common/controller/archiver_download_controller.dart';
5+
import 'common/controller/auto_lock_controller.dart';
6+
import 'common/controller/download_controller.dart';
7+
import 'common/controller/gallerycache_controller.dart';
8+
import 'common/controller/history_controller.dart';
9+
import 'common/controller/localfav_controller.dart';
10+
import 'common/controller/quicksearch_controller.dart';
11+
import 'common/controller/tag_trans_controller.dart';
12+
import 'common/controller/user_controller.dart';
13+
import 'common/isolate/download_manager.dart';
14+
import 'common/service/depth_service.dart';
15+
import 'common/service/dns_service.dart';
16+
import 'common/service/ehconfig_service.dart';
17+
import 'common/service/layout_service.dart';
18+
import 'common/service/locale_service.dart';
19+
import 'common/service/theme_service.dart';
20+
import 'pages/controller/fav_dialog_controller.dart';
21+
import 'pages/controller/favorite_sel_controller.dart';
22+
import 'pages/tab/controller/download_view_controller.dart';
23+
import 'pages/tab/controller/favorite_controller.dart';
24+
import 'pages/tab/controller/gallery_controller.dart';
25+
import 'pages/tab/controller/history_controller.dart';
26+
import 'pages/tab/controller/popular_controller.dart';
27+
import 'pages/tab/controller/setting_controller.dart';
28+
import 'pages/tab/controller/splash_controller.dart';
29+
import 'pages/tab/controller/tabhome_controller.dart';
30+
import 'pages/tab/controller/unlock_page_controller.dart';
31+
import 'pages/tab/controller/watched_controller.dart';
32+
33+
void getinit() {
34+
Get.lazyPut(() => EhConfigService(), fenix: true);
35+
36+
//LocaleController
37+
Get.lazyPut(() => LocaleService(), fenix: true);
38+
// ThemeController
39+
Get.lazyPut(() => ThemeService(), fenix: true);
40+
// DnsConfigController
41+
Get.put(DnsService(), permanent: true);
42+
Get.put(DepthService());
43+
44+
Get.lazyPut(() => LayoutServices());
45+
46+
/// 一些全局设置或者控制
47+
Get.lazyPut(() => AutoLockController(), fenix: true);
48+
Get.lazyPut(() => LocalFavController(), fenix: true);
49+
Get.lazyPut(() => HistoryController(), fenix: true);
50+
Get.lazyPut(() => UserController(), fenix: true);
51+
Get.lazyPut(() => GalleryCacheController(), fenix: true);
52+
53+
Get.lazyPut(() => DownloadController(), fenix: true);
54+
Get.lazyPut(() => ArchiverDownloadController(), fenix: true);
55+
56+
Get.lazyPut(() => TabHomeController(), fenix: true);
57+
Get.lazyPut(() => PopularViewController(), fenix: true);
58+
Get.lazyPut(() => WatchedViewController(), fenix: true);
59+
Get.lazyPut(() => GalleryViewController(), fenix: true);
60+
Get.lazyPut(() => SettingViewController(), fenix: true);
61+
62+
Get.lazyPut(() => HistoryViewController(), fenix: true);
63+
Get.lazyPut(() => DownloadViewController(), fenix: true);
64+
Get.lazyPut(() => FavoriteViewController(), fenix: true);
65+
66+
Get.lazyPut(() => QuickSearchController(), fenix: true);
67+
Get.lazyPut(() => AdvanceSearchController(), fenix: true);
68+
Get.lazyPut(() => FavDialogController(), fenix: true);
69+
Get.lazyPut(() => FavoriteSelectorController(), fenix: true);
70+
71+
Get.lazyPut(() => UnlockPageController(), fenix: true);
72+
Get.lazyPut(() => TagTransController(), fenix: true);
73+
74+
Get.lazyPut(() => SplashController());
75+
}

‎lib/main.dart

Lines changed: 3 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,12 @@ import 'dart:async';
22
import 'dart:ui';
33

44
import 'package:fehviewer/common/controller/auto_lock_controller.dart';
5-
import 'package:fehviewer/common/controller/download_controller.dart';
65
import 'package:fehviewer/common/global.dart';
7-
import 'package:fehviewer/common/service/dns_service.dart';
86
import 'package:fehviewer/common/service/ehconfig_service.dart';
97
import 'package:fehviewer/common/service/locale_service.dart';
108
import 'package:fehviewer/common/service/log_service.dart';
119
import 'package:fehviewer/common/service/theme_service.dart';
1210
import 'package:fehviewer/generated/l10n.dart';
13-
import 'package:fehviewer/pages/controller/fav_dialog_controller.dart';
14-
import 'package:fehviewer/pages/controller/favorite_sel_controller.dart';
15-
import 'package:fehviewer/pages/tab/controller/download_view_controller.dart';
16-
import 'package:fehviewer/pages/tab/controller/splash_controller.dart';
1711
import 'package:fehviewer/pages/tab/view/splash_page.dart';
1812
import 'package:fehviewer/route/app_pages.dart';
1913
import 'package:fehviewer/store/get_store.dart';
@@ -29,18 +23,8 @@ import 'package:get/get.dart';
2923
import 'package:logger/logger.dart';
3024
import 'package:oktoast/oktoast.dart';
3125

32-
import 'common/controller/advance_search_controller.dart';
33-
import 'common/controller/archiver_download_controller.dart';
34-
import 'common/controller/gallerycache_controller.dart';
35-
import 'common/controller/history_controller.dart';
36-
import 'common/controller/localfav_controller.dart';
37-
import 'common/controller/quicksearch_controller.dart';
38-
import 'common/controller/tag_trans_controller.dart';
39-
import 'common/controller/user_controller.dart';
4026
import 'common/isolate/download_manager.dart';
41-
import 'common/service/depth_service.dart';
42-
import 'common/service/layout_service.dart';
43-
import 'pages/tab/controller/unlock_page_controller.dart';
27+
import 'get_init.dart';
4428

4529
Future<void> main() async {
4630
WidgetsFlutterBinding.ensureInitialized();
@@ -52,38 +36,7 @@ Future<void> main() async {
5236

5337
await _initializeFlutterFire();
5438

55-
Get.lazyPut(() => EhConfigService(), fenix: true);
56-
57-
//LocaleController
58-
Get.lazyPut(() => LocaleService(), fenix: true);
59-
// ThemeController
60-
Get.lazyPut(() => ThemeService(), fenix: true);
61-
// DnsConfigController
62-
Get.put(DnsService(), permanent: true);
63-
Get.put(DepthService());
64-
65-
Get.lazyPut(() => LayoutServices());
66-
67-
/// 一些全局设置或者控制
68-
Get.lazyPut(() => AutoLockController(), fenix: true);
69-
Get.put(LocalFavController(), permanent: true);
70-
Get.put(HistoryController(), permanent: true);
71-
Get.put(UserController(), permanent: true);
72-
Get.lazyPut(() => GalleryCacheController(), fenix: true);
73-
74-
Get.lazyPut(() => DownloadController(), fenix: true);
75-
Get.lazyPut(() => ArchiverDownloadController(), fenix: true);
76-
Get.lazyPut(() => DownloadViewController(), fenix: true);
77-
78-
Get.lazyPut(() => QuickSearchController(), fenix: true);
79-
Get.lazyPut(() => AdvanceSearchController(), fenix: true);
80-
Get.lazyPut(() => FavDialogController(), fenix: true);
81-
Get.lazyPut(() => FavoriteSelectorController(), fenix: true);
82-
83-
Get.lazyPut(() => UnlockPageController(), fenix: true);
84-
Get.lazyPut(() => TagTransController(), fenix: true);
85-
86-
Get.lazyPut(() => SplashController());
39+
getinit();
8740

8841
if (Get.find<EhConfigService>().debugMode) {
8942
Logger.level = Level.debug;
@@ -94,7 +47,6 @@ Future<void> main() async {
9447
resetLogLevel();
9548

9649
downloadManager.init();
97-
// downloadManager.initLogger();
9850

9951
runApp(MyApp());
10052
}, (Object error, StackTrace stackTrace) {
@@ -190,7 +142,7 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
190142
home: SplashPage(),
191143
theme: theme,
192144
locale: locale,
193-
// enableLog: false,
145+
enableLog: false,
194146
logWriterCallback: loggerGetx,
195147
// ignore: prefer_const_literals_to_create_immutables
196148
supportedLocales: <Locale>[

‎lib/pages/filter/gallery_filter_view.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class GalleryFilterView extends StatelessWidget {
3434

3535
SearchPageController? get _searchPageController {
3636
if (int.parse(searchPageCtrlDepth) > 0) {
37-
logger.d('searchPageCtrlDepth $searchPageCtrlDepth');
37+
logger.v('searchPageCtrlDepth $searchPageCtrlDepth');
3838
return Get.find<SearchPageController>(tag: searchPageCtrlDepth);
3939
}
4040
}

‎lib/pages/item/gallery_item.dart

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import 'package:fehviewer/widget/blur_image.dart';
1010
import 'package:fehviewer/widget/rating_bar.dart';
1111
import 'package:flutter/cupertino.dart';
1212
import 'package:flutter/material.dart';
13+
import 'package:flutter/widgets.dart';
1314
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
1415
import 'package:get/get.dart';
1516
import 'package:keframe/frame_separate_widget.dart';
@@ -473,3 +474,97 @@ class CoverImg extends StatelessWidget {
473474
));
474475
}
475476
}
477+
478+
class GalleryItemPlaceHolder extends StatelessWidget {
479+
const GalleryItemPlaceHolder({Key? key}) : super(key: key);
480+
481+
@override
482+
Widget build(BuildContext context) {
483+
final double coverImageWidth =
484+
Get.context!.isPhone ? Get.context!.mediaQueryShortestSide / 3 : 120;
485+
486+
final _line = ClipRRect(
487+
borderRadius: BorderRadius.circular(6),
488+
child: Container(
489+
color: CupertinoColors.systemGrey5,
490+
height: 16,
491+
),
492+
).paddingSymmetric(vertical: 4);
493+
494+
return Column(
495+
children: <Widget>[
496+
Container(
497+
padding: const EdgeInsets.fromLTRB(kPaddingLeft, 8, 8, 8),
498+
child: Column(
499+
children: <Widget>[
500+
Row(
501+
children: <Widget>[
502+
// 封面图片
503+
ClipRRect(
504+
borderRadius: BorderRadius.circular(6),
505+
child: Container(
506+
constraints: const BoxConstraints(maxHeight: 200),
507+
color: CupertinoColors.systemGrey5,
508+
width: coverImageWidth,
509+
),
510+
),
511+
const SizedBox(
512+
width: 8,
513+
),
514+
// 右侧信息
515+
Expanded(
516+
child: SingleChildScrollView(
517+
child: Column(
518+
crossAxisAlignment: CrossAxisAlignment.start,
519+
children: <Widget>[
520+
_line,
521+
_line,
522+
Container(width: 70, child: _line),
523+
const SizedBox(height: 4),
524+
_line,
525+
Container(width: 70, child: _line),
526+
527+
// 评分行
528+
Row(
529+
crossAxisAlignment: CrossAxisAlignment.end,
530+
children: <Widget>[
531+
// 评分
532+
Container(width: 50, child: _line),
533+
// 占位
534+
const Spacer(),
535+
Container(width: 50, child: _line),
536+
],
537+
),
538+
const SizedBox(
539+
height: 4,
540+
),
541+
// 类型和时间
542+
Row(
543+
crossAxisAlignment: CrossAxisAlignment.end,
544+
children: <Widget>[
545+
// 类型
546+
// _buildCategory(),
547+
const Spacer(),
548+
// 上传时间
549+
// _buildPostTime(),
550+
],
551+
),
552+
],
553+
),
554+
),
555+
),
556+
],
557+
),
558+
],
559+
),
560+
),
561+
Divider(
562+
height: 0.5,
563+
indent: kPaddingLeft,
564+
color: CupertinoDynamicColor.resolve(
565+
CupertinoColors.systemGrey4, Get.context!),
566+
),
567+
],
568+
);
569+
}
570+
}

‎lib/pages/tab/bindings/tabhome_binding.dart

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,5 @@ class TabHomeBinding extends Bindings {
1212
@override
1313
void dependencies() {
1414
// logger.d('TabHomeBinding');
15-
Get.lazyPut(() => TabHomeController(), fenix: true);
16-
Get.lazyPut(() => PopularViewController(), fenix: true);
17-
Get.lazyPut(() => WatchedViewController(), fenix: true);
18-
Get.lazyPut(() => GalleryViewController(), fenix: true);
19-
Get.lazyPut(() => FavoriteViewController(), fenix: true);
20-
Get.lazyPut(() => SettingViewController(), fenix: true);
21-
22-
Get.lazyPut(() => HistoryViewController(), fenix: true);
23-
Get.lazyPut(() => DownloadViewController(), fenix: true);
2415
}
2516
}

0 commit comments

Comments
 (0)