HCha/PiliPlus
1
0
Fork 0
mirror of https://github.com/HChaZZY/PiliPlus.git synced 2025-12-06 09:13:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: emote

Browse Source
This commit is contained in:
bggRGjQaUbCoE
2024-09-13 12:33:02 +08:00
parent e29d1cc5f1
commit 6ca585abb4
16 changed files with 124 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/http/reply.dart
View File

@@ -96,22 +96,16 @@ class ReplyHttp {
}
}
static Future getEmoteList({String? business}) async {
static Future<LoadingState> getEmoteList({String? business}) async {
var res = await Request().get(Api.myEmote, data: {
'business': business ?? 'reply',
'web_location': '333.1245',
});
if (res.data['code'] == 0) {
return {
'status': true,
'data': EmoteModelData.fromJson(res.data['data']),
};
return LoadingState.success(
EmoteModelData.fromJson(res.data['data']).packages);
} else {
return {
'status': false,
'date': [],
'msg': res.data['message'],
};
return LoadingState.error(res.data['message']);
}
}
}

2
lib/pages/bangumi/introduction/controller.dart
View File

@@ -53,7 +53,7 @@ class BangumiIntroController extends CommonController {
// 关注状态 默认未关注
RxMap followStatus = {}.obs;
int _tempThemeValue = -1;
var userInfo;
dynamic userInfo;
@override
void onInit() {

2
lib/pages/common/reply_controller.dart
View File

@@ -118,7 +118,7 @@ abstract class ReplyController extends CommonController {
dynamic replyItem,
int index = 0,
}) {
dynamic key = oid ?? replyItem.oid + replyItem.rpid + replyItem.rpid;
dynamic key = oid ?? replyItem.oid + replyItem.rpid;
Navigator.of(context)
.push(
GetDialogRoute(

1
lib/pages/dynamics/tab/controller.dart
View File

@@ -18,7 +18,6 @@ class DynamicsTabController extends CommonController {
@override
Future onRefresh() async {
offset = '';
print('11111111111111111111111111111111 $dynamicsType,,$mid');
await queryData();
}

2
lib/pages/dynamics/widgets/up_panel.dart
View File

@@ -24,7 +24,7 @@ class _UpPanelState extends State<UpPanel> {
List<UpItem> upList = [];
List<LiveUserItem> liveList = [];
Box userInfoCache = GStorage.userInfo;
var userInfo;
dynamic userInfo;
bool _showLiveItems = false;
late DynamicsController dynamicsController;

29
lib/pages/emote/controller.dart
View File

@@ -1,20 +1,29 @@
import 'package:PiliPalaX/http/loading_state.dart';
import 'package:PiliPalaX/pages/common/common_controller.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import '../../http/reply.dart';
import '../../models/video/reply/emote.dart';
class EmotePanelController extends GetxController
class EmotePanelController extends CommonController
with GetTickerProviderStateMixin {
late List<Packages> emotePackage;
late TabController tabController;
Future getEmote() async {
var res = await ReplyHttp.getEmoteList(business: 'reply');
if (res['status']) {
emotePackage = res['data'].packages;
tabController = TabController(length: emotePackage.length, vsync: this);
}
return res;
@override
void onInit() {
super.onInit();
queryData();
}
@override
bool customHandleResponse(Success response) {
tabController =
TabController(length: response.response.length, vsync: this);
loadingState.value = response;
return true;
}
@override
Future<LoadingState> customGetData() =>
ReplyHttp.getEmoteList(business: 'reply');
}

192
lib/pages/emote/view.dart
View File

@@ -1,7 +1,8 @@
import 'package:PiliPalaX/http/loading_state.dart';
import 'package:PiliPalaX/models/video/reply/emote.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import '../../common/widgets/network_img_layer.dart';
import '../../models/video/reply/emote.dart';
import 'controller.dart';
class EmotePanel extends StatefulWidget {
@@ -16,116 +17,101 @@ class _EmotePanelState extends State<EmotePanel>
with AutomaticKeepAliveClientMixin {
final EmotePanelController _emotePanelController =
Get.put(EmotePanelController());
late Future _futureBuilderFuture;
@override
bool get wantKeepAlive => true;
@override
void initState() {
super.initState();
_futureBuilderFuture = _emotePanelController.getEmote();
}
@override
Widget build(BuildContext context) {
super.build(context);
return FutureBuilder(
future: _futureBuilderFuture,
builder: (context, snapshot) {
if (snapshot.connectionState == ConnectionState.done) {
Map data = snapshot.data as Map;
if (data['status']) {
List<Packages> emotePackage = _emotePanelController.emotePackage;
return Obx(() => _buildBody(_emotePanelController.loadingState.value));
}
return Column(
children: [
Expanded(
child: TabBarView(
controller: _emotePanelController.tabController,
children: emotePackage.map(
(e) {
int size = e.emote!.first.meta!.size!;
int type = e.type!;
return Padding(
padding: const EdgeInsets.fromLTRB(12, 6, 12, 0),
child: GridView.builder(
gridDelegate:
SliverGridDelegateWithMaxCrossAxisExtent(
maxCrossAxisExtent:
type == 4 ? 100 : (size == 1 ? 40 : 60),
crossAxisSpacing: 8,
mainAxisSpacing: 8,
mainAxisExtent: size == 1 ? 40 : 60,
),
itemCount: e.emote!.length,
itemBuilder: (context, index) {
return Material(
color: Colors.transparent,
child: InkWell(
borderRadius: BorderRadius.circular(8),
onTap: () {
widget.onChoose(e, e.emote![index]);
},
child: Padding(
padding: const EdgeInsets.all(6),
child: type == 4
? Center(
child: Text(
e.emote![index].text!,
overflow: TextOverflow.clip,
maxLines: 1,
),
)
: NetworkImgLayer(
src: e.emote![index].url!,
width: size * 38,
height: size * 38,
semanticsLabel:
e.emote![index].text!,
type: 'emote',
),
),
),
);
},
),
);
},
).toList(),
),
),
Divider(
height: 1,
color: Theme.of(context).dividerColor.withOpacity(0.1),
),
TabBar(
controller: _emotePanelController.tabController,
dividerColor: Colors.transparent,
isScrollable: true,
tabs: _emotePanelController.emotePackage
.map(
(e) => Padding(
padding: const EdgeInsets.all(8),
child: NetworkImgLayer(
width: 24,
height: 24,
type: 'emote',
src: e.url,
),
Widget _buildBody(LoadingState loadingState) {
return loadingState is Success
? Column(
children: [
Expanded(
child: TabBarView(
controller: _emotePanelController.tabController,
children: (loadingState.response as List<Packages>).map(
(e) {
int size = e.emote!.first.meta!.size!;
int type = e.type!;
return Padding(
padding: const EdgeInsets.fromLTRB(12, 6, 12, 0),
child: GridView.builder(
gridDelegate:
SliverGridDelegateWithMaxCrossAxisExtent(
maxCrossAxisExtent:
type == 4 ? 100 : (size == 1 ? 40 : 60),
crossAxisSpacing: 8,
mainAxisSpacing: 8,
mainAxisExtent: size == 1 ? 40 : 60,
),
)
.toList(),
),
SizedBox(height: MediaQuery.of(context).padding.bottom),
],
);
} else {
return Center(child: Text(data['msg']));
}
} else {
return const Center(child: Text('加载中...'));
}
});
itemCount: e.emote!.length,
itemBuilder: (context, index) {
return Material(
color: Colors.transparent,
child: InkWell(
borderRadius: BorderRadius.circular(8),
onTap: () {
widget.onChoose(e, e.emote![index]);
},
child: Padding(
padding: const EdgeInsets.all(6),
child: type == 4
? Center(
child: Text(
e.emote![index].text!,
overflow: TextOverflow.clip,
maxLines: 1,
),
)
: NetworkImgLayer(
src: e.emote![index].url!,
width: size * 38,
height: size * 38,
semanticsLabel: e.emote![index].text!,
type: 'emote',
),
),
),
);
},
),
);
},
).toList(),
),
),
Divider(
height: 1,
color: Theme.of(context).dividerColor.withOpacity(0.1),
),
TabBar(
controller: _emotePanelController.tabController,
dividerColor: Colors.transparent,
isScrollable: true,
tabs: (loadingState.response as List<Packages>)
.map(
(e) => Padding(
padding: const EdgeInsets.all(8),
child: NetworkImgLayer(
width: 24,
height: 24,
type: 'emote',
src: e.url,
),
),
)
.toList(),
),
SizedBox(height: MediaQuery.of(context).padding.bottom),
],
)
: loadingState is Error
? Center(child: Text(loadingState.errMsg))
: const Center(child: Text('加载中...'));
}
}

2
lib/pages/fan/controller.dart
View File

@@ -13,7 +13,7 @@ class FansController extends GetxController {
RxList<FansItemModel> fansList = <FansItemModel>[].obs;
late int? mid;
late String? name;
var userInfo;
dynamic userInfo;
RxString loadingText = '加载中...'.obs;
RxBool isOwner = false.obs;

2
lib/pages/follow/controller.dart
View File

@@ -18,7 +18,7 @@ class FollowController extends GetxController with GetTickerProviderStateMixin {
RxList<FollowItemModel> followList = <FollowItemModel>[].obs;
late int? mid;
late String? name;
var userInfo;
dynamic userInfo;
RxString loadingText = '加载中...'.obs;
RxBool isOwner = false.obs;
late List<MemberTagItemModel> followTags;

2
lib/pages/home/controller.dart
View File

@@ -20,7 +20,7 @@ class HomeController extends GetxController with GetTickerProviderStateMixin {
Box settingStorage = GStorage.setting;
RxBool userLogin = false.obs;
RxString userFace = ''.obs;
var userInfo;
dynamic userInfo;
Box setting = GStorage.setting;
late final StreamController<bool> searchBarStream =
StreamController<bool>.broadcast();

2
lib/pages/home/widgets/app_bar.dart
View File

@@ -13,7 +13,7 @@ class HomeAppBar extends StatelessWidget {
@override
Widget build(BuildContext context) {
var userInfo = userInfoCache.get('userInfoCache');
dynamic userInfo = userInfoCache.get('userInfoCache');
return SliverAppBar(
// forceElevated: true,
scrolledUnderElevation: 0,

2
lib/pages/main/controller.dart
View File

@@ -44,7 +44,7 @@ class MainController extends GetxController {
setting.get(SettingBoxKey.defaultHomePage, defaultValue: 0) as int;
selectedIndex = defaultNavigationBars
.indexWhere((item) => item['id'] == defaultHomePage);
var userInfo = userInfoCache.get('userInfoCache');
dynamic userInfo = userInfoCache.get('userInfoCache');
userLogin.value = userInfo != null;
dynamicBadgeType = DynamicBadgeMode.values[setting.get(
SettingBoxKey.dynamicBadgeMode,

2
lib/pages/media/controller.dart
View File

@@ -43,7 +43,7 @@ class MediaController extends GetxController {
}),
},
];
var userInfo;
dynamic userInfo;
int? mid;
final ScrollController scrollController = ScrollController();

2
lib/pages/setting/controller.dart
View File

@@ -24,7 +24,7 @@ class SettingController extends GetxController {
RxDouble toastOpacity = (1.0).obs;
RxInt picQuality = 10.obs;
Rx<ThemeType> themeType = ThemeType.system.obs;
var userInfo;
dynamic userInfo;
Rx<DynamicBadgeMode> dynamicBadgeType = DynamicBadgeMode.number.obs;
RxInt defaultHomePage = 0.obs;

2
lib/pages/video/detail/controller.dart
View File

@@ -75,7 +75,7 @@ class VideoDetailController extends GetxController
double? brightness;
// 默认记录历史记录
bool enableHeart = true;
var userInfo;
dynamic userInfo;
late bool isFirstTime = true;
Floating? floating;
late PreferredSizeWidget headerControl;

2
lib/pages/video/detail/introduction/controller.dart
View File

@@ -64,7 +64,7 @@ class VideoIntroController extends GetxController {
RxMap followStatus = {}.obs;
RxInt lastPlayCid = 0.obs;
var userInfo;
dynamic userInfo;
// 同时观看
bool isShowOnlineTotal = false;