update

ios/Podfile.lock

@@ -73,6 +73,8 @@ PODS:
   - flutter_inappwebview/Core (0.0.1):
     - Flutter
     - OrderedSet (~> 5.0)
+  - flutter_vibrate (0.0.1):
+    - Flutter
   - fluttercontactpicker (4.6.0):
     - Flutter
   - fluttertoast (0.0.2):
@@ -117,6 +119,8 @@ PODS:
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
+  - sign_in_with_apple (0.0.1):
+    - Flutter
   - smart_auth (0.0.1):
     - Flutter
   - sqflite (0.0.2):
@@ -143,6 +147,7 @@ DEPENDENCIES:
   - flutter_icmp_ping (from `.symlinks/plugins/flutter_icmp_ping/ios`)
   - flutter_inapp_purchase (from `.symlinks/plugins/flutter_inapp_purchase/ios`)
   - flutter_inappwebview (from `.symlinks/plugins/flutter_inappwebview/ios`)
+  - flutter_vibrate (from `.symlinks/plugins/flutter_vibrate/ios`)
   - fluttercontactpicker (from `.symlinks/plugins/fluttercontactpicker/ios`)
   - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
   - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
@@ -151,6 +156,7 @@ DEPENDENCIES:
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/ios`)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/ios`)
+  - sign_in_with_apple (from `.symlinks/plugins/sign_in_with_apple/ios`)
   - smart_auth (from `.symlinks/plugins/smart_auth/ios`)
   - sqflite (from `.symlinks/plugins/sqflite/ios`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
@@ -195,6 +201,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/flutter_inapp_purchase/ios"
   flutter_inappwebview:
     :path: ".symlinks/plugins/flutter_inappwebview/ios"
+  flutter_vibrate:
+    :path: ".symlinks/plugins/flutter_vibrate/ios"
   fluttercontactpicker:
     :path: ".symlinks/plugins/fluttercontactpicker/ios"
   fluttertoast:
@@ -211,6 +219,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/share_plus/ios"
   shared_preferences_foundation:
     :path: ".symlinks/plugins/shared_preferences_foundation/ios"
+  sign_in_with_apple:
+    :path: ".symlinks/plugins/sign_in_with_apple/ios"
   smart_auth:
     :path: ".symlinks/plugins/smart_auth/ios"
   sqflite:
@@ -240,6 +250,7 @@ SPEC CHECKSUMS:
   flutter_icmp_ping: 2b159955eee0c487c766ad83fec224ae35e7c935
   flutter_inapp_purchase: 5c6a1ac3f11b11d0c8c0321c0c41c1f05805e4c8
   flutter_inappwebview: bfd58618f49dc62f2676de690fc6dcda1d6c3721
+  flutter_vibrate: 9f4c2ab57008965f78969472367c329dd77eb801
   fluttercontactpicker: d582836dea6b5d489f3d259f35d7817ae82ee5e6
   fluttertoast: eb263d302cc92e04176c053d2385237e9f43fad0
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
@@ -255,6 +266,7 @@ SPEC CHECKSUMS:
   SDWebImage: 8ab87d4b3e5cc4927bd47f78db6ceb0b94442577
   share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
   shared_preferences_foundation: 297b3ebca31b34ec92be11acd7fb0ba932c822ca
+  sign_in_with_apple: f3bf75217ea4c2c8b91823f225d70230119b8440
   smart_auth: 4bedbc118723912d0e45a07e8ab34039c19e04f2
   sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
   SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f

ios/Runner.xcodeproj/project.pbxproj

@@ -47,6 +47,7 @@
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		C08A8E50299A2161008F4DB8 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
+		C0C4655B29A3007E00C47A11 /* RunnerProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = RunnerProfile.entitlements; sourceTree = "<group>"; };
 		D2718D25F9034030E31B924F /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -113,6 +114,7 @@
 		97C146F01CF9000F007C117D /* Runner */ = {
 			isa = PBXGroup;
 			children = (
+				C0C4655B29A3007E00C47A11 /* RunnerProfile.entitlements */,
 				C08A8E50299A2161008F4DB8 /* Runner.entitlements */,
 				97C146FA1CF9000F007C117D /* Main.storyboard */,
 				97C146FD1CF9000F007C117D /* Assets.xcassets */,
@@ -356,7 +358,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
+				CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = Z99J24WADU;
 				ENABLE_BITCODE = NO;

ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json

@@ -2,22 +2,19 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "LaunchImage.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "LaunchImage@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "LaunchImage@3x.png",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
 }

ios/Runner/Runner.entitlements

@@ -2,6 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>com.apple.developer.applesignin</key>
+	<array>
+		<string>Default</string>
+	</array>
 	<key>com.apple.developer.associated-domains</key>
 	<array>
 		<string>applinks:www.fusiontech.cn/</string>

ios/Runner/RunnerProfile.entitlements

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.developer.applesignin</key>
+	<array>
+		<string>Default</string>
+	</array>
+	<key>com.apple.developer.associated-domains</key>
+	<array>
+		<string>applinks:www.fusiontech.cn/</string>
+	</array>
+	<key>com.apple.developer.in-app-payments</key>
+	<array/>
+</dict>
+</plist>

lib/common/apis/user.dart

@@ -57,6 +57,16 @@ class UserAPI {
     return MsmEntity.fromMap(response);
   }
 
+  static Future<dynamic> appLogin(
+    Map<String, dynamic>? params,
+  ) async {
+    var response = await HttpUtil().post(
+      '/apple/checkAppleToken',
+      data: params,
+    );
+    return LoginEntity.fromMap(response['data']);
+  }
+
 // /sms/sendSms
   /// 注册
   static Future<UserRegisterRequestEntity> register({
@@ -80,7 +90,7 @@ class UserAPI {
   /// Logout
   static Future logout() async {
     return await HttpUtil().post(
-      '/user/logout',
+      '/logout',
     );
   }
 }

lib/common/routers/names.dart

@@ -10,4 +10,8 @@ class AppRoutes {
   static const PRODUCT_PAGE = '/product';
   static const TEMPLATE_PAGE = '/template';
   static const PAY_LIST = '/pay';
+  static const PRIVACT = '/privacy';
+  static const USER_PRIVACT = '/user_privacy';
+  static const WILL_COME = '/will_come';
+  // UserPrivacyPage
 }

lib/common/routers/pages.dart

 import 'package:chart/pages/chat/view.dart';
 import 'package:chart/pages/frame/notfound/index.dart';
 import 'package:chart/pages/frame/pay_list/view.dart';
+import 'package:chart/pages/privacy/index.dart';
 import 'package:chart/pages/template/index.dart';
+import 'package:chart/pages/user_privacy/index.dart';
 import 'package:flutter/material.dart';
 import 'package:chart/common/middlewares/middlewares.dart';
 import 'package:chart/pages/application/index.dart';
@@ -25,22 +27,33 @@ class AppPages {
 
   static final List<GetPage> routes = [
     // // 免登陆
+    GetPage(
+      name: AppRoutes.INITIAL,
+      page: () => WelcomePage(),
+      binding: WelcomeBinding(),
+      middlewares: [
+        RouteWelcomeMiddleware(priority: 1),
+      ],
+    ),
+    // 需要登录
+
+    // 分类列表
+
     // GetPage(
     //   name: AppRoutes.INITIAL,
-    //   page: () => WelcomePage(),
-    //   binding: WelcomeBinding(),
+    //   page: () => WelcomePage(), //ApplicationPage(),
+    //   binding: WelcomeBinding(), // ApplicationBinding(),
     //   middlewares: [
-    //     RouteWelcomeMiddleware(priority: 1),
+    //     // RouteAuthMiddleware(priority: 1),
     //   ],
-    // ),
-    // 需要登录
-
-    // 分类列表
+    //   // children: [
 
+    //   // ]
+    // ),
     GetPage(
-      name: AppRoutes.INITIAL,
-      page: () => WelcomePage(), //ApplicationPage(),
-      binding: WelcomeBinding(), // ApplicationBinding(),
+      name: AppRoutes.USER_PRIVACT,
+      page: () => UserPrivacyPage(), //ApplicationPage(),
+      binding: UserPrivacyBinding(), // ApplicationBinding(),
       middlewares: [
         // RouteAuthMiddleware(priority: 1),
       ],
@@ -48,7 +61,18 @@ class AppPages {
 
       // ]
     ),
+    // USER_PRIVACT
+    GetPage(
+      name: AppRoutes.PRIVACT,
+      page: () => PrivacyPage(), //ApplicationPage(),
+      binding: PrivacyBinding(), // ApplicationBinding(),
+      middlewares: [
+        // RouteAuthMiddleware(priority: 1),
+      ],
+      // children: [
 
+      // ]
+    ),
     GetPage(
       name: AppRoutes.SIGN_IN,
       page: () => SignInPage(),

lib/common/store/user.dart

@@ -6,6 +6,7 @@ import 'package:chart/common/routers/routes.dart';
 import 'package:chart/common/services/services.dart';
 import 'package:chart/common/values/values.dart';
 import 'package:chart/entity/login_entity.dart';
+import 'package:chart/pages/application/index.dart';
 import 'package:get/get.dart';
 
 import '../../entity/user_entity.dart';
@@ -34,25 +35,31 @@ class UserStore extends GetxController {
     if (profileOffline.isNotEmpty) {
       var l = jsonDecode(profileOffline);
       Map<String, dynamic> map = json.decode(l);
-      _profile(IntegralEntity.fromMap(map));
+      _profile.value = _profile(IntegralEntity.fromMap(map));
 
+      if (profile.id != '') {
+        _isLogin.value = true;
+      }
       // _profile(IntegralEntity.fromMap();
       // IntegralEntity.fromMap(result['data']);
       // _profile(UserLoginResponseEntity.fromJson(jsonDecode(profileOffline)));
     }
   }
 
-  handleLogin(LoginEntity res) async {
+  handleLogin(IntegralEntity res) async {
     await setToken(res.token);
-    IntegralEntity userInfo = await UserAPI.getUserIntegral();
-    await UserStore.to.getUserInfo(userInfo);
+    // IntegralEntity userInfo = await UserAPI.getUserIntegral();
+    await getUserInfo(
+        IntegralEntity(id: res.id, username: res.username, token: res.token));
     _isLogin.value = true;
+
     Get.offAndToNamed(AppRoutes.Application);
+    Get.put(ApplicationController());
   }
 
   getUserInfo(IntegralEntity userInfo) async {
     await setToken(userInfo.token);
-
+    _profile.value = userInfo;
     await saveProfile(userInfo);
 
     // token = StorageService.to.getString(STORAGE_USER_TOKEN_KEY);
@@ -102,5 +109,9 @@ class UserStore extends GetxController {
     await StorageService.to.remove(STORAGE_USER_TOKEN_KEY);
     _isLogin.value = false;
     token = '';
+
+    _profile.value = IntegralEntity(id: '', username: '', token: '');
+    saveProfile(IntegralEntity(id: '', username: '', token: ''));
+    Get.offAllNamed(AppRoutes.SIGN_IN);
   }
 }

lib/common/values/server.dart

 // baidu yapi
 // const SERVER_API_URL = 'https://yapi.baidu.com/mock/41008';
 // const SERVER_API_URL = 'https://yapi.ducafecat.tech/mock/11';
-// const SERVER_API_URL = 'http://101.34.153.228:8083/api';
-const SERVER_API_URL = 'http://192.168.2.178:8083/api';
+const SERVER_API_URL = 'http://101.34.153.228:8083/api';
+// const SERVER_API_URL = 'http://192.168.2.178:8083/api';
+// const SERVER_API_URL = 'http://192.168.110.57:8083/api';
+//
 
-//  AppRoutes.PRODUCT_PAGE
+// const SERVER_API_URL = 'http://192.168.110.163:8083/api';
 
+// const SERVER_API_URL = 'http://192.168.110.170:8083/api';
+// const SERVER_API_URL = 'http://192.168.110.199:8083/api';
+// http://192.168.110.199:8083/api/doc.html
+//  AppRoutes.PRODUCT_PAGE
 
 //http://192.168.2.178:8083/api/doc.html
 
-  // static const String baseUrl = 'http://101.34.153.228:8083'; // 基础接口地址
-  // static const String baseApiUrl = '${baseUrl}/api'; // 基础接口地址
+// static const String baseUrl = 'http://101.34.153.228:8083'; // 基础接口地址
+// static const String baseApiUrl = '${baseUrl}/api'; // 基础接口地址
 
 // http://101.34.153.228:8083/api/doc.html
 

lib/common/widgets/button.dart

@@ -20,7 +20,7 @@ Widget btnFlatButtonWidget({
     child: TextButton(
       style: ButtonStyle(
         textStyle: MaterialStateProperty.all(TextStyle(
-          fontSize: 16.sp,
+          fontSize: 16,
         )),
         foregroundColor: MaterialStateProperty.resolveWith(
           (states) {

lib/common/widgets/input.dart

@@ -32,7 +32,7 @@ Widget inputTextEdit({
         color: AppColors.primaryText,
         fontFamily: "Avenir",
         fontWeight: FontWeight.w400,
-        fontSize: 18.sp,
+        fontSize: 18,
       ),
       maxLines: 1,
       autocorrect: false, // 自动纠正
@@ -81,7 +81,7 @@ Widget inputEmailEdit({
         color: AppColors.primaryText,
         fontFamily: "Avenir",
         fontWeight: FontWeight.w400,
-        fontSize: 18.sp,
+        fontSize: 18,
       ),
       maxLines: 1,
       autocorrect: false, // 自动纠正

lib/package/chat_dash/src/widgets/message_row/default_message_text.dart

@@ -90,8 +90,9 @@ class DefaultMessageText extends StatelessWidget {
 
   Widget getPostMessageBuild(
       String text, List<ChatMessage> messageLength, bool isOwnMessage) {
-    var lastMessage = messageLength.last;
+    var lastMessage = messageLength.first;
 
+    print(lastMessage.text);
     // if(lastMessage.) {
 
     // }
@@ -99,21 +100,23 @@ class DefaultMessageText extends StatelessWidget {
 
     // if(a.is)
     // if()
-    return AnimatedTextKit(
-      animatedTexts: [
-        TypewriterAnimatedText(
-          text,
-          textStyle: const TextStyle(
-              // fontSize: 32.0,
-              // fontWeight: FontWeight.bold,
-              ),
-          speed: const Duration(milliseconds: 100),
-        )
-      ],
-      totalRepeatCount: 1,
-      // displayFullTextOnTap: true,
-      // stopPauseOnTap: true,
-    );
+    return lastMessage.text == text
+        ? AnimatedTextKit(
+            animatedTexts: [
+              TypewriterAnimatedText(
+                text,
+                textStyle: const TextStyle(
+                    // fontSize: 32.0,
+                    // fontWeight: FontWeight.bold,
+                    ),
+                speed: const Duration(milliseconds: 100),
+              )
+            ],
+            totalRepeatCount: 1,
+            // displayFullTextOnTap: true,
+            // stopPauseOnTap: true,
+          )
+        : Text(text);
   }
 
 //  {buildPostMessage = getPostMessageBuild}

lib/pages/application/bindings.dart

 import 'package:chart/pages/category/index.dart';
+import 'package:chart/pages/frame/pay_list/index.dart';
 import 'package:chart/pages/main/index.dart';
 import 'package:get/get.dart';
 
@@ -11,6 +12,7 @@ class ApplicationBinding implements Bindings {
     Get.lazyPut<ApplicationController>(() => ApplicationController());
     Get.lazyPut<MainController>(() => MainController());
     Get.lazyPut<CategoryController>(() => CategoryController());
+    Get.lazyPut<PayListController>(() => PayListController());
     // Get.lazyPut<ChatPageController>(() => ChatPageController());
   }
 }

lib/pages/application/controller.dart

 import 'dart:async';
-import 'package:vibration/vibration.dart';
+// import 'package:vibration/vibration.dart';
+import 'package:flutter_vibrate/flutter_vibrate.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -7,11 +8,23 @@ import 'package:chart/common/routers/routes.dart';
 import 'package:chart/common/utils/utils.dart';
 import 'package:chart/common/values/values.dart';
 import 'package:get/get.dart';
+// import 'package:vibrate/vibrate.dart';
 // import 'package:uni_links/uni_links.dart';
 
 import '../../common/store/config.dart';
 import 'index.dart';
 
+// enum FeedbackType {
+//   success,
+//   error,
+//   warning,
+//   selection,
+//   impact,
+//   heavy,
+//   medium,
+//   light
+// }
+
 class ApplicationController extends GetxController {
   ApplicationController();
 
@@ -37,8 +50,13 @@ class ApplicationController extends GetxController {
     // if (await Vibration.hasVibrator() != null) {
     //   Vibration.vibrate(duration: 10, amplitude: 128);
     // }
-    pageController.animateToPage(index,
-        duration: const Duration(milliseconds: 200), curve: Curves.ease);
+    Vibrate.feedback(FeedbackType.impact);
+    try {
+      pageController.animateToPage(index,
+          duration: const Duration(milliseconds: 200), curve: Curves.ease);
+    } catch (e) {
+      print(e);
+    }
   }
 
   // tab栏页码切换
@@ -90,6 +108,7 @@ class ApplicationController extends GetxController {
 
   // 跳转 注册界面
   handleChat() async {
+    Vibrate.feedback(FeedbackType.impact);
     Get.toNamed(AppRoutes.CHAT_PAGE);
     // await ConfigStore.to.saveAlreadyOpen();
     // Get.offAndToNamed(AppRoutes.CHAT_PAGE);
@@ -116,7 +135,7 @@ class ApplicationController extends GetxController {
           Iconfont.home,
           color: AppColors.secondaryElementText,
         ),
-        label: 'main',
+        label: '首页',
         backgroundColor: AppColors.primaryBackground,
       ),
       new BottomNavigationBarItem(
@@ -128,7 +147,7 @@ class ApplicationController extends GetxController {
           Iconfont.grid,
           color: AppColors.secondaryElementText,
         ),
-        label: 'category',
+        label: '信息广场',
         backgroundColor: AppColors.primaryBackground,
       ),
       // new BottomNavigationBarItem(
@@ -152,7 +171,7 @@ class ApplicationController extends GetxController {
           Iconfont.me,
           color: AppColors.secondaryElementText,
         ),
-        label: 'my',
+        label: '个人中心',
         backgroundColor: AppColors.primaryBackground,
       ),
     ];

lib/pages/application/view.dart

@@ -18,7 +18,7 @@ class ApplicationPage extends GetView<ApplicationController> {
             style: TextStyle(
               color: AppColors.primaryElementText,
               fontFamily: 'Montserrat',
-              fontSize: 18.sp,
+              fontSize: 18,
               fontWeight: FontWeight.w600,
             ),
           )),

lib/pages/chat/view.dart

@@ -28,7 +28,7 @@ class ChatPage extends GetView<ChatPageController> {
             style: TextStyle(
               color: AppColors.primaryElementText,
               fontFamily: 'Montserrat',
-              fontSize: 18.sp,
+              fontSize: 18,
               fontWeight: FontWeight.w600,
             ),
           ),

lib/pages/frame/notfound/controller.dart

@@ -2,6 +2,7 @@ import 'package:chart/common/apis/apis.dart';
 import 'package:chart/common/store/store.dart';
 import 'package:chart/package/chat_dash/dash_chat_2.dart' as Chat;
 import 'package:flutter_easyloading/flutter_easyloading.dart';
+import 'package:flutter_vibrate/flutter_vibrate.dart';
 import 'package:get/get.dart';
 import 'package:uuid/uuid.dart';
 import 'package:flutter_chat_types/flutter_chat_types.dart' as types;
@@ -30,8 +31,8 @@ class ChatNewController extends GetxController {
 
   final receiveUser = Chat.ChatUser(
     id: '82091008-a484-4a89-ae75-a22bf8d6f3aa',
-    firstName: "GPT",
-    lastName: '大师',
+    firstName: "A",
+    lastName: 'I',
     // imageUrl:
     //     "https://imgb15.photophoto.cn/20201124/jiqirentupian-39852917_3.jpg"
     // // imageUrl: "assets/images/300.jpg",
@@ -40,6 +41,7 @@ class ChatNewController extends GetxController {
   /// 事件
 
   void sendMessage(Chat.ChatMessage message) async {
+    Vibrate.feedback(FeedbackType.impact);
     // if (state.messageList.isNotEmpty) {
     //   // data = !_messages.every((element) => element.status != Status.sending);
     // }
@@ -90,6 +92,7 @@ class ChatNewController extends GetxController {
       );
       _addMessage(receiveMessage);
       EasyLoading.dismiss();
+      Vibrate.feedback(FeedbackType.success);
     } catch (e) {
       print("eeeeeeee$e");
       // _cancelLoading();
@@ -102,6 +105,7 @@ class ChatNewController extends GetxController {
 
       _addMessage(receiveErrorMessage);
       EasyLoading.dismiss();
+      Vibrate.feedback(FeedbackType.error);
     }
   }
 

lib/pages/frame/notfound/state.dart

@@ -10,7 +10,7 @@ class ChatPageState {
   RxList<Chat.ChatMessage> messageList = <Chat.ChatMessage>[].obs;
 
 //  get  _messageList =>
-  final _page = "与人工智能机器人的对话".obs;
+  final _page = "AI写作大师".obs;
   set page(value) => this._page.value = value;
   get page => this._page.value;
   //   RxList<NewsItem> newsList = <NewsItem>[].obs;

lib/pages/frame/notfound/view.dart

@@ -21,19 +21,32 @@ class ChatNewPage extends GetView<ChatNewController> {
   @override
   Widget build(BuildContext context) {
 //  final c = Get.put(ChatPageController());
-
+//  Text(
+//               "${controller.state.page}",
+//               style: TextStyle(
+//                 color: AppColors.primaryElementText,
+//                 fontFamily: 'Montserrat',
+//                 fontSize: 18,
+//                 fontWeight: FontWeight.w600,
+//               ),
+//             )
     // final c = Get.put(ChatNewController());
     return Obx(() => Scaffold(
         appBar: transparentAppBar(
-            title: Text(
-              "${controller.state.page}${controller.state.messageList.length}",
-              style: TextStyle(
-                color: AppColors.primaryElementText,
-                fontFamily: 'Montserrat',
-                fontSize: 18.sp,
-                fontWeight: FontWeight.w600,
-              ),
-            ),
+            title: RichText(
+                text: TextSpan(children: [
+              TextSpan(
+                  text: "${controller.state.page}",
+                  style: TextStyle(
+                    color: AppColors.primaryElementText,
+                    fontFamily: 'Montserrat',
+                    fontSize: 18,
+                    fontWeight: FontWeight.w600,
+                  )),
+              TextSpan(
+                  text: "${controller.state.messageList.length}",
+                  style: TextStyle(fontSize: 0)),
+            ])),
             leading: IconButton(
               tooltip: '返回上一页',
               icon: const Icon(
@@ -124,6 +137,7 @@ class ChatNewPage extends GetView<ChatNewController> {
               //   // ),
               // ),
             ),
+            // ${controller.state.messageList.length}条消息
             currentUser: _user,
             onSend: controller.sendMessage,
             // messageListOptions:

lib/pages/frame/pay_list/controller.dart

 import 'dart:async';
 
 import 'package:chart/common/apis/apis.dart';
+import 'package:chart/common/routers/routes.dart';
 import 'package:chart/common/store/store.dart';
 import 'package:chart/entity/user_entity.dart';
+import 'package:chart/pages/application/index.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_inapp_purchase/flutter_inapp_purchase.dart';
 import 'package:flutter_inapp_purchase/modules.dart';
+import 'package:flutter_vibrate/flutter_vibrate.dart';
 import 'package:get/get.dart';
 
 import 'index.dart';
@@ -19,14 +22,21 @@ class PayListController extends GetxController {
     "com.wudi.app.weekly_pass",
     "com.wudi.app.monthly_pass",
     "com.wudi.app.60stars"
-    // "com.wudi.app.prod_id_002",
-    // "com.wudi.app.prod_id_003",
-    // "com.wudi.app.prod_id_004"
   ];
 
-  var _conectionSubscription;
-  var _purchaseUpdatedSubscription;
-  var _purchaseErrorSubscription;
+  final List<dynamic> _mapData = [
+    {"id": "com.wudi.app.weekly_pass", "name": "周卡"},
+    {"id": "com.wudi.app.monthly_pass", "name": "月卡"},
+    {"id": "com.wudi.app.60stars", "name": "30次问答卡"}
+  ];
+
+  late StreamSubscription _purchaseUpdatedSubscription;
+  late StreamSubscription _purchaseErrorSubscription;
+  late StreamSubscription _conectionSubscription;
+
+  // Platform messages may fail, so we use a try/catch PlatformException.
+
+  // prepare
 
   /// 成员变量
 
@@ -47,7 +57,7 @@ class PayListController extends GetxController {
   @override
   void onInit() async {
     super.onInit();
-
+    await initializedPlugins();
     await _getProduct();
 
     // await initializedPlugins();
@@ -55,6 +65,53 @@ class PayListController extends GetxController {
     // 初始静态数据
   }
 
+  Future initializedPlugins() async {
+    var result = await FlutterInappPurchase.instance.initialize();
+    print('result: $result');
+    // If the widget was removed from the tree while the asynchronous platform
+    // message was in flight, we want to discard the reply rather than calling
+    // setState to update our non-existent appearance.
+
+    _conectionSubscription =
+        FlutterInappPurchase.connectionUpdated.listen((connected) {
+      print('connected: $connected');
+    });
+
+    _purchaseUpdatedSubscription =
+        FlutterInappPurchase.purchaseUpdated.listen((productItem) async {
+      print("支付1次");
+      ApplePayEntity? res = await UserAPI.notifyApplePay({
+        'receipt': productItem?.transactionReceipt,
+        'userId': UserStore.to.profile.id,
+        'productId': productItem!.productId,
+        "chooseEnv": false
+      });
+
+      if (res?.status == 200) {
+        EasyLoading.showSuccess('${res?.message}');
+        Vibrate.feedback(FeedbackType.success);
+        EasyLoading.dismiss();
+
+        Get.back();
+        // Get.offAndToNamed(AppRoutes.Application);
+        // Get.put(ApplicationController());
+      } else {
+        await FlutterInappPurchase.instance.clearTransactionIOS();
+        EasyLoading.showError("${res?.message}}");
+        EasyLoading.dismiss();
+        Vibrate.feedback(FeedbackType.error);
+      }
+    });
+
+    _purchaseErrorSubscription =
+        FlutterInappPurchase.purchaseError.listen((purchaseError) {
+      // print('purchase-error: $purchaseError');
+      Vibrate.feedback(FeedbackType.error);
+      EasyLoading.showError('支付订单失败');
+      EasyLoading.dismiss();
+    });
+  }
+
   Future _getProduct() async {
     try {
       List<IAPItem> items =
@@ -71,8 +128,12 @@ class PayListController extends GetxController {
     }
   }
 
-  void requestPurchase(IAPItem item) {
-    FlutterInappPurchase.instance.requestPurchase(item.productId!);
+  void requestPurchase() {
+    Vibrate.feedback(FeedbackType.selection);
+    // print("${item.productId}");
+    EasyLoading.show(status: '支付中...');
+    // IAPItem item
+    FlutterInappPurchase.instance.requestPurchase(state.selected);
   }
 
   ///在 onInit() 之后调用 1 帧。这是进入的理想场所
@@ -100,9 +161,9 @@ class PayListController extends GetxController {
   ///dispose 释放内存
   @override
   void dispose() {
-    // _purchaseUpdatedSubscription.cancel();
-    // _purchaseErrorSubscription.cancel();
-    // _conectionSubscription.cancel();
+    _purchaseUpdatedSubscription.cancel();
+    _purchaseErrorSubscription.cancel();
+    _conectionSubscription.cancel();
     super.dispose();
     // dispose 释放对象
   }

lib/pages/frame/pay_list/state.dart

@@ -7,5 +7,9 @@ class PayListState {
   set title(value) => this._title.value = value;
   get title => this._title.value;
 
+  final _selected = "com.wudi.app.60stars".obs;
+  set selected(value) => _selected.value = value;
+  get selected => _selected.value;
+
   RxList<IAPItem> items = <IAPItem>[].obs;
 }

lib/pages/frame/pay_list/view.dart

@@ -11,6 +11,8 @@ import 'widgets/widgets.dart';
 class PayListPage extends GetView<PayListController> {
   // 内容页
   Widget _buildView() {
+    // return PayItemWidget();
+
     return PayItemWidget();
   }
 
@@ -18,56 +20,46 @@ class PayListPage extends GetView<PayListController> {
   Widget build(BuildContext context) {
     final c = Get.put(PayListController());
     return Scaffold(
-      appBar: transparentAppBar(
-        title: Text(
-          "套餐选择",
-          style: TextStyle(
-            color: AppColors.primaryElementText,
-            fontFamily: 'Montserrat',
-            fontSize: 18.sp,
-            fontWeight: FontWeight.w600,
-          ),
-        ),
-        leading: IconButton(
-          tooltip: '返回上一页',
-          icon: const Icon(
-            Icons.arrow_back,
-            color: AppColors.primaryElementText,
-          ),
-          onPressed: () async {
-            // Get.back();
-            // Get.offAll(ApplicationPage());
-            // await Get.off(ApplicationPage());
-            // Get.toNamed(AppRoutes.Application);
+      // appBar: transparentAppBar(
+      //   title: Text(
+      //     "套餐选择",
+      //     style: TextStyle(
+      //       color: AppColors.primaryElementText,
+      //       fontFamily: 'Montserrat',
+      //       fontSize: 18,
+      //       fontWeight: FontWeight.w600,
+      //     ),
+      //   ),
+      //   leading: IconButton(
+      //     tooltip: '返回上一页',
+      //     icon: const Icon(
+      //       Icons.arrow_back,
+      //       color: AppColors.primaryElementText,
+      //     ),
+      //     onPressed: () async {
+      //       // Get.back();
+      //       // Get.offAll(ApplicationPage());
+      //       // await Get.off(ApplicationPage());
+      //       // Get.toNamed(AppRoutes.Application);
 
-            Get.back();
-            // await Get.toNamed();
-            // Navigator.of(context).pop();
-            //_nextPage(-1);
-          },
-        ),
-      ),
+      //       Get.back();
+      //       // await Get.toNamed();
+      //       // Navigator.of(context).pop();
+      //       //_nextPage(-1);
+      //     },
+      //   ),
+      // ),
       // _buildView
       body: Container(
           width: double.infinity,
           height: double.infinity,
-          padding: EdgeInsets.symmetric(horizontal: 20),
+          // padding: EdgeInsets.symmetric(horizontal: 20),
           decoration: BoxDecoration(
             image: DecorationImage(
-                image: Image.asset("assets/images/bg.png").image,
+                image: Image.asset("assets/images/bg1.png").image,
                 fit: BoxFit.cover),
           ),
-          child: SingleChildScrollView(
-            child: Obx(() => Column(
-                  children: [
-                    Text(
-                      c.state.items.length.toString(),
-                      style: TextStyle(color: Color.fromRGBO(0, 0, 0, 0)),
-                    ),
-                    Container(child: PayItemWidget())
-                  ],
-                )),
-          )),
+          child: _buildView()),
     );
   }
 }

lib/pages/frame/pay_list/widgets/helloword.bak.dart

+import 'dart:async';
+
+import 'package:chart/common/store/store.dart';
+import 'package:chart/entity/user_entity.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
+import 'package:flutter_inapp_purchase/flutter_inapp_purchase.dart';
+import 'package:get/get.dart';
+import 'package:glassmorphism/glassmorphism.dart';
+
+import '../../../../common/apis/apis.dart';
+import '../index.dart';
+
+class PayItemWidget extends StatefulWidget {
+  const PayItemWidget({Key? key}) : super(key: key);
+
+  @override
+  GoodsPageState createState() => GoodsPageState();
+}
+
+class GoodsPageState extends State<PayItemWidget> {
+  late StreamSubscription _purchaseUpdatedSubscription;
+  late StreamSubscription _purchaseErrorSubscription;
+  late StreamSubscription _conectionSubscription;
+
+  @override
+  void initState() {
+    initializedPlugins();
+    // TODO: implement initState
+    super.initState();
+  }
+
+  initializedPlugins() async {
+    String platformVersion;
+    // Platform messages may fail, so we use a try/catch PlatformException.
+
+    // prepare
+    var result = await FlutterInappPurchase.instance.initialize();
+    print('result: $result');
+
+    // If the widget was removed from the tree while the asynchronous platform
+    // message was in flight, we want to discard the reply rather than calling
+    // setState to update our non-existent appearance.
+    if (!mounted) return;
+
+    _conectionSubscription =
+        FlutterInappPurchase.connectionUpdated.listen((connected) {
+      print('connected: $connected');
+    });
+
+    _purchaseUpdatedSubscription =
+        FlutterInappPurchase.purchaseUpdated.listen((productItem) async {
+      // print(a);
+      ApplePayEntity? res = await UserAPI.notifyApplePay({
+        'receipt': productItem?.transactionReceipt,
+        'userId': UserStore.to.profile.id,
+        "chooseEnv": false
+      });
+      print(
+          "productItemproductItemproductItemproductItemproductItemproductItemproductItemproductItem");
+
+      if (res?.status == 200) {
+        await FlutterInappPurchase.instance.clearTransactionIOS();
+        EasyLoading.showSuccess('${res?.message}');
+        EasyLoading.dismiss();
+      } else {
+        EasyLoading.showError("${res?.message}}");
+        EasyLoading.dismiss();
+      }
+    });
+
+    _purchaseErrorSubscription =
+        FlutterInappPurchase.purchaseError.listen((purchaseError) {
+      // print('purchase-error: $purchaseError');
+      EasyLoading.showError('支付订单失败');
+      EasyLoading.dismiss();
+    });
+  }
+
+  @override
+  dispose() {
+    _purchaseUpdatedSubscription.cancel();
+    _purchaseErrorSubscription.cancel();
+    _conectionSubscription.cancel();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    var count = 0.obs;
+    // ProductController c = Get.put(ProductController());
+    // ProductController c = Get.put(ProductController());
+    PayListController c = Get.find();
+
+// initDataList
+    return Column(
+        children: c.state.items
+            .map((item) => GlassmorphicContainer(
+                  borderRadius: 16,
+                  margin: EdgeInsets.only(top: 16),
+                  blur: 14,
+                  alignment: Alignment.bottomCenter,
+                  border: 2,
+                  linearGradient: LinearGradient(
+                    begin: Alignment.topLeft,
+                    end: Alignment.bottomRight,
+                    colors: [
+                      const Color(0xFF0FFFF).withOpacity(0.2),
+                      const Color(0xFF0FFFF).withOpacity(0.2),
+                    ],
+                  ),
+                  borderGradient: LinearGradient(
+                    begin: Alignment.topLeft,
+                    end: Alignment.bottomRight,
+                    colors: [
+                      const Color(0xFF0FFFF).withOpacity(1),
+                      const Color(0xFFFFFFF),
+                      const Color(0xFF0FFFF).withOpacity(1),
+                    ],
+                  ),
+                  height: 173,
+                  width: double.infinity,
+                  // margin: EdgeInsets.symmetric(vertical: 10.0),
+                  child: Container(
+                    child: Column(
+                      children: <Widget>[
+                        Container(
+                          padding: EdgeInsets.all(16.0),
+                          width: double.infinity,
+                          // height: 200,
+                          child: Column(children: [
+                            Row(
+                              children: [
+                                const Text(
+                                  "项目名称:",
+                                  style: TextStyle(color: Colors.white),
+                                ),
+                                SizedBox(
+                                  width: 10,
+                                ),
+                                Text(
+                                  item.title!,
+                                  style: TextStyle(color: Colors.white),
+                                )
+                              ],
+                            ),
+                            Row(
+                              children: [
+                                const Text(
+                                  "项目价格:",
+                                  style: TextStyle(color: Colors.white),
+                                ),
+                                SizedBox(
+                                  width: 10,
+                                ),
+                                Text(
+                                  item.localizedPrice!,
+                                  style: TextStyle(color: Colors.white),
+                                )
+                              ],
+                            ),
+                            Row(
+                              children: [
+                                const Text(
+                                  "项目描述:",
+                                  style: TextStyle(color: Colors.white),
+                                ),
+                                SizedBox(
+                                  width: 10,
+                                ),
+                                Expanded(
+                                    child: Text(
+                                  maxLines: 3,
+                                  item.description!,
+                                  style: TextStyle(
+                                    color: Colors.white,
+                                  ),
+                                ))
+                              ],
+                            ),
+                            Row(children: [
+                              ElevatedButton(
+                                // color: Colors.orange,
+                                onPressed: () {
+                                  EasyLoading.show(status: '提交订单中...');
+                                  c.requestPurchase(item);
+                                  // c()
+                                },
+                                child: Text('购买套餐'),
+                              ),
+                            ])
+                          ]),
+                          // child: ,
+                        ),
+                      ],
+                    ),
+                  ),
+                ))
+            .toList());
+  }
+}

lib/pages/frame/pay_list/widgets/widgets.dart

 library widgets;
 
-export './helloword.dart';
+export 'helloword.dart';

lib/pages/frame/product/controller.dart

@@ -129,6 +129,7 @@ class ProductController extends GetxController {
         EasyLoading.dismiss();
       } catch (e) {
         state.loading = false;
+        EasyLoading.dismiss();
       }
 
       print("$str");

lib/pages/frame/product/view.dart

@@ -43,7 +43,7 @@ class ProductPage extends GetView<ProductController> {
               style: TextStyle(
                 color: AppColors.primaryElementText,
                 fontFamily: 'Montserrat',
-                fontSize: 18.sp,
+                fontSize: 18,
                 fontWeight: FontWeight.w600,
               ),
             ),

lib/pages/frame/sign_in/controller.dart

 import 'dart:async';
-
+import 'package:flutter_vibrate/flutter_vibrate.dart';
+import 'package:sign_in_with_apple/sign_in_with_apple.dart';
 import 'package:flutter/material.dart';
 import 'package:chart/common/apis/apis.dart';
 import 'package:chart/common/entities/entities.dart';
@@ -8,7 +9,7 @@ import 'package:chart/common/store/store.dart';
 import 'package:chart/common/utils/utils.dart';
 import 'package:chart/common/widgets/widgets.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
-// import 'package:fluttertoast/fluttertoast.dart';
+import 'package:social_login_buttons/social_login_buttons.dart';
 import 'package:get/get.dart';
 
 import '../../../entity/login_entity.dart';
@@ -77,7 +78,7 @@ class SignInController extends GetxController {
       });
 
       if (res?.token != null) {
-        UserStore.to.handleLogin(res);
+        // UserStore.to.handleLogin(res);
         EasyLoading.showSuccess("登录成功！");
         // Navigator.of(context).pushNamed('/');
       } else {
@@ -207,6 +208,42 @@ class SignInController extends GetxController {
     }
   }
 
+  signInWithApple() async {
+    Vibrate.feedback(FeedbackType.selection);
+    try {
+      final credential = await SignInWithApple.getAppleIDCredential(
+        scopes: [
+          AppleIDAuthorizationScopes.email,
+          AppleIDAuthorizationScopes.fullName,
+        ],
+      );
+      EasyLoading.show(status: "登录中...");
+      LoginEntity res = await UserAPI.appLogin({
+        "authorizationCode": credential?.authorizationCode,
+        "email": credential?.email,
+        "familyName": credential?.familyName,
+        "givenName": credential?.givenName,
+        "hashCode": credential?.hashCode,
+        "identityToken": credential?.identityToken,
+        "userIdentifier": credential?.userIdentifier
+      });
+
+      Vibrate.feedback(FeedbackType.success);
+      EasyLoading.showSuccess("登录成功");
+
+      EasyLoading.dismiss();
+      UserStore.to.handleLogin(
+          IntegralEntity(id: res.id, username: res.username, token: res.token));
+
+      // appLogin
+    } catch (e) {
+      Vibrate.feedback(FeedbackType.error);
+      EasyLoading.showError("登录失败");
+      EasyLoading.dismiss();
+    }
+    ;
+  }
+
   @override
   void onReady() {
     super.onReady();

lib/pages/main/controller.dart

@@ -48,13 +48,13 @@ class MainController extends GetxController {
   }
 
   asyncLoadBannerData() async {
-    final token = StorageService.to.getString(STORAGE_USER_TOKEN_KEY);
+    // final token = StorageService.to.getString(STORAGE_USER_TOKEN_KEY);
     // await UserStore.to.setToken('');
     // (res.token);
-    if (token.isEmpty) {
-      IntegralEntity userInfo = await UserAPI.getUserIntegral();
-      await UserStore.to.getUserInfo(userInfo);
-    }
+    // if (token.isEmpty) {
+    //   IntegralEntity userInfo = await UserAPI.getUserIntegral();
+    //   await UserStore.to.getUserInfo(userInfo);
+    // }
 
     List<MessageEntity>? list = await NewsAPI.bannerList();
 

lib/pages/main/widgets/ad.dart

@@ -29,8 +29,8 @@ class AdWidget extends GetView<MainController> {
                 color: AppColors.primaryText,
                 fontFamily: "Avenir",
                 fontWeight: FontWeight.w400,
-                fontSize: 18.sp,
-                height: 18.sp / 18,
+                fontSize: 18,
+                height: 18 / 18,
               ),
             ),
           ],

lib/pages/main/widgets/categories.dart

@@ -2,6 +2,7 @@ import 'package:chart/common/routers/routes.dart';
 import 'package:flutter/material.dart';
 import 'package:chart/common/values/values.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:flutter_vibrate/flutter_vibrate.dart';
 import 'package:get/get.dart';
 
 import '../../../common/store/user.dart';
@@ -31,14 +32,23 @@ class NewsCategoriesWidget extends GetView<MainController> {
                         // ignore: prefer_const_literals_to_create_immutables
                         children: [
                           // ignore: prefer_const_constructors
-                          Obx(() => Text(
+                          Obx(
+                            () => Container(
+                              width: 200,
+                              child: Text(
                                 "Hi, ${userC.profile.username}",
+                                maxLines: 1,
+                                textAlign: TextAlign.left,
+                                overflow: TextOverflow.clip,
+                                softWrap: true,
                                 // ignore: prefer_const_constructors
                                 style: TextStyle(
                                     color: Colors.white,
                                     fontWeight: FontWeight.w800,
-                                    fontSize: 20.sp),
-                              )),
+                                    fontSize: 20),
+                              ),
+                            ),
+                          ),
                           SizedBox(height: 30),
                           // ignore: prefer_const_constructors
                           Text(
@@ -50,9 +60,10 @@ class NewsCategoriesWidget extends GetView<MainController> {
                       ),
                       GestureDetector(
                         onTap: () {
-                          Get.toNamed(AppRoutes.SIGN_IN);
+                          // Get.toNamed(AppRoutes.SIGN_IN);
                           // AppRoutes.SIGN_IN
-                          // Get.toNamed(AppRoutes.PAY_LIST);
+                          Vibrate.feedback(FeedbackType.impact);
+                          Get.toNamed(AppRoutes.PAY_LIST);
                         },
                         // {Navigator.of(context).pushNamed('/pay')},
                         child: Container(
@@ -92,7 +103,7 @@ class NewsCategoriesWidget extends GetView<MainController> {
         //                 color: controller.state.selCategoryCode == item.code
         //                     ? AppColors.secondaryElementText
         //                     : AppColors.primaryText,
-        //                 fontSize: 18.sp,
+        //                 fontSize: 18,
         //                 fontFamily: 'Montserrat',
         //                 fontWeight: FontWeight.w600,
         //               ),

lib/pages/main/widgets/categories_bak.dart

@@ -29,7 +29,7 @@ class NewsCategoriesWidget extends GetView<MainController> {
                           color: controller.state.selCategoryCode == item.code
                               ? AppColors.secondaryElementText
                               : AppColors.primaryText,
-                          fontSize: 18.sp,
+                          fontSize: 18,
                           fontFamily: 'Montserrat',
                           fontWeight: FontWeight.w600,
                         ),

lib/pages/main/widgets/newsletter.dart

@@ -22,7 +22,7 @@ class NewsletterWidget extends GetView<MainController> {
                 'Newsletter',
                 style: TextStyle(
                   fontFamily: 'Montserrat',
-                  fontSize: 18.sp,
+                  fontSize: 18,
                   fontWeight: FontWeight.w600,
                   color: AppColors.thirdElement,
                 ),

lib/pages/main/widgets/swiper.dart

@@ -6,6 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:chart/common/values/values.dart';
 import 'package:flutter_chat_types/flutter_chat_types.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:flutter_vibrate/flutter_vibrate.dart';
 import 'package:get/get.dart';
 import 'package:card_swiper/card_swiper.dart';
 import '../index.dart';
@@ -29,7 +30,7 @@ class SiperBannerWidget extends GetView<MainController> {
     return Obx(() => controller.state.bannerList == null
         ? Container()
         : Container(
-            height: 230.h,
+            height: 230,
             child: Swiper(
               scrollDirection: Axis.vertical,
               autoplay: true,
@@ -37,12 +38,16 @@ class SiperBannerWidget extends GetView<MainController> {
               pagination: SwiperPagination(),
               control: null,
               itemBuilder: (BuildContext context, int index) {
-                return Container(
-                  decoration: BoxDecoration(
-                    borderRadius: BorderRadius.circular(16.r),
-                    color: Colors.black.withAlpha(0),
+                return Center(
+                  child: Container(
+                    decoration: BoxDecoration(
+                      borderRadius: BorderRadius.circular(16.r),
+                      color: Colors.black.withAlpha(0),
+                    ),
+                    child: Column(
+                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                        children: _renderList(index)),
                   ),
-                  child: Column(children: _renderList(index)),
                 );
               },
             ),
@@ -52,9 +57,9 @@ class SiperBannerWidget extends GetView<MainController> {
   Widget _generateWidget(MessageEntity message, int idx, int index) {
     final c = Get.put(ChatNewController());
     return Container(
-      height: 70.0,
+      // height: 90.0,
       width: double.infinity,
-      margin: idx == 1 ? const EdgeInsets.symmetric(vertical: 10.0) : null,
+      // margin: idx == 1 ? const EdgeInsets.symmetric(vertical: 10.0) : null,
       constraints: const BoxConstraints(minWidth: 41),
       decoration: BoxDecoration(
         // color: Colors.white,
@@ -100,6 +105,7 @@ class SiperBannerWidget extends GetView<MainController> {
               },
               child: InkWell(
                 onTap: () {
+                  Vibrate.feedback(FeedbackType.impact);
                   // message.question
                   Chat.ChatUser _user = Chat.ChatUser(
                     id: '1',

lib/pages/privacy/bindings.dart

+import 'package:get/get.dart';
+
+import 'controller.dart';
+
+class PrivacyBinding implements Bindings {
+  @override
+  void dependencies() {
+    Get.lazyPut<PrivacyController>(() => PrivacyController());
+  }
+}

lib/pages/privacy/controller.dart

+import 'package:get/get.dart';
+
+import 'index.dart';
+
+class PrivacyController extends GetxController {
+  PrivacyController();
+
+  final state = PrivacyState();
+
+  // tap
+  void handleTap(int index) {
+    Get.snackbar(
+      "标题",
+      "消息",
+    );
+  }
+
+  /// 在 widget 内存中分配后立即调用。
+  @override
+  void onInit() {
+    super.onInit();
+  }
+
+  /// 在 onInit() 之后调用 1 帧。这是进入的理想场所
+  @override
+  void onReady() {
+    super.onReady();
+  }
+
+  /// 在 [onDelete] 方法之前调用。
+  @override
+  void onClose() {
+    super.onClose();
+  }
+
+  /// dispose 释放内存
+  @override
+  void dispose() {
+    super.dispose();
+  }
+}

lib/pages/privacy/index.dart

+library privacy;
+
+export './state.dart';
+export './controller.dart';
+export './bindings.dart';
+export './view.dart';

lib/pages/privacy/state.dart

+import 'package:get/get.dart';
+
+class PrivacyState {
+  final _title = """
+
+我们重视您的隐私权，并承诺在使用您的个人信息时遵守相关法律法规。本隐私协议旨在向您说明我们在使用您的个人信息时如何保护您的隐私。
+1.信息收集
+我们会收集您在使用本 app 时提供给我们的个人信息，例如：
+●注册账户时提供的个人信息，包括但不限于您的姓名、电子邮箱地址、手机号码等；
+●使用本 app 时提供的信息，包括但不限于您与 AI 服务器进行交流时提供的问题和回答等；
+●在使用本 app 时，我们可能会使用 cookie 和其他技术来自动收集一些信息，例如您的设备信息、浏览器信息、IP 地址、访问时间、访问页面等。
+2.信息使用
+我们会将您的个人信息用于以下目的：
+●向您提供本 app 的服务，并持续改进和优化本 app 的功能；
+●向您提供有关本 app 的信息，包括但不限于本 app 的更新、服务、活动、推广等；
+●进行内部审计、数据分析和研究，以改进我们的产品、服务和提升用户体验；
+●依法律法规要求或与相关政府机构合作，遵守法律法规的要求。
+●使用第三方服务进行内容安全审查。
+3.信息共享
+我们不会向第三方共享您的个人信息，但以下情况除外：
+●在获得您的明确同意后；
+●根据法律法规的要求，我们需要披露您的个人信息；
+●为了保护我们的合法权益，我们可能需要披露您的个人信息；
+●为了保护您或其他用户的人身、财产安全，我们可能需要披露您的个人信息。
+●使用第三方服务进行内容安全审查
+●如果您申请了退款，我们会将您的付费计划使用情况发送给Apple团队
+4.信息保护
+我们采取合理的安全措施来保护您的个人信息，但不对因不可抗力或非因我们的原因导致的信息泄露承担责任。
+5.特别说明
+目前，您发送给AI的信息除了被AI服务器处理之外，依据国家法律法规，还会使用第三方服务进行内容安全审查，例如腾讯内容安全审查接口。除此之外，我们会严格保护您的信息安全 。
+特别注意的是，请保护好您的隐私，不要发送有关账号密码、身份信息等个人隐私数据，亦不要发送违反法律法规、社会道德的内容。
+6.其他
+本隐私协议自您接受之日起生效，对我们和用户均具有约束力。
+如果我们对本隐私协议作出任何变更，我们会在本 app 上公布变更后的协议。如果您继续使用本 app，即表示您同意受变更后的协议的约束。如果您不同意变更后的协议，应当立即停止使用本 app。
+本隐私协议未尽事宜，您需遵守我们不时发布的其他服务条款和操作规则。
+
+
+Privacy Agreement
+We value your privacy and promise to abide by relevant laws and regulations when using your personal information. This Privacy Policy is intended to explain to you how we protect your privacy when using your personal information.
+1. Information Collection
+We collect personal information that you provide to us when using the app, such as:
+●Personal information provided when registering an account, including but not limited to your name, email address, mobile phone number, etc.;
+●Information provided when using this app, including but not limited to questions and answers you provide when communicating with the AI server;
+●When using this app, we may use cookies and other technologies to automatically collect some information, such as your device information, browser information, IP address, access time, visited pages, etc.
+2. Use of information
+We will use your personal information for the following purposes:
+●Provide you with the services of this app, and continuously improve and optimize the functions of this app;
+●Provide you with information about this app, including but not limited to updates, services, events, promotions, etc. of this app;
+● Conduct internal audits, data analysis and research to improve our products, services and user experience;
+●Abiding by the requirements of laws and regulations or cooperating with relevant government agencies to comply with the requirements of laws and regulations.
+● Use third-party services for content security review.
+
+3. Information sharing
+We will not share your personal information with third parties, except in the following circumstances:
+●After obtaining your explicit consent;
+● According to the requirements of laws and regulations, we need to disclose your personal information;
+●In order to protect our legitimate rights and interests, we may need to disclose your personal information;
+●In order to protect the personal and property safety of you or other users, we may need to disclose your personal information.
+●Content security review using third-party services
+●If you have requested a refund, we will send your paid plan usage to the Apple team
+4. Information protection
+We take reasonable security measures to protect your personal information, but we are not responsible for any information leakage caused by force majeure or not caused by us.
+5. Special instructions
+At present, in addition to being processed by the AI server, the information you send to AI will also use third-party services for content security review in accordance with national laws and regulations, such as the Tencent content security review interface. In addition, we will strictly protect your information security.
+In particular, please protect your privacy, do not send personal privacy data such as account passwords, identity information, and do not send content that violates laws, regulations, or social ethics.
+6. Other
+This Privacy Agreement becomes effective on the date of your acceptance and is binding on us and users.
+If we make any changes to this privacy agreement, we will post the changed agreement on this app. Your continued use of the app constitutes your agreement to be bound by the changed agreement. If you do not agree to the changed agreement, you should stop using this app immediately.
+For matters not covered in this Privacy Agreement, you shall abide by other terms of service and operating rules that we publish from time to time.
+
+
+
+"""
+      .obs;
+  set title(value) => _title.value = value;
+  get title => _title.value;
+}

lib/pages/privacy/view.dart

+import 'package:chart/common/values/values.dart';
+import 'package:chart/common/widgets/widgets.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
+import 'package:glassmorphism/glassmorphism.dart';
+
+import 'index.dart';
+import 'widgets/widgets.dart';
+
+class PrivacyPage extends GetView<PrivacyController> {
+  const PrivacyPage({Key? key}) : super(key: key);
+
+  // 主视图
+  Widget _buildView() {
+    return GlassmorphicContainer(
+        height: double.infinity,
+        width: double.infinity,
+        // flex: 1,
+        borderRadius: 16,
+        margin: EdgeInsets.symmetric(horizontal: 16, vertical: 16),
+        blur: 14,
+        alignment: Alignment.bottomCenter,
+        border: 2,
+        linearGradient: LinearGradient(
+          begin: Alignment.topLeft,
+          end: Alignment.bottomRight,
+          colors: [
+            Color(0xFF0FFFF).withOpacity(0.2),
+            Color(0xFF0FFFF).withOpacity(0.2),
+          ],
+        ),
+        child: const HelloWidget(),
+        // margin: EdgeInsets.only(bottom: 16.h),
+        borderGradient: LinearGradient(
+          begin: Alignment.topLeft,
+          end: Alignment.bottomRight,
+          colors: [
+            Color(0xFF0FFFF).withOpacity(1),
+            Color(0xFFFFFFF),
+            Color(0xFF0FFFF).withOpacity(1),
+          ],
+        ));
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return GetBuilder<PrivacyController>(
+      builder: (_) {
+        return Scaffold(
+          appBar: transparentAppBar(
+              leading: IconButton(
+                tooltip: '返回上一页',
+                icon: const Icon(
+                  Icons.arrow_back,
+                  color: AppColors.primaryElementText,
+                ),
+                onPressed: () async {
+                  // Get.back();
+                  // Get.offAll(ApplicationPage());
+                  // await Get.off(ApplicationPage());
+                  // Get.toNamed(AppRoutes.Application);
+
+                  Get.back();
+                  // await Get.toNamed();
+                  // Navigator.of(context).pop();
+                  //_nextPage(-1);
+                },
+              ),
+              title: const Text(
+                "隐私协议",
+                style: TextStyle(color: Colors.white),
+              )),
+          body: Container(
+            height: double.infinity,
+            width: double.infinity,
+            decoration: BoxDecoration(
+              image: DecorationImage(
+                  image: Image.asset("assets/images/bg.png").image,
+                  fit: BoxFit.cover),
+            ),
+            child: _buildView(),
+          ),
+        );
+      },
+    );
+  }
+}

lib/pages/privacy/widgets/hello.dart

+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
+
+import '../index.dart';
+
+/// hello
+class HelloWidget extends GetView<PrivacyController> {
+  const HelloWidget({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+      child: Obx(() => ListView(
+            padding: EdgeInsets.all(16),
+            children: [
+              Text(
+                controller.state.title,
+                style: TextStyle(
+                    fontFamily: 'Montserrat',
+                    fontSize: 18,
+                    color: Colors.white),
+              )
+            ],
+          )),
+    );
+  }
+}

lib/pages/privacy/widgets/widgets.dart

+library widgets;
+
+export './hello.dart';

lib/pages/template/view.dart

@@ -2,8 +2,6 @@ import 'package:chart/common/values/values.dart';
 import 'package:chart/common/widgets/widgets.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:get/get_connect/sockets/src/socket_notifier.dart';
-import 'package:glassmorphism/glassmorphism.dart';
 
 import 'index.dart';
 import 'widgets/widgets.dart';

lib/pages/template/widgets/hello.dart

@@ -44,7 +44,9 @@ class HelloWidget extends GetView<TemplateController> {
                         // width: 100,
                         // height: 100,
                         // color: Colors.amber,
-                        child: GlassmorphicFlexContainer(
+                        child: GlassmorphicContainer(
+                            height: 120,
+                            width: 120,
                             borderRadius: 16,
                             // ignore: sort_child_properties_last
                             child: InkWell(
@@ -72,7 +74,8 @@ class HelloWidget extends GetView<TemplateController> {
                                         "firstValue": firstValue,
                                         "firstLabel": firstLabel,
                                         "lastValue": lastValue,
-                                        "lastLabel": lastLabel
+                                        "lastLabel": lastLabel,
+                                        "detailId": "${act.id}"
                                       });
                                   Future.delayed(Duration(milliseconds: 100),
                                       () {

lib/pages/user_privacy/bindings.dart

+import 'package:get/get.dart';
+
+import 'controller.dart';
+
+class UserPrivacyBinding implements Bindings {
+  @override
+  void dependencies() {
+    Get.lazyPut<UserPrivacyController>(() => UserPrivacyController());
+  }
+}

lib/pages/user_privacy/controller.dart

+import 'package:get/get.dart';
+
+import 'index.dart';
+
+class UserPrivacyController extends GetxController {
+  UserPrivacyController();
+
+  final state = UserPrivacyState();
+
+  // tap
+  void handleTap(int index) {
+    Get.snackbar(
+      "标题",
+      "消息",
+    );
+  }
+
+  /// 在 widget 内存中分配后立即调用。
+  @override
+  void onInit() {
+    super.onInit();
+  }
+
+  /// 在 onInit() 之后调用 1 帧。这是进入的理想场所
+  @override
+  void onReady() {
+    super.onReady();
+  }
+
+  /// 在 [onDelete] 方法之前调用。
+  @override
+  void onClose() {
+    super.onClose();
+  }
+
+  /// dispose 释放内存
+  @override
+  void dispose() {
+    super.dispose();
+  }
+}

lib/pages/user_privacy/index.dart

+library user_privacy;
+
+export './state.dart';
+export './controller.dart';
+export './bindings.dart';
+export './view.dart';

lib/pages/user_privacy/state.dart

+import 'package:get/get.dart';
+
+class UserPrivacyState {
+  final _title = """
+本协议是您（下文称为“用户”）与本 app 的所有者（下文称为“我们”）之间关于您使用本 app 所订立的协议。本协议描述了用户使用本 app 的权利和义务。使用本 app 即表示您同意接受本协议的所有条款。如果您不同意本协议的任何条款，请勿使用本 app。
+1.用户账户
+为了使用本 app 的所有功能，用户需要注册一个账户并输入正确的信息。用户应当对自己的账户和密码保密，并对其帐户下的所有活动负责。如果用户发现任何未经授权使用其账户的情况，应立即通知我们。
+2.用户内容
+本 app 允许用户存储和发送问题记录到 AI 服务器。用户应当对自己存储和发送的内容负责，并保证其不违反任何法律、法规或本协议。
+3.使用规则
+用户在使用本 app 时，应遵守以下规则：
+●不得发布、传播任何违法、淫秽、色情、赌博、暴力、恐怖或者教唆犯罪的内容；
+●不得发布、传播任何侵犯他人知识产权或其它合法权益的内容；
+●不得发布、传播任何误导、欺骗、虚假信息或者进行任何不诚实的行为；
+●不得发布、传播任何政治宣传或者进行任何政治活动；
+●不得进行任何危害网络安全的行为，包括但不限于：恶意攻击、恶意破坏、恶意干扰等；
+●不得进行任何影响本 app 正常运行的行为，包括但不限于：非法使用本 app 的资源、恶意注册、恶意请求等；
+如果用户违反了上述规则，我们有权立即终止本协议并禁止用户使用本 app。
+4.知识产权
+本 app 包含的所有内容，包括但不限于文字、图片、音频、视频、软件、代码、商标、商业信息等，均受著作权、商标权、专利权及其它知识产权法律的保护。未经我们书面同意，用户不得使用、复制、修改、拷贝、发布、出售、出租、传播本 app 的任何内容。
+5.AI 服务器回答内容责任
+本 app 的 AI 服务器会根据用户的问题进行回答，但用户需要自行判断回答的内容的正确性和可靠性，并自行承担使用回答内容的风险。我们不对回答内容的准确性、可靠性、完整性、有效性、及时性、适用性等作出任何保证或承诺。
+6.隐私保护
+我们尊重用户的隐私权，并承诺在使用用户的个人信息时遵守相关法律法规。我们将采取合理的安全措施来保护用户的个人信息，但不对因不可抗力或非因我们的原因导致的信息泄露承担责任。
+7.免责声明
+本 app 提供的信息和服务仅供参考，不构成任何担保或承诺。我们不保证本 app 的信息和服务的准确性、可靠性、完整性、有效性、及时性、适用性。用户使用本 app 的信息和服务所产生的风险由用户自行承担。
+8.变更和终止
+我们有权随时变更本协议的任何条款，并将变更后的协议在本 app 上公布。如果用户继续使用本 app，即表示用户同意受变更后的协议的约束。如果用户不同意变更后的协议，应当立即停止使用本 app。
+我们有权在任何时候终止本协议，并无需事先通知用户。在协议终止后，用户无权继续使用本 app。
+9.适用法律
+本协议的订立、执行、解释及争议的解决均适用中华人民共和国法律。如发生本协议与中华人民共和国法律相抵触时，应当以中华人民共和国法律的明文规定为准。
+如双方就本协议内容或执行发生任何争议，双方应尽力友好协商解决；协商不成时，任何一方均可向本 app 所在地的人民法院提起诉讼。
+10.其他
+本协议构成双方对本协议之约定事项及其他有关事宜的完整协议，除本协议规定的之外，未赋予本协议各方其他权利。
+如本协议中的任何条款无论因何种原因完全或部分无效或不具有执行力，本协议的其余条款仍应有效并且有约束力。
+本协议中的标题仅供方便参阅，不具有实际意义，不能作为本协议涵义解释的依据。
+本协议未尽事宜，您需遵守我们不时发布的其他服务条款和操作规则。
+本协议自您接受之日起生效，对我们和用户均具有约束力。
+"""
+      .obs;
+
+  set title(value) => _title.value = value;
+  get title => _title.value;
+}

lib/pages/user_privacy/view.dart

+import 'package:chart/common/values/values.dart';
+import 'package:chart/common/widgets/widgets.dart';
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:glassmorphism/glassmorphism.dart';
+
+import 'index.dart';
+import 'widgets/widgets.dart';
+
+class UserPrivacyPage extends GetView<UserPrivacyController> {
+  const UserPrivacyPage({Key? key}) : super(key: key);
+
+  // 主视图
+  Widget _buildView() {
+    return GlassmorphicContainer(
+        height: double.infinity,
+        width: double.infinity,
+        // flex: 1,
+        borderRadius: 16,
+        margin: EdgeInsets.symmetric(horizontal: 16, vertical: 16),
+        blur: 14,
+        alignment: Alignment.bottomCenter,
+        border: 2,
+        linearGradient: LinearGradient(
+          begin: Alignment.topLeft,
+          end: Alignment.bottomRight,
+          colors: [
+            Color(0xFF0FFFF).withOpacity(0.2),
+            Color(0xFF0FFFF).withOpacity(0.2),
+          ],
+        ),
+        child: const HelloWidget(),
+        // margin: EdgeInsets.only(bottom: 16.h),
+        borderGradient: LinearGradient(
+          begin: Alignment.topLeft,
+          end: Alignment.bottomRight,
+          colors: [
+            Color(0xFF0FFFF).withOpacity(1),
+            Color(0xFFFFFFF),
+            Color(0xFF0FFFF).withOpacity(1),
+          ],
+        ));
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return GetBuilder<UserPrivacyController>(
+      builder: (_) {
+        return Scaffold(
+            appBar: transparentAppBar(
+                leading: IconButton(
+                  tooltip: '返回上一页',
+                  icon: const Icon(
+                    Icons.arrow_back,
+                    color: AppColors.primaryElementText,
+                  ),
+                  onPressed: () async {
+                    // Get.back();
+                    // Get.offAll(ApplicationPage());
+                    // await Get.off(ApplicationPage());
+                    // Get.toNamed(AppRoutes.Application);
+
+                    Get.back();
+                    // await Get.toNamed();
+                    // Navigator.of(context).pop();
+                    //_nextPage(-1);
+                  },
+                ),
+                title: const Text(
+                  "用户协议",
+                  style: TextStyle(color: Colors.white),
+                )),
+            body: Container(
+              height: double.infinity,
+              width: double.infinity,
+              decoration: BoxDecoration(
+                image: DecorationImage(
+                    image: Image.asset("assets/images/bg.png").image,
+                    fit: BoxFit.cover),
+              ),
+              child: _buildView(),
+            ));
+      },
+    );
+  }
+}

lib/pages/user_privacy/widgets/hello.dart

+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
+
+import '../index.dart';
+
+/// hello
+class HelloWidget extends GetView<UserPrivacyController> {
+  const HelloWidget({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+      child: Obx(() => ListView(
+            padding: EdgeInsets.symmetric(horizontal: 16, vertical: 16),
+            children: [
+              Text(
+                controller.state.title,
+                style: TextStyle(
+                    fontFamily: 'Montserrat',
+                    fontSize: 18,
+                    color: Colors.white),
+              )
+            ],
+          )),
+    );
+  }
+}

lib/pages/user_privacy/widgets/widgets.dart

+library widgets;
+
+export './hello.dart';

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -12,6 +12,7 @@ import package_info
 import path_provider_foundation
 import share_plus
 import shared_preferences_foundation
+import sign_in_with_apple
 import smart_auth
 import sqflite
 import url_launcher_macos
@@ -24,6 +25,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
+  SignInWithApplePlugin.register(with: registry.registrar(forPlugin: "SignInWithApplePlugin"))
   SmartAuthPlugin.register(with: registry.registrar(forPlugin: "SmartAuthPlugin"))
   SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))
   UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))

pubspec.lock

@@ -506,6 +506,13 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_vibrate:
+    dependency: "direct main"
+    description:
+      name: flutter_vibrate
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.3.0"
   flutter_web_plugins:
     dependency: transitive
     description: flutter
@@ -973,6 +980,27 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.3"
+  sign_in_with_apple:
+    dependency: "direct main"
+    description:
+      name: sign_in_with_apple
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "4.3.0"
+  sign_in_with_apple_platform_interface:
+    dependency: transitive
+    description:
+      name: sign_in_with_apple_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.0"
+  sign_in_with_apple_web:
+    dependency: transitive
+    description:
+      name: sign_in_with_apple_web
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.1"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -992,6 +1020,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.0+2"
+  social_login_buttons:
+    dependency: "direct main"
+    description:
+      name: social_login_buttons
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.7"
   source_span:
     dependency: transitive
     description:

pubspec.yaml

@@ -107,6 +107,9 @@ dependencies:
   flutter_staggered_animations: ^1.1.1
   vibration: ^1.7.6
   gradient_borders: ^1.0.0
+  sign_in_with_apple: ^4.3.0
+  flutter_vibrate: ^1.3.0
+  social_login_buttons: ^1.0.7
   # package:bubble/bubble.dart
 
 dev_dependencies: