Merge remote-tracking branch 'origin/dev'

* origin/dev: (36 commits)
  update version
  feat: 用户搜索改为后端过滤去重
  feat: 用户搜索增加去重逻辑
  fix: 修复语音欢迎语播放异常的问题
  fix: 修复欢迎语解析异常的问题
  feat: adjust 的 deviceId 与应用的 deviceId 保持一致？
  feat: 调整 UIScrollView 嵌套滚动逻辑处理
  feat: 修改陪玩师过滤价格文案
  fix: 修复潜在用户没展示在线状态的问题，调整潜在用户的协议逻辑
  fix: 修复欢迎语审核界面点击返回会回到首页的问题
  fix: 修复欢迎语被拒绝后 UI 展示异常的问题
  feat: 补充 技能详情 倒计时逻辑
  feat: 替换文案
  feat: 补充 IM 文本消息长按复制的能力
  fix: 修复欢迎语创建后状态不对的问题？
  feat: 补充订单列表头像点击跳转逻辑
  fix: 修复欢迎语序号不对的问题
  fix: 修复欢迎语协议错误的问题
  feat: 替换 Join Us 文案
  feat: 补充请求失败的多语言文案
  ...

Lanu.xcodeproj/project.pbxproj

@@ -47,6 +47,8 @@
 				"Common/Extension/DispatchQueue+Extension.swift",
 				"Common/Extension/Double+Extension.swift",
 				"Common/Extension/Int+Extension.swift",
+				Common/Extension/LNMediaFileUtils.swift,
+				Common/Extension/LNPermissionHelper.swift,
 				"Common/Extension/NSObject+Extension.swift",
 				"Common/Extension/String+Extension.swift",
 				"Common/Extension/TimeInterval+Extension.swift",
@@ -59,7 +61,7 @@
 				"Common/Extension/UIView+Extension.swift",
 				"Common/Extension/URL+Extension.swift",
 				Common/Keyboard/LNKeyboardManager.swift,
-				Common/LNPhotosPicker.swift,
+				Common/LNMediaPicker.swift,
 				Common/Logger/LNLogger.swift,
 				Common/Logger/LNLoggerFormater.swift,
 				Common/Storage/LNUserDefaults.swift,
@@ -80,11 +82,15 @@
 				Common/Views/LNCircleProgressView.swift,
 				Common/Views/LNCountrySelectPanel.swift,
 				Common/Views/LNGenderView.swift,
+				Common/Views/LNNestedScrollView.swift,
 				Common/Views/LNOnlineView.swift,
 				Common/Views/LNPopupView.swift,
 				Common/Views/LNSortedEditView.swift,
 				Common/Views/LNTextField.swift,
 				Common/Views/LNVideoPlayerView.swift,
+				Common/Views/LNVoiceEditView.swift,
+				Common/Views/LNVoicePlayer.swift,
+				Common/Views/LNVoicePlayView.swift,
 				Common/Views/LNVoiceWaveView.swift,
 				Common/Views/Loading/LNLoadingView.swift,
 				Common/Views/Menu/LNBottomSheetMenu.swift,
@@ -104,7 +110,6 @@
 				Common/Views/VideoPreview/LNVideoPreviewController.swift,
 				Common/Views/VideoUpload/LNVideoCompressor.swift,
 				Common/Views/VideoUpload/LNVideoUploadView.swift,
-				Common/Voice/LNVoicePlayer.swift,
 				Common/Voice/LNVoiceRecorder.swift,
 				Common/Voice/LNVoiceResourceManager.swift,
 				Common/Wrapper/LNVisitedTimeWrapper.swift,
@@ -169,6 +174,7 @@
 				Manager/Relation/Network/LNRelationResponse.swift,
 				Manager/Report/LNReportManager.swift,
 				"Manager/Report/Network/LNHttpManager+Report.swift",
+				Manager/Room/LNRoomManager.swift,
 				Manager/Statistic/LNStatisticManager.swift,
 				"Manager/Statistic/Network/LNHttpManager+Statistic.swift",
 				Manager/Statistic/Network/LNStatisticResponse.swift,
@@ -196,8 +202,12 @@
 				Views/Game/MateList/LNGameMateListMenuView.swift,
 				Views/Game/MateList/LNGameMateListView.swift,
 				Views/Game/MateList/LNGameMateListViewController.swift,
+				Views/Game/OrderCenter/AutoReply/Edit/LNAutoReplyEditViewController.swift,
+				Views/Game/OrderCenter/AutoReply/List/LNAutoReplyItemCell.swift,
+				Views/Game/OrderCenter/AutoReply/List/LNAutoReplyListViewController.swift,
 				Views/Game/OrderCenter/LNGameMateCenterViewController.swift,
 				Views/Game/OrderCenter/LNOrderAcceptSettingsViewController.swift,
+				Views/Game/OrderCenter/LNPotentialUserViewController.swift,
 				Views/Game/OrderCenter/Skill/LNSkillCreateViewController.swift,
 				Views/Game/OrderCenter/Skill/LNSkillEditViewController.swift,
 				Views/Game/OrderCenter/Skill/LNSkillFieldsEditView.swift,
@@ -277,6 +287,7 @@
 				Views/Order/Detail/LNOrderDetailViewController.swift,
 				Views/Order/Detail/LNOrderRefundInfoView.swift,
 				"Views/Order/LNCommonAlertView+Order.swift",
+				Views/Order/LNNewbieDiscountView.swift,
 				Views/Order/LNOrderCommentPanel.swift,
 				Views/Order/OrderList/LNOrderListItemCell.swift,
 				Views/Order/OrderList/LNOrderListViewController.swift,
@@ -336,6 +347,9 @@
 				Views/Profile/Relation/LNUserRelationListView.swift,
 				Views/Profile/Relation/LNUserRelationViewController.swift,
 				Views/Report/LNReportViewController.swift,
+				Views/Room/LNCreateRoomPanel.swift,
+				Views/Room/LNRoomNameInputPanel.swift,
+				Views/Room/ViewModel/LNRoomViewModel.swift,
 				Views/Search/LNUserSearchHistoryView.swift,
 				Views/Search/LNUserSearchItemCell.swift,
 				Views/Search/LNUserSearchViewController.swift,
@@ -599,7 +613,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Lanu/Lanu.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 36;
+				CURRENT_PROJECT_VERSION = 37;
 				DEVELOPMENT_TEAM = 5H8D98R72W;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -620,7 +634,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.3.0;
+				MARKETING_VERSION = 1.4.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jiehe.gami;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				STRING_CATALOG_GENERATE_SYMBOLS = YES;
@@ -648,7 +662,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Lanu/Lanu.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 36;
+				CURRENT_PROJECT_VERSION = 37;
 				DEVELOPMENT_TEAM = 5H8D98R72W;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -669,7 +683,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.3.0;
+				MARKETING_VERSION = 1.4.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jiehe.gami;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				STRING_CATALOG_GENERATE_SYMBOLS = YES;

Lanu/AppDelegate.swift

@@ -30,6 +30,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         _ = LNDeeplinkManager.shared
         _ = LNKeyboardManager.shared
         _ = LNConfigManager.shared
+        _ = LNOrderManager.shared
         
         LNEventDeliver.notifyAppLaunchFinished()
         
@@ -120,27 +121,24 @@ extension AppDelegate {
         }
         let config = ADJConfig(appToken: token, environment: env)
         config?.logLevel = logLevel
+        config?.externalDeviceId = curDeviceId
         config?.enableCostDataInAttribution()
 //        config?.delegate = self
         Adjust.initSdk(config)
     }
     
     private func requestNotificationPermissions() {
-        let center = UNUserNotificationCenter.current()
-        
         // 请求通知权限（可根据需求调整，如添加 sound/badge 等）
-        center.requestAuthorization(options: [.alert, .sound, .badge]) { granted, error in
+        LNPermissionHelper.requestNotificationAuthorization(options: [.alert, .sound, .badge]) { granted, error in
             if let error = error {
                 Log.e("请求推送权限失败: \(error.localizedDescription)")
                 return
             }
-            
+
             if granted {
                 Log.i("用户已授予推送权限")
                 // 权限获取成功后，注册远程推送
-                DispatchQueue.main.async {
-                    UIApplication.shared.registerForRemoteNotifications()
-                }
+                UIApplication.shared.registerForRemoteNotifications()
             } else {
                 Log.i("用户拒绝了推送权限")
             }

Lanu/Assets.xcassets/Room/ic_room_create.imageset/Contents.json

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