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

2.2.3代码提交

Browse Source
This commit is contained in:
CYH 2024-11-27 10:16:00 +08:00
parent 8833c7f215
commit e7d880bf6b
5 changed files with 18 additions and 24 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 72 versionCode 73
versionName "2.2.2" versionName "2.2.3"
manifestPlaceholders = [ manifestPlaceholders = [
vivo_APPID: "105669716", vivo_APPID: "105669716",
vivo_APPKEY:"84f750207787376b310ca5b0d5969122", vivo_APPKEY:"84f750207787376b310ca5b0d5969122",

20
circle_app/lib/circle_app/chat/view.dart
View File

@ -438,15 +438,19 @@ class _ChatPageState extends State<ChatPage>
) : GestureDetector( ) : GestureDetector(
onTap: () { onTap: () {
HomeLogic homelogic = Get.find<HomeLogic>(); HomeLogic homelogic = Get.find<HomeLogic>();
Get.bottomSheet(InitmacyDialog(avatar: otherUserBean!.avatar,myAvatar: homelogic.model!.avatar,info: logic.intimacyInfo,accId:logic.selectedConversation!.userID!),isScrollControlled:true);
// if (logic.hotInfo['canReceiveReward'] == 1 && logic.hotInfo['receivedReward'] == 0) {
// showHotRewardTipDialog(); if (logic.hotInfo['canReceiveReward'] == 1 && logic.hotInfo['receivedReward'] == 0) {
// } else if (logic.hotInfo['receivedReward'] == 0){ showHotRewardTipDialog();
// showHotTipDialog(); } else if (logic.hotInfo['receivedReward'] == 0){
// } else { showHotTipDialog();
// showOKToast('和TA互动的奖励已领取，可以再和其他人聊，继续领取奖励哦~'); } else {
// } if (homelogic.model != null && otherUserBean != null) {
Get.bottomSheet(InitmacyDialog(avatar: otherUserBean!.avatar,myAvatar: homelogic.model!.avatar,info: logic.intimacyInfo,accId:logic.selectedConversation!.userID!),isScrollControlled:true);
}
// showOKToast('和TA互动的奖励已领取，可以再和其他人聊，继续领取奖励哦~');
}
}, },
child: Row( child: Row(
children: [ children: [

2
circle_app/lib/circle_app/home/view.dart
View File

@ -124,6 +124,8 @@ class _HomePageState extends State<HomePage>
sub1.cancel(); sub1.cancel();
giftAnimationNotifySub.cancel(); giftAnimationNotifySub.cancel();
callOutActionNotifySub.cancel(); callOutActionNotifySub.cancel();
permissionNotifySub.canel();
permissionCloseNotifySub.canel();
routeObserver.unsubscribe(this); routeObserver.unsubscribe(this);
} }

14
circle_app/lib/circle_app/new_people/view.dart
View File

@ -6,7 +6,6 @@ import 'package:get/get.dart';
import 'package:gradient_borders/box_borders/gradient_box_border.dart'; import 'package:gradient_borders/box_borders/gradient_box_border.dart';
import 'package:keframe/keframe.dart'; import 'package:keframe/keframe.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart'; import 'package:pull_to_refresh/pull_to_refresh.dart';
import 'package:visibility_detector/visibility_detector.dart';
import '../../commons/Widgets/my_app_bar.dart'; import '../../commons/Widgets/my_app_bar.dart';
import '../../commons/Widgets/tag_widget.dart'; import '../../commons/Widgets/tag_widget.dart';
@ -415,18 +414,11 @@ class New_peoplePage extends StatelessWidget {
data: logic.cityMap, data: logic.cityMap,
columeNum: 2, onConfirm: (List res, List<int> position) { columeNum: 2, onConfirm: (List res, List<int> position) {
print(res); print(res);
// print(logic.cityMap[res[0]][res[1]][0]);
// controller.state.city = controller.cityMap[res[0]][res[1]][0];
// logic.state.city = res[1];
if (res[0].contains("台湾")) { if (res[0].contains("台湾")) {
logic.city = "台湾省"; logic.city = "台湾省";
} else { } else {
logic.city = res[1]; logic.city = res[1];
} }
// EventBusManager.fire(NearScrollTap());
_onRefresh(); _onRefresh();
} }
); );
@ -444,11 +436,5 @@ class New_peoplePage extends StatelessWidget {
void _onLoading() async { void _onLoading() async {
logic.loadData(); logic.loadData();
// if (widget.logic.vicinityPage == 2 &&
// maxOff == 0 &&
// widget.logic.lists.isNotEmpty) {
// maxOff = _scrollController.offset - 170.sp;
// }
// widget.logic.getNearByList();
} }
} }

2
circle_app/lib/circle_app/quick/logic.dart
View File

@ -55,6 +55,7 @@ class QuickLogic extends GetxController {
initGerder(); initGerder();
getLocationData(); getLocationData();
initList(1); initList(1);
// initList(2);
} }
@ -122,6 +123,7 @@ class QuickLogic extends GetxController {
if (hasLocationPermission) { if (hasLocationPermission) {
// 权限申请通过 // 权限申请通过
} else { } else {
initList(2);
return; return;
} }