1.4.3代码提交

circle_app/android/app/build.gradle

@@ -72,7 +72,7 @@ android {
         minSdkVersion 21
         targetSdkVersion flutter.targetSdkVersion
         versionCode 34
-        versionName "1.4.2"
+        versionName "1.4.3"
         manifestPlaceholders = [
                 vivo_APPID: "105669716",
                 vivo_APPKEY:"84f750207787376b310ca5b0d5969122",

circle_app/ios/Runner.xcodeproj/project.pbxproj

@@ -381,7 +381,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.4.1;
+				MARKETING_VERSION = 1.4.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.example.circleapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -530,7 +530,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.4.1;
+				MARKETING_VERSION = 1.4.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.example.circleapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -573,7 +573,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.4.1;
+				MARKETING_VERSION = 1.4.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.example.circleapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

circle_app/lib/app/circle/widgets/info_list_view.dart

@@ -773,6 +773,7 @@ class InfoListViewState extends State<InfoListView> with AutomaticKeepAliveClien
             width: Get.width,
             padding: EdgeInsets.only(top: 12.sp, left: 12.sp, right: 12.sp),
             child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 SizedBox(
                   height: 72.sp,

circle_app/lib/app/circle/widgets/like_view.dart

@@ -584,6 +584,7 @@ class _LikeViewState extends State<LikeView>
               width: Get.width,
               padding: EdgeInsets.only(top: 12.sp, left: 12.sp, right: 12.sp),
               child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
                   SizedBox(
                     height: 72.sp,

circle_app/lib/app/invite/logic.dart

@@ -9,6 +9,11 @@ import 'state.dart';
 class InviteLogic extends GetxController {
   final InviteState state = InviteState();
   bool isLoad = true;
+
+  ScrollController scrollController = ScrollController();
+
+  ScrollController contentScrollController = ScrollController();
+
   TextEditingController codeEditingController = TextEditingController();
 
   Data? homeData;
@@ -23,10 +28,47 @@ class InviteLogic extends GetxController {
 
   int myPage = 1;
   int otherPage = 1;
+
+  bool isContentScroll = false;
+
+  @override
+  void dispose() {
+    // TODO: implement dispose
+    scrollController.dispose();
+    contentScrollController.dispose();
+    super.dispose();
+  }
+
   @override
   void onInit() {
     // TODO: implement onInit
     super.onInit();
+    scrollController.addListener(() {
+      if (scrollController.position.pixels ==
+          scrollController.position.maxScrollExtent) {
+        if (!isContentScroll) {
+          isContentScroll = true;
+          update();
+        }
+      } else {
+        if (isContentScroll) {
+          isContentScroll = false;
+          update();
+        }
+
+      }
+    });
+
+    contentScrollController.addListener(() {
+      if (contentScrollController.offset <=
+          0) {
+        if (isContentScroll) {
+          isContentScroll = false;
+          update();
+        }
+      }
+    });
+
     loadData();
     loadMyInviteData();
     loadAllInviteData();

circle_app/lib/app/invite/share.dart

@@ -437,7 +437,7 @@ class _ShareState extends State<Share> {
     String username,
   ) {
     Clipboard.setData(ClipboardData(
-        text: '【${username}】邀请你加入“微乐园”，邀请码为${widget.code}，点击进入${widget.link}'));
+        text: '【${username}】邀请你加入“微乐园”，邀请码为${widget.code}，点击进入${widget.link} 这是一款专为各种特色小众圈子爱好者打造的交友平台，资质齐全，安全正规。在这里，能看到很多没听说过的圈子，也能发现很多为数不多的真实情怀，还能见证小众亚文化在生活方式上的新体验。真实、安全、私密、走心，我和很多圈友都在玩哦～'));
     showOKToast('您已成功复制分享链接，前往对应平台粘贴发送即可～');
   }
   /**

circle_app/lib/app/invite/view.dart

@@ -23,6 +23,9 @@ class InvitePage extends StatelessWidget {
   final logic = Get.find<InviteLogic>();
   final state = Get.find<InviteLogic>().state;
 
+
+
+
   @override
   Widget build(BuildContext context) {
     return Container(
@@ -107,6 +110,7 @@ class InvitePage extends StatelessWidget {
                       fit: StackFit.expand,
                       children: [
                         SingleChildScrollView(
+                          controller: logic.scrollController,
                             child: Column(children: [
                           Container(
                             // height: 83.sp,
@@ -251,7 +255,7 @@ class InvitePage extends StatelessWidget {
                                                 fontWeight: FontWeight.w500),
                                           )),
                                       Text(
-                                        data['invitee_name'],
+                                        data['inviter_name'],
                                         style: TextStyle(
                                             color: Color(0xff0DF5F7),
                                             fontSize: 16.sp,
@@ -535,7 +539,7 @@ class InvitePage extends StatelessWidget {
                                 Expanded(
                                     child: Container(
                                   margin: EdgeInsets.only(
-                                      top: 15.sp, left: 20.sp, right: 20.sp,bottom: 10.sp),
+                                      top: 15.sp, left: 20.sp, right: 20.sp,bottom: logic.selectedIndex == 1 ? 15.sp : 0.sp),
                                   // height: 135.sp,
                                   decoration: BoxDecoration(
                                       color: Color(0x99363542),
@@ -555,6 +559,8 @@ class InvitePage extends StatelessWidget {
                                     removeTop:true,
                                     context:context,
                                     child:ListView.builder(
+                                      controller: logic.contentScrollController,
+                                      physics: logic.isContentScroll ? BouncingScrollPhysics() : NeverScrollableScrollPhysics(),
                                               itemBuilder:
                                                   (BuildContext context,
                                                       int index) {
@@ -600,10 +606,10 @@ class InvitePage extends StatelessWidget {
                                                     data['nickname'],
                                                     data['inviteCount']
                                                         .toString(),
-                                                    data['vipDays'].toString() +
+                                                    data['vipDaysStr'].toString() +
                                                         '天',
-                                                    '${data['directProfit'] > 0 ? data['directProfit'] : 0}票',
+                                                    '${data['directProfitStr']}票',
-                                                    '${data['rebate'] > 0 ? data['rebate'] : 0}票',
+                                                    '${data['rebateStr']}票',
                                                     data['userId'].toString());
                                               },
                                               itemCount: logic.selectedIndex ==
@@ -623,7 +629,7 @@ class InvitePage extends StatelessWidget {
                                     },
                                     child: Container(
                                       margin: EdgeInsets.only(
-                                          top: 15.sp,),
+                                          top: 5.sp,bottom: 15.sp),
                                       child: Text(
                                         '查看更多邀请记录>',
                                         style: TextStyle(
@@ -919,13 +925,15 @@ class InvitePage extends StatelessWidget {
               // mainAxisAlignment: MainAxisAlignment.spaceAround,
               children: [
                 Expanded(
+                  flex: 1,
                   child: GestureDetector(
                       onTap: () {
+                        if (userId == '0') return;
+
                         Get.toNamed(AppRoutes.UserInfoActivity,
                             arguments: userId);
                       },
                       child: infoText(str1, AppColor.mainColor)),
-                  flex: 1,
                 ),
                 Container(
                   width: 1,

circle_app/lib/app/login/login/logic.dart

@@ -30,7 +30,7 @@ class LoginLogic extends GetxController {
     // TODO: implement onReady
     super.onReady();
     FlutterNativeSplash.remove();
-    readClipboardData();
+
 
   }
 
@@ -76,7 +76,7 @@ class LoginLogic extends GetxController {
   }
 
   /// 从剪贴板读取信息
-  void readClipboardData() async {
+  readClipboardData() async {
     var dataText = await Clipboard.getData(Clipboard.kTextPlain);
     if (dataText != null) {
       if ((dataText!.text! ?? '').isNotEmpty) {
@@ -148,6 +148,11 @@ class LoginLogic extends GetxController {
     Map<String, dynamic> params = {};
 
     if (loginType == 0) {
+      if (clipboardStr.isEmpty) {
+        await readClipboardData();
+      }
+
+
       params = {
         "phone": phoneEditingController.text,
         "code": codeEditingController.text

circle_app/lib/app/msg/sys_notify_list/logic.dart

@@ -16,6 +16,8 @@ class Sys_notify_listLogic extends GetxController {
   V2TimConversation? con;
   int page = 1;
 
+  int next = 0;
+
   int isVip = 0;
   bool isLoad = true;
   bool isMore = true;
@@ -143,7 +145,7 @@ class Sys_notify_listLogic extends GetxController {
 
     var data =
     await DioManager.instance.get(url: Api.getNotices+ '/${type}', params: {
-      'last_id':page > 0 ? page : '','size':'10',
+      'last_id':next,'size':'10',
     });
 
     if (data['code'] == 200) {
@@ -160,20 +162,21 @@ class Sys_notify_listLogic extends GetxController {
 
     isLoad = false;
     update();
-    if (page == 0) {
+    if (next == 0) {
 
       if(lists.isNotEmpty) {
-        page = lists.last.id!;
+        next = lists.last.id!;
       }
       refreshController.refreshCompleted();
     } else {
+      next = lists.last.id!;
       refreshController.loadComplete();
     }
   }
 
   void onRefresh() async {
     page = 0;
-
+    next = 0;
     initList();
   }
 

circle_app/lib/app/msg/sys_notify_list/view.dart

@@ -66,7 +66,7 @@ class Sys_notify_listPage extends StatelessWidget {
                                 logic.normallists.isNotEmpty
                             ? noResultWidget()
                             : logic.msgLists.isNotEmpty ||
-                                    logic.serieslists.isEmpty ||
+                                    logic.serieslists.isNotEmpty ||
                                     logic.normallists.isNotEmpty
                                 ? SmartRefresher(
                                     controller: logic.refreshController,
@@ -161,7 +161,7 @@ class Sys_notify_listPage extends StatelessWidget {
                                   logic.con!.showName == '会员中心'
                                       ? '会员中心'
                                       : logic.con!.showName == '资产中心'
-                                          ? '资产中心'
+                                          ? '我的资产'
                                           : '我的圈子',
                                   style: TextStyle(
                                       color: Colors.white, fontSize: 15.sp),

circle_app/lib/common/Widgets/circle_share.dart

@@ -751,8 +751,7 @@ class _CircleShareState extends State<CircleShare> {
       String username,
       ) {
     Clipboard.setData(ClipboardData(
-        text: '【${username}】邀请你加入“微乐园”，邀请码为${widget.code}，点击进入${(widget.link!) +
+        text: '【${username}】邀请你加入“微乐园”，邀请码为${widget.code}，点击进入${widget.link!} 这是一款专为各种特色小众圈子爱好者打造的交友平台，资质齐全，安全正规。在这里，能看到很多没听说过的圈子，也能发现很多为数不多的真实情怀，还能见证小众亚文化在生活方式上的新体验。真实、安全、私密、走心，我和很多圈友都在玩哦～'));
-            '?code=${widget.code}'}'));
     showOKToast('您已成功复制分享链接，前往对应平台粘贴发送即可～');
   }
   /**

circle_app/pubspec.lock

@@ -622,6 +622,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     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:
     dependency: "direct main"
     description:

circle_app/pubspec.yaml

@@ -89,7 +89,7 @@ dependencies:
   # 微信SDK插件
   fluwx: ^3.8.1+1
   event_bus: ^2.0.0
-#  #安装apk
+  #安装apk
   flutter_install_app: 1.3.0
   #闪屏页
   flutter_native_splash: 2.2.16
@@ -111,6 +111,8 @@ dependencies:
   svgaplayer_flutter: ^2.2.0
   #边框渐变
   gradient_borders: ^1.0.0
+  #系统设置
+  app_settings: ^4.1.16
 
 dev_dependencies:
   flutter_test: