1281228557
/
aku_new_community
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

跟新安装包

Browse Source
newHost
王亚玲 2 years ago
parent aee169eb44
commit a832c843b3
6 changed files with 65 additions and 73 deletions
Show Stats Download Patch File Download Diff File

2
ios/Podfile.lock
Unescape View File

@ -188,4 +188,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: fe0e1ee7f3d1f7d00b11b474b62dd62134535aea
COCOAPODS: 1.11.3
COCOAPODS: 1.11.2

6
ios/Runner.xcodeproj/project.pbxproj
Unescape View File

@ -401,7 +401,7 @@
MARKETING_VERSION = 1.0.5;
PRODUCT_BUNDLE_IDENTIFIER = "com.aku-new-community.bee";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = dyb;
PROVISIONING_PROFILE_SPECIFIER = appstore;
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 1;
@ -545,7 +545,7 @@
MARKETING_VERSION = 1.0.5;
PRODUCT_BUNDLE_IDENTIFIER = "com.aku-new-community.bee";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = dyb;
PROVISIONING_PROFILE_SPECIFIER = appstore;
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
@ -583,7 +583,7 @@
MARKETING_VERSION = 1.0.5;
PRODUCT_BUNDLE_IDENTIFIER = "com.aku-new-community.bee";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = dyb;
PROVISIONING_PROFILE_SPECIFIER = appstore;
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 1;

34
lib/pages/setting_page/blacklist_page/blacklist_page.dart
Unescape View File

@ -7,6 +7,7 @@ import 'package:aku_new_community/widget/bee_avatar_widget.dart';
import 'package:aku_new_community/widget/dialog/bee_custom_dialog.dart';
import 'package:aku_new_community/widget/others/user_tool.dart';
import 'package:bot_toast/bot_toast.dart';
import 'package:extended_image/extended_image.dart';
import 'package:flutter/material.dart';
@ -52,6 +53,7 @@ class _blackListPageState extends State<blackListPage> {
// }
// ];
final EasyRefreshController _refreshController = EasyRefreshController();
late LoadState _loadState;
@override
void initState() {
@ -117,6 +119,7 @@ class _blackListPageState extends State<blackListPage> {
controller: _refreshController,
onRefresh: () async {
blackList = await BlackListFunc.getBlackList();
// blackList = [
// BlacklistModel(
// id: 0,
@ -126,7 +129,19 @@ class _blackListPageState extends State<blackListPage> {
setState(() {});
// _page
},
onLoad: () async {},
onLoad: () async {
_refreshController.finishLoad(noMore: true);
// await Future.delayed(const Duration(seconds: 2), () {
// setState(() {
// if (_refreshController.finishLoadCallBack !=
// null) {
// return _End();
// }
// });
// });
// if (_loadState == LoadState.completed)
// return _End();
},
child: blackList.isEmpty
? SizedBox()
: ListView.builder(
@ -136,11 +151,26 @@ class _blackListPageState extends State<blackListPage> {
},
//itemCount: 6,
itemCount: blackList.length,
)))
))),
//if()
],
));
}
_End() {
return Container(
color: Color(0xF000000).withOpacity(0.06),
width: MediaQuery.of(context).size.width,
height: 75.w,
alignment: Alignment.center,
child: Text(
'后面已经没有其他内容了',
style:
TextStyle(fontSize: 24.sp, color: Colors.black.withOpacity(0.25)),
),
);
}
_blackList(BlacklistModel model) {
return Column(
children: [

83
lib/ui/community/community_views/widgets/chat_card.dart
Unescape View File

@ -27,7 +27,6 @@ import 'package:aku_new_community/widget/views/bee_grid_image_view.dart';
class ChatCard extends StatefulWidget {
final AllDynamicListModel model;
final VoidCallback refresh;
final bool hideLine;
final bool canTap;
@ -253,50 +252,13 @@ class _ChatCardState extends State<ChatCard> {
),
Spacer(),
CommunityPopButton(
isMyself: _isMyself,
onSelect: (int value) async {
if (LoginUtil.isNotLogin) return;
if (widget.model.createId == userProvider.userInfoModel?.id) {
if (value == 3) {
//bool? result =
await Get.dialog(CupertinoAlertDialog(
title: '你确定要拉黑他吗'.text.isIntrinsic.make(),
actions: [
CupertinoDialogAction(
child: '取消'.text.black.isIntrinsic.make(),
onPressed: () => Get.back(),
),
CupertinoDialogAction(
child: '确定'
.text
.color(Colors.orange)
.isIntrinsic
.make(),
onPressed: () //=> Get.back(result: true),
async {
var isShielding =
await BlackListFunc.Block(widget.model.id);
if (isShielding) {
Get.back();
}
},
),
],
)); // if (result == true) {
// await BlackListFunc.Block(widget.model.id);
// widget.refresh();
// }
} else {
if (!_isMyself) {
VoidCallback cancel = BotToast.showLoading();
await Future.delayed(Duration(
milliseconds: 500 + Random().nextInt(500)));
cancel();
BotToast.showText(text: '举报成功');
} else {
bool? result = await Get.dialog(CupertinoAlertDialog(
title: '你确定删除吗'.text.isIntrinsic.make(),
isMyself: _isMyself,
onSelect: (int value) async {
if (LoginUtil.isNotLogin) return;
if (!_isMyself) {
if (value == 3) {
await Get.dialog(CupertinoAlertDialog(
title: '你确定要拉黑他吗'.text.isIntrinsic.make(),
actions: [
CupertinoDialogAction(
child: '取消'.text.black.isIntrinsic.make(),
@ -308,23 +270,24 @@ class _ChatCardState extends State<ChatCard> {
.color(Colors.orange)
.isIntrinsic
.make(),
onPressed: () => Get.back(result: true),
onPressed: () //=> Get.back(result: true),
async {
var isShielding =
await BlackListFunc.Block(widget.model.id);
if (isShielding) {
Get.back();
}
},
),
],
));
if (result == true) {
await CommunityFunc.deleteDynamic(widget.model.id);
widget.refresh();
}
} else {
VoidCallback cancel = BotToast.showLoading();
await Future.delayed(Duration(
milliseconds: 500 + Random().nextInt(500)));
cancel();
BotToast.showText(text: '举报成功');
}
}
} else {
if (!_isMyself) {
VoidCallback cancel = BotToast.showLoading();
await Future.delayed(
Duration(milliseconds: 500 + Random().nextInt(500)));
cancel();
BotToast.showText(text: '举报成功');
} else {
bool? result = await Get.dialog(CupertinoAlertDialog(
title: '你确定删除吗'.text.isIntrinsic.make(),
@ -348,9 +311,7 @@ class _ChatCardState extends State<ChatCard> {
widget.refresh();
}
}
}
},
).paddingOnly(right: 32.w),
}).paddingOnly(right: 32.w),
].row(crossAlignment: CrossAxisAlignment.start),
Column(
crossAxisAlignment: CrossAxisAlignment.start,

8
pubspec.lock
Unescape View File

@ -18,11 +18,9 @@ packages:
aku_app_upgrade:
dependency: "direct main"
description:
path: "."
ref: HEAD
resolved-ref: "9676d13777c2db074e7f812554eeffaa98458907"
url: "https://git.oa00.com/mengfucius/aku_app_upgrade.git"
source: git
path: "../aku_app_upgrade"
relative: true
source: path
version: "0.0.1"
amap_flutter_base:
dependency: "direct main"

5
pubspec.yaml
Unescape View File

@ -129,7 +129,10 @@ dependencies:
extended_image: ^6.1.0
#app更新
aku_app_upgrade:
git: https://git.oa00.com/mengfucius/aku_app_upgrade.git
git:
url: https://git.oa00.com/mengfucius/aku_app_upgrade.git
ref: 0f4792bfb2
# path: ../aku_app_upgrade
dev_dependencies:
flutter_test:

Write Preview
Loading…
Cancel
Save