xjw/circle_app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改安卓问题

Browse Source
This commit is contained in:
CYH 2024-05-08 09:21:23 +08:00
parent 7eeb820543
commit 3639ddf773
6 changed files with 87 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
circle_app/android/app/build.gradle
View File

@ -71,8 +71,8 @@ android {
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
minSdkVersion 21 minSdkVersion 21
targetSdkVersion flutter.targetSdkVersion targetSdkVersion flutter.targetSdkVersion
versionCode 61 versionCode 62
versionName "2.1.1" versionName "2.1.2"
manifestPlaceholders = [ manifestPlaceholders = [
vivo_APPID: "105669716", vivo_APPID: "105669716",
vivo_APPKEY:"84f750207787376b310ca5b0d5969122", vivo_APPKEY:"84f750207787376b310ca5b0d5969122",

17
circle_app/lib/app/msg/sys_notify_list/logic.dart
View File

@ -104,11 +104,6 @@ class Sys_notify_listLogic extends GetxController {
} }
initList() async { initList() async {
if (page == 1) {
lists.clear();
update();
}
// /** // /**
// * 系统 // * 系统
@ -159,9 +154,6 @@ class Sys_notify_listLogic extends GetxController {
isMore = false; isMore = false;
} }
} }
isLoad = false;
update();
if (next == 0) { if (next == 0) {
if(lists.isNotEmpty) { if(lists.isNotEmpty) {
@ -169,15 +161,22 @@ class Sys_notify_listLogic extends GetxController {
} }
refreshController.refreshCompleted(); refreshController.refreshCompleted();
} else { } else {
next = lists.last.id!;
refreshController.loadComplete(); refreshController.loadComplete();
if (isMore) {
next = lists.last.id!;
}
} }
isLoad = false;
update();
} }
void onRefresh() async { void onRefresh() async {
page = 0; page = 0;
next = 0; next = 0;
lists.clear(); lists.clear();
update();
initList(); initList();
} }

120
circle_app/lib/app/msg/sys_notify_list/view.dart
View File

@ -68,72 +68,70 @@ class Sys_notify_listPage extends StatelessWidget {
child: Column( child: Column(
children: [ children: [
Expanded( Expanded(
child: SafeArea( child: logic.isLoad
child: logic.isLoad ? loaddingWidget(true)
? loaddingWidget(true) : logic.lists.isEmpty &&
: logic.lists.isEmpty && logic.msgLists.isEmpty &&
logic.msgLists.isEmpty && logic.serieslists.isEmpty &&
logic.serieslists.isEmpty && logic.normallists.isNotEmpty
logic.normallists.isNotEmpty ? noResultWidget()
? noResultWidget() : logic.msgLists.isNotEmpty ||
: logic.msgLists.isNotEmpty || logic.serieslists.isNotEmpty ||
logic.serieslists.isNotEmpty || logic.normallists.isNotEmpty
logic.normallists.isNotEmpty ? SmartRefresher(
? SmartRefresher( controller: logic.refreshController,
controller: logic.refreshController, enablePullUp: true,
enablePullUp: true, enablePullDown: false,
enablePullDown: false, onLoading: () {
onLoading: () { if (logic.con!.showName == '活动驿站') {
logic.loadMore();
} else {
logic.onLoadingMsgList();
}
},
child: ListView.builder(
padding: EdgeInsets.only(left:10.sp,right: 10.sp),
itemCount: logic.con!.showName == '活动驿站'
? logic.serieslists.length +
(logic.normallists.isNotEmpty
? 1
: 0)
: logic.msgLists.length,
itemBuilder: (context, index) {
if (logic.con!.showName == '活动驿站') { if (logic.con!.showName == '活动驿站') {
logic.loadMore(); if (index == 0 &&
} else { logic.serieslists.isNotEmpty) {
logic.onLoadingMsgList(); return activeHorItem();
} } else {
}, if (logic.serieslists.isNotEmpty) {
child: ListView.builder( return PlatformWdiget(
padding: EdgeInsets.all(10.sp), list: logic
itemCount: logic.con!.showName == '活动驿站' .normallists[index - 1]);
? logic.serieslists.length +
(logic.normallists.isNotEmpty
? 1
: 0)
: logic.msgLists.length,
itemBuilder: (context, index) {
if (logic.con!.showName == '活动驿站') {
if (index == 0 &&
logic.serieslists.isNotEmpty) {
return activeHorItem();
} else {
if (logic.serieslists.isNotEmpty) {
return PlatformWdiget(
list: logic
.normallists[index - 1]);
}
} }
return PlatformWdiget(
list:
logic.normallists[index - 1]);
} }
return msgItem(logic.msgLists![index]); return PlatformWdiget(
}, list:
), logic.normallists[index - 1]);
) }
: SmartRefresher( return msgItem(logic.msgLists![index]);
controller: logic.refreshController,
enablePullUp: true,
onRefresh: logic.onRefresh,
onLoading: () {
logic.onLoading();
}, },
child: ListView.builder(
padding: EdgeInsets.all(10.sp),
itemCount: logic.lists.length,
itemBuilder: (context, index) {
return ListItem(logic.lists[index]);
},
),
), ),
), )
: SmartRefresher(
controller: logic.refreshController,
enablePullUp: true,
onRefresh: logic.onRefresh,
onLoading: () {
logic.onLoading();
},
child: ListView.builder(
padding: EdgeInsets.only(left:10.sp,right: 10.sp),
itemCount: logic.lists.length,
itemBuilder: (context, index) {
return ListItem(logic.lists[index]);
},
),
),
), ),
if (logic.con!.showName != '官方通知' && if (logic.con!.showName != '官方通知' &&
logic.con!.showName != '系统通知' && logic.con!.showName != '系统通知' &&

7
circle_app/lib/util/util.dart
View File

@ -1105,7 +1105,12 @@ pushPage(String action,String param,{String name = ''}) {
} else if (action == 'offsite_share') { } else if (action == 'offsite_share') {
Get.toNamed(AppRoutes.ExternalsharePage); Get.toNamed(AppRoutes.ExternalsharePage);
} else if (action == 'good_rate') { } else if (action == 'good_rate') {
launch('https://apps.apple.com/cn/app/%E5%BE%AE%E4%B9%90%E5%9B%AD-%E4%BA%9A%E6%96%87%E5%8C%96%E5%A4%9A%E5%85%83%E4%BA%A4%E5%8F%8B%E5%9F%BA%E5%9C%B0/id6459449499', forceSafariVC: false); if (Platform.isAndroid) {
Get.toNamed(AppRoutes.Good_Reviews);
} else {
launch('https://apps.apple.com/cn/app/%E5%BE%AE%E4%B9%90%E5%9B%AD-%E4%BA%9A%E6%96%87%E5%8C%96%E5%A4%9A%E5%85%83%E4%BA%A4%E5%8F%8B%E5%9F%BA%E5%9C%B0/id6459449499', forceSafariVC: false);
}
} else if (action == 'buy_vip') { } else if (action == 'buy_vip') {
showOepnVipDialog(); showOepnVipDialog();
} else if (action == 'recharge') { } else if (action == 'recharge') {

12
circle_app/pubspec.lock
View File

@ -45,10 +45,10 @@ packages:
dependency: "direct main" dependency: "direct main"
description: description:
name: app_settings name: app_settings
sha256: "2ec421f375d747916c4c0193933567074ea60c4f01c4a68642f07fef1002524e" sha256: e6a34735d4ddb24ca9c5fd7e965ec65c8b611cbd3a329152c294f9e9f4bacb33
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "4.0.4" version: "4.3.1"
archive: archive:
dependency: transitive dependency: transitive
description: description:
@ -630,6 +630,14 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.1.3" version: "1.1.3"
flutter_install_app:
dependency: "direct main"
description:
name: flutter_install_app
sha256: "9b117006d17c900e671c26bcbc9b15c7b8efd15d6f9b4442ad5d576de20fab53"
url: "https://pub.dev"
source: hosted
version: "1.3.0"
flutter_intl: flutter_intl:
dependency: "direct main" dependency: "direct main"
description: description:

4
circle_app/pubspec.yaml
View File

@ -90,7 +90,7 @@ dependencies:
fluwx: ^3.8.1+1 fluwx: ^3.8.1+1
event_bus: ^2.0.0 event_bus: ^2.0.0
#安装apk #安装apk
# flutter_install_app: 1.3.0 flutter_install_app: 1.3.0
#闪屏页 #闪屏页
flutter_native_splash: 2.2.16 flutter_native_splash: 2.2.16
#腾讯离线推送 #腾讯离线推送
@ -112,7 +112,7 @@ dependencies:
#边框渐变 #边框渐变
gradient_borders: ^1.0.0 gradient_borders: ^1.0.0
#系统设置 安卓4.3.1 苹果4.0.4 #系统设置 安卓4.3.1 苹果4.0.4
app_settings: 4.0.4 app_settings: 4.3.1
#百度定位插件 #百度定位插件
flutter_bmflocation: ^3.6.0 flutter_bmflocation: ^3.6.0