mirrors/pilipala
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix'

Browse Source
This commit is contained in:
guozhigq
2024-10-04 11:47:11 +08:00
parent 8b82725a49 f1441ac97e
commit ef7a563caa
7 changed files with 149 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/http/login.dart
View File

@ -229,12 +229,25 @@ class LoginHttp {
data: formData, data: formData,
); );
if (res.data['code'] == 0) { if (res.data['code'] == 0) {
return { if (res.data['data']['status'] == 0) {
'status': true, return {
'data': res.data['data'], 'status': true,
}; 'data': res.data['data'],
};
} else {
return {
'status': false,
'code': 1,
'data': res.data['data'],
'msg': res.data['data']['message'],
};
}
} else { } else {
return {'status': false, 'data': [], 'msg': res.data['message']}; return {
'status': false,
'data': [],
'msg': res.data['message'],
};
} }
} }

108
lib/pages/fav/view.dart
View File

@ -79,56 +79,68 @@ class _FavPageState extends State<FavPage> {
const SizedBox(width: 14), const SizedBox(width: 14),
], ],
), ),
body: FutureBuilder( body: RefreshIndicator(
future: _futureBuilderFuture, onRefresh: () async {
builder: (context, snapshot) { _favController.hasMore.value = true;
if (snapshot.connectionState == ConnectionState.done) { _favController.currentPage = 1;
Map? data = snapshot.data; setState(() {
if (data != null && data['status']) { _futureBuilderFuture = _favController.queryFavFolder(type: 'init');
return Obx( });
() => ListView.builder(
controller: scrollController,
itemCount: _favController.favFolderList.length,
itemBuilder: (context, index) {
return FavItem(
favFolderItem: _favController.favFolderList[index],
isOwner: _favController.isOwner.value,
);
},
),
);
} else {
return CustomScrollView(
physics: const NeverScrollableScrollPhysics(),
slivers: [
HttpError(
errMsg: data?['msg'] ?? '请求异常',
btnText: data?['code'] == -101 ? '去登录' : null,
fn: () {
if (data?['code'] == -101) {
RoutePush.loginRedirectPush();
} else {
setState(() {
_futureBuilderFuture =
_favController.queryFavFolder();
});
}
},
),
],
);
}
} else {
// 骨架屏
return ListView.builder(
itemBuilder: (context, index) {
return const VideoCardHSkeleton();
},
itemCount: 10,
);
}
}, },
child: _buildBody(),
), ),
); );
} }
Widget _buildBody() {
return FutureBuilder(
future: _futureBuilderFuture,
builder: (context, snapshot) {
if (snapshot.connectionState == ConnectionState.done) {
Map? data = snapshot.data;
if (data != null && data['status']) {
return Obx(
() => ListView.builder(
controller: scrollController,
itemCount: _favController.favFolderList.length,
itemBuilder: (context, index) {
return FavItem(
favFolderItem: _favController.favFolderList[index],
isOwner: _favController.isOwner.value,
);
},
),
);
} else {
return CustomScrollView(
physics: const NeverScrollableScrollPhysics(),
slivers: [
HttpError(
errMsg: data?['msg'] ?? '请求异常',
btnText: data?['code'] == -101 ? '去登录' : null,
fn: () {
if (data?['code'] == -101) {
RoutePush.loginRedirectPush();
} else {
setState(() {
_futureBuilderFuture = _favController.queryFavFolder();
});
}
},
),
],
);
}
} else {
// 骨架屏
return ListView.builder(
itemBuilder: (context, index) {
return const VideoCardHSkeleton();
},
itemCount: 10,
);
}
},
);
}
} }

8
lib/pages/fav_detail/controller.dart
View File

@ -10,6 +10,7 @@ import 'package:pilipala/utils/utils.dart';
class FavDetailController extends GetxController { class FavDetailController extends GetxController {
FavFolderItemData? item; FavFolderItemData? item;
RxString title = ''.obs;
int? mediaId; int? mediaId;
late String heroTag; late String heroTag;
@ -24,6 +25,7 @@ class FavDetailController extends GetxController {
@override @override
void onInit() { void onInit() {
item = Get.arguments; item = Get.arguments;
title.value = item!.title!;
if (Get.parameters.keys.isNotEmpty) { if (Get.parameters.keys.isNotEmpty) {
mediaId = int.parse(Get.parameters['mediaId']!); mediaId = int.parse(Get.parameters['mediaId']!);
heroTag = Get.parameters['heroTag']!; heroTag = Get.parameters['heroTag']!;
@ -117,16 +119,18 @@ class FavDetailController extends GetxController {
} }
onEditFavFolder() async { onEditFavFolder() async {
Get.toNamed( var res = await Get.toNamed(
'/favEdit', '/favEdit',
arguments: { arguments: {
'mediaId': mediaId.toString(), 'mediaId': mediaId.toString(),
'title': item!.title, 'title': item!.title,
'intro': item!.intro, 'intro': item!.intro,
'cover': item!.cover, 'cover': item!.cover,
'privacy': item!.attr, 'privacy': [23, 1].contains(item!.attr) ? 1 : 0,
}, },
); );
title.value = res['title'];
print(title);
} }
Future toViewPlayAll() async { Future toViewPlayAll() async {

26
lib/pages/fav_detail/view.dart
View File

@ -80,9 +80,11 @@ class _FavDetailPageState extends State<FavDetailPage> {
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Obx(
_favDetailController.item!.title!, () => Text(
style: Theme.of(context).textTheme.titleMedium, _favDetailController.title.value,
style: Theme.of(context).textTheme.titleMedium,
),
), ),
Text( Text(
'共${_favDetailController.mediaCount}条视频', '共${_favDetailController.mediaCount}条视频',
@ -156,14 +158,16 @@ class _FavDetailPageState extends State<FavDetailPage> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
const SizedBox(height: 4), const SizedBox(height: 4),
Text( Obx(
_favDetailController.item!.title!, () => Text(
style: TextStyle( _favDetailController.title.value,
fontSize: Theme.of(context) style: TextStyle(
.textTheme fontSize: Theme.of(context)
.titleMedium! .textTheme
.fontSize, .titleMedium!
fontWeight: FontWeight.bold), .fontSize,
fontWeight: FontWeight.bold),
),
), ),
const SizedBox(height: 4), const SizedBox(height: 4),
Text( Text(

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

@ -56,7 +56,7 @@ class FavEditController extends GetxController {
); );
if (res['status']) { if (res['status']) {
SmartDialog.showToast('编辑成功'); SmartDialog.showToast('编辑成功');
Get.back(); Get.back(result: {'title': title});
} else { } else {
SmartDialog.showToast(res['msg']); SmartDialog.showToast(res['msg']);
} }

10
lib/pages/login/controller.dart
View File

@ -45,6 +45,7 @@ class LoginPageController extends GetxController {
RxInt validSeconds = 180.obs; RxInt validSeconds = 180.obs;
Timer? validTimer; Timer? validTimer;
late String qrcodeKey; late String qrcodeKey;
RxBool passwordVisible = false.obs;
// 监听pageView切换 // 监听pageView切换
void onPageChange(int index) { void onPageChange(int index) {
@ -128,7 +129,14 @@ class LoginPageController extends GetxController {
if (res['status']) { if (res['status']) {
await LoginUtils.confirmLogin('', null); await LoginUtils.confirmLogin('', null);
} else { } else {
SmartDialog.showToast(res['msg']); await SmartDialog.showToast(res['msg']);
if (res.containsKey('code') && res['code'] == 1) {
Get.toNamed('/webview', parameters: {
'url': res['data']['data']['url'],
'type': 'url',
'pageTitle': '登录验证',
});
}
} }
} else { } else {
SmartDialog.showToast(webKeyRes['msg']); SmartDialog.showToast(webKeyRes['msg']);

59
lib/pages/login/view.dart
View File

@ -269,25 +269,46 @@ class _LoginPageState extends State<LoginPage> {
), ),
Container( Container(
margin: const EdgeInsets.only(top: 38, bottom: 15), margin: const EdgeInsets.only(top: 38, bottom: 15),
child: TextFormField( child: Obx(() => TextFormField(
controller: _loginPageCtr.passwordTextController, controller:
focusNode: _loginPageCtr.passwordTextFieldNode, _loginPageCtr.passwordTextController,
keyboardType: TextInputType.visiblePassword, focusNode:
decoration: InputDecoration( _loginPageCtr.passwordTextFieldNode,
isDense: true, keyboardType: TextInputType.visiblePassword,
labelText: '输入密码', obscureText:
border: OutlineInputBorder( _loginPageCtr.passwordVisible.value,
borderRadius: BorderRadius.circular(6.0), decoration: InputDecoration(
), isDense: true,
), labelText: '输入密码',
// 校验用户名 border: OutlineInputBorder(
validator: (v) { borderRadius: BorderRadius.circular(6.0),
return v!.trim().isNotEmpty ? null : "密码不能为空"; ),
}, suffixIcon: IconButton(
onSaved: (val) { icon: Icon(
print(val); _loginPageCtr.passwordVisible.value
}, ? Icons.visibility
), : Icons.visibility_off,
color: Theme.of(context)
.colorScheme
.primary,
),
onPressed: () {
_loginPageCtr.passwordVisible.value =
!_loginPageCtr
.passwordVisible.value;
},
),
),
// 校验用户名
validator: (v) {
return v!.trim().isNotEmpty
? null
: "密码不能为空";
},
onSaved: (val) {
print(val);
},
)),
), ),
const Spacer(), const Spacer(),
Row( Row(