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

15
lib/http/login.dart
View File

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

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

@ -79,7 +79,21 @@ class _FavPageState extends State<FavPage> {
const SizedBox(width: 14),
],
),
body: FutureBuilder(
body: RefreshIndicator(
onRefresh: () async {
_favController.hasMore.value = true;
_favController.currentPage = 1;
setState(() {
_futureBuilderFuture = _favController.queryFavFolder(type: 'init');
});
},
child: _buildBody(),
),
);
}
Widget _buildBody() {
return FutureBuilder(
future: _futureBuilderFuture,
builder: (context, snapshot) {
if (snapshot.connectionState == ConnectionState.done) {
@ -109,8 +123,7 @@ class _FavPageState extends State<FavPage> {
RoutePush.loginRedirectPush();
} else {
setState(() {
_futureBuilderFuture =
_favController.queryFavFolder();
_futureBuilderFuture = _favController.queryFavFolder();
});
}
},
@ -128,7 +141,6 @@ class _FavPageState extends State<FavPage> {
);
}
},
),
);
}
}

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

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

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

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

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

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

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

@ -45,6 +45,7 @@ class LoginPageController extends GetxController {
RxInt validSeconds = 180.obs;
Timer? validTimer;
late String qrcodeKey;
RxBool passwordVisible = false.obs;
// 监听pageView切换
void onPageChange(int index) {
@ -128,7 +129,14 @@ class LoginPageController extends GetxController {
if (res['status']) {
await LoginUtils.confirmLogin('', null);
} 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 {
SmartDialog.showToast(webKeyRes['msg']);

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

@ -269,25 +269,46 @@ class _LoginPageState extends State<LoginPage> {
),
Container(
margin: const EdgeInsets.only(top: 38, bottom: 15),
child: TextFormField(
controller: _loginPageCtr.passwordTextController,
focusNode: _loginPageCtr.passwordTextFieldNode,
child: Obx(() => TextFormField(
controller:
_loginPageCtr.passwordTextController,
focusNode:
_loginPageCtr.passwordTextFieldNode,
keyboardType: TextInputType.visiblePassword,
obscureText:
_loginPageCtr.passwordVisible.value,
decoration: InputDecoration(
isDense: true,
labelText: '输入密码',
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(6.0),
),
suffixIcon: IconButton(
icon: Icon(
_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 : "密码不能为空";
return v!.trim().isNotEmpty
? null
: "密码不能为空";
},
onSaved: (val) {
print(val);
},
),
)),
),
const Spacer(),
Row(