diff --git a/circle_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/circle_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index 0b1393a..5f08815 100644 Binary files a/circle_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/circle_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/circle_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/circle_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index 74ada4c..6577fab 100644 Binary files a/circle_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/circle_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/circle_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/circle_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index bae471a..9f7d6b7 100644 Binary files a/circle_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/circle_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/circle_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/circle_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 75d4218..37ed79a 100644 Binary files a/circle_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/circle_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/circle_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/circle_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 123da0f..011d0c7 100644 Binary files a/circle_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/circle_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-1024.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-1024.png index 05beef9..9d4f2b3 100644 Binary files a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-1024.png and b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-1024.png differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20-ipad.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20-ipad.png deleted file mode 100644 index 6b1372d..0000000 Binary files a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20-ipad.png and /dev/null differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@2x-ipad.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@2x-ipad.png deleted file mode 100644 index 10cbc0c..0000000 Binary files a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@2x-ipad.png and /dev/null differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png index 10cbc0c..6203708 100644 Binary files a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png and b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png index 5b8e703..cf657bf 100644 Binary files a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png and b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29-ipad.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29-ipad.png deleted file mode 100644 index 7bc25d8..0000000 Binary files a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29-ipad.png and /dev/null differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29.png index 7bc25d8..103afaf 100644 Binary files a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29.png and b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29.png differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@2x-ipad.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@2x-ipad.png deleted file mode 100644 index eea8b84..0000000 Binary files a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@2x-ipad.png and /dev/null differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png index eea8b84..e1b1745 100644 Binary files a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png and b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png index 830eda1..f2d6e3b 100644 Binary files a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png and b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40.png index 10cbc0c..6203708 100644 Binary files a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40.png and b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40.png differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png index fac3cf2..d5045aa 100644 Binary files a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png and b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png index e328109..ff547e5 100644 Binary files a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png and b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png index e328109..ff547e5 100644 Binary files a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png and b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png index 21c6322..7292601 100644 Binary files a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png and b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-76.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-76.png index d9f1e3a..70843d1 100644 Binary files a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-76.png and b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-76.png differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png index e0a98c2..f4d5512 100644 Binary files a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png and b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png index 23bfd03..646489b 100644 Binary files a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png and b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png differ diff --git a/circle_app/lib/app/aboutapp/logic.dart b/circle_app/lib/app/aboutapp/logic.dart index b6a46d7..2b3d5cb 100644 --- a/circle_app/lib/app/aboutapp/logic.dart +++ b/circle_app/lib/app/aboutapp/logic.dart @@ -1,5 +1,5 @@ import 'package:dio/dio.dart'; -import 'package:flutter_install_app/flutter_install_app.dart'; +// import 'package:flutter_install_app/flutter_install_app.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; @@ -42,7 +42,7 @@ class AboutappLogic extends GetxController { // SmartDialog.dismiss(); // print(error); // }); - await AppInstaller.installApk(filePath, actionRequired: false); + // await AppInstaller.installApk(filePath, actionRequired: false); } diff --git a/circle_app/lib/app/circle/widgets/info_list_view.dart b/circle_app/lib/app/circle/widgets/info_list_view.dart index e8ec717..64dbb39 100644 --- a/circle_app/lib/app/circle/widgets/info_list_view.dart +++ b/circle_app/lib/app/circle/widgets/info_list_view.dart @@ -397,13 +397,18 @@ class _InfoListViewState extends State { // List urlList = bean.lastJoinUsers; List widgets = []; int index = 0; - lists.chat!.users!.forEach((element) { + for (var element in lists.chat!.users!) { widgets.add(Positioned( left: 12.sp * index, - child: circleWidget(element.avatar!, width: 24), + child: GestureDetector( + onTap: () { + listsLg?.pushOtherPeopleHomePage(element.id.toString()); + }, + child: circleWidget(element.avatar!, width: 24), + ), )); index++; - }); + } if (widgets.isNotEmpty) { widgets.add(Positioned( left: 12.sp * lists.chat!.users!.length, @@ -711,7 +716,9 @@ class _InfoListViewState extends State { widgets.add(Positioned( left: 12.sp * index, child: GestureDetector( - onTap: () {}, + onTap: () { + listsLg?.pushOtherPeopleHomePage(element.id.toString()); + }, child: circleWidget(element.avatar!, width: 24), ), )); diff --git a/circle_app/lib/app/circle/widgets/list_logic.dart b/circle_app/lib/app/circle/widgets/list_logic.dart index dcbe7b3..607d9bc 100644 --- a/circle_app/lib/app/circle/widgets/list_logic.dart +++ b/circle_app/lib/app/circle/widgets/list_logic.dart @@ -56,6 +56,22 @@ class ListLogic extends GetxController { loadCallOutListData(_circleId); } + + void pushOtherPeopleHomePage(String userId) { + Get.toNamed(AppRoutes.UserInfoActivity, arguments: userId); + + + // if (bean.isQueen) { + // showJoinCiclePiker(cicleId); + // } else { + //跳转消息页面 + // Get.bottomSheet(Open_vip_tipPage(), + // isScrollControlled: true, + // enableDrag: false, + // ); + // } + } + void pushHomePage(Lists bean,String cicleId) async { SharedPreferences prefs = await SharedPreferences.getInstance(); int userId = prefs.getInt("userId")??0; @@ -84,8 +100,15 @@ class ListLogic extends GetxController { void onInit() { // TODO: implement onInit super.onInit(); + + } + + @override + void onReady() { + // TODO: implement onReady + super.onReady(); scrollController.addListener(() { - if (scrollController.position.pixels == scrollController.position.maxScrollExtent) { + if (scrollController.position.pixels == scrollController.position.maxScrollExtent && lists.isNotEmpty) { loadMore(); } }); diff --git a/circle_app/lib/app/home/logic.dart b/circle_app/lib/app/home/logic.dart index 7004333..8e2cd93 100644 --- a/circle_app/lib/app/home/logic.dart +++ b/circle_app/lib/app/home/logic.dart @@ -1,3 +1,4 @@ +import 'package:circle_app/app/circle/logic.dart'; import 'package:circle_app/util/util.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -35,6 +36,10 @@ class HomeLogic extends GetxController { updateIndex(int index) { currentIndex = index; + if (index == 1) { + final logic = Get.put(CircleLogic()); + logic.loadCirclePeopleData(); + } update(); } }