音萌企业包2.1.5发版

Podfile

@@ -24,8 +24,7 @@ target 'xplan-ios' do
 	pod 'SZTextView'
 	#轮播图
 	pod 'SDCycleScrollView'
-	#上传图片
-	pod 'Qiniu'
+	
 	#内购
 	pod 'IAPHelper'
 	#持久化存储
@@ -72,6 +71,7 @@ target 'xplan-ios' do
 	pod 'WechatOpenSDK'
 	#调试
 	pod 'LookinServer', :configurations => ['Debug']
+        pod 'QCloudCOSXML'
 	
 end
 post_install do |installer|

Podfile.lock

@@ -14,92 +14,98 @@ PODS:
   - AFNetworking/Serialization (4.0.1)
   - AFNetworking/UIKit (4.0.1):
     - AFNetworking/NSURLSession
-  - AgoraRtcEngine_iOS (4.2.2):
-    - AgoraRtcEngine_iOS/AIAEC (= 4.2.2)
-    - AgoraRtcEngine_iOS/AINS (= 4.2.2)
-    - AgoraRtcEngine_iOS/AudioBeauty (= 4.2.2)
-    - AgoraRtcEngine_iOS/ClearVision (= 4.2.2)
-    - AgoraRtcEngine_iOS/ContentInspect (= 4.2.2)
-    - AgoraRtcEngine_iOS/DRM (= 4.2.2)
-    - AgoraRtcEngine_iOS/FaceDetection (= 4.2.2)
-    - AgoraRtcEngine_iOS/ReplayKit (= 4.2.2)
-    - AgoraRtcEngine_iOS/RtcBasic (= 4.2.2)
-    - AgoraRtcEngine_iOS/SpatialAudio (= 4.2.2)
-    - AgoraRtcEngine_iOS/VideoCodecDec (= 4.2.2)
-    - AgoraRtcEngine_iOS/VideoCodecEnc (= 4.2.2)
-    - AgoraRtcEngine_iOS/VirtualBackground (= 4.2.2)
-    - AgoraRtcEngine_iOS/VQA (= 4.2.2)
-  - AgoraRtcEngine_iOS/AIAEC (4.2.2)
-  - AgoraRtcEngine_iOS/AINS (4.2.2)
-  - AgoraRtcEngine_iOS/AudioBeauty (4.2.2)
-  - AgoraRtcEngine_iOS/ClearVision (4.2.2)
-  - AgoraRtcEngine_iOS/ContentInspect (4.2.2)
-  - AgoraRtcEngine_iOS/DRM (4.2.2)
-  - AgoraRtcEngine_iOS/FaceDetection (4.2.2)
-  - AgoraRtcEngine_iOS/ReplayKit (4.2.2)
-  - AgoraRtcEngine_iOS/RtcBasic (4.2.2)
-  - AgoraRtcEngine_iOS/SpatialAudio (4.2.2)
-  - AgoraRtcEngine_iOS/VideoCodecDec (4.2.2)
-  - AgoraRtcEngine_iOS/VideoCodecEnc (4.2.2)
-  - AgoraRtcEngine_iOS/VirtualBackground (4.2.2)
-  - AgoraRtcEngine_iOS/VQA (4.2.2)
-  - AlipaySDK-iOS (15.8.11)
+  - AgoraRtcEngine_iOS (4.2.6):
+    - AgoraRtcEngine_iOS/AIAEC (= 4.2.6)
+    - AgoraRtcEngine_iOS/AINS (= 4.2.6)
+    - AgoraRtcEngine_iOS/AudioBeauty (= 4.2.6)
+    - AgoraRtcEngine_iOS/ClearVision (= 4.2.6)
+    - AgoraRtcEngine_iOS/ContentInspect (= 4.2.6)
+    - AgoraRtcEngine_iOS/DRM (= 4.2.6)
+    - AgoraRtcEngine_iOS/FaceDetection (= 4.2.6)
+    - AgoraRtcEngine_iOS/ReplayKit (= 4.2.6)
+    - AgoraRtcEngine_iOS/RtcBasic (= 4.2.6)
+    - AgoraRtcEngine_iOS/SpatialAudio (= 4.2.6)
+    - AgoraRtcEngine_iOS/VideoCodecDec (= 4.2.6)
+    - AgoraRtcEngine_iOS/VideoCodecEnc (= 4.2.6)
+    - AgoraRtcEngine_iOS/VirtualBackground (= 4.2.6)
+    - AgoraRtcEngine_iOS/VQA (= 4.2.6)
+  - AgoraRtcEngine_iOS/AIAEC (4.2.6)
+  - AgoraRtcEngine_iOS/AINS (4.2.6)
+  - AgoraRtcEngine_iOS/AudioBeauty (4.2.6)
+  - AgoraRtcEngine_iOS/ClearVision (4.2.6)
+  - AgoraRtcEngine_iOS/ContentInspect (4.2.6)
+  - AgoraRtcEngine_iOS/DRM (4.2.6)
+  - AgoraRtcEngine_iOS/FaceDetection (4.2.6)
+  - AgoraRtcEngine_iOS/ReplayKit (4.2.6)
+  - AgoraRtcEngine_iOS/RtcBasic (4.2.6)
+  - AgoraRtcEngine_iOS/SpatialAudio (4.2.6)
+  - AgoraRtcEngine_iOS/VideoCodecDec (4.2.6)
+  - AgoraRtcEngine_iOS/VideoCodecEnc (4.2.6)
+  - AgoraRtcEngine_iOS/VirtualBackground (4.2.6)
+  - AgoraRtcEngine_iOS/VQA (4.2.6)
+  - AlipaySDK-iOS (15.8.16)
   - Base64 (1.1.2)
   - Bugly (2.5.93)
   - CocoaAsyncSocket (7.6.5)
   - FFPopup (1.1.5)
   - FLAnimatedImage (1.0.17)
-  - HappyDNS (0.3.17)
   - IAPHelper (1.1)
-  - IQKeyboardManager (6.5.9)
-  - JXCategoryView (1.5.9)
+  - IQKeyboardManager (6.5.17)
+  - JXCategoryView (1.6.1)
   - JXPagingView/Pager (2.1.2)
   - LinkedME_LinkPage (1.5.5.4)
-  - LookinServer (1.0.4)
+  - LookinServer (1.2.6):
+    - LookinServer/Core (= 1.2.6)
+  - LookinServer/Core (1.2.6)
   - MarqueeLabel-ObjC (3.3.0)
   - Masonry (1.1.0)
   - MBProgressHUD (1.2.0)
-  - MJExtension (3.3.0)
-  - MJRefresh (3.7.3)
-  - mob_sharesdk (4.4.13):
-    - mob_sharesdk/ShareSDK (= 4.4.13)
+  - MJExtension (3.4.1)
+  - MJRefresh (3.7.6)
+  - mob_sharesdk (4.4.23):
+    - mob_sharesdk/ShareSDK (= 4.4.23)
     - MOBFoundation (>= 3.2.9)
-  - mob_sharesdk/ShareSDK (4.4.13):
+  - mob_sharesdk/ShareSDK (4.4.23):
     - MOBFoundation (>= 3.2.9)
-  - mob_sharesdk/ShareSDKExtension (4.4.13):
+  - mob_sharesdk/ShareSDKExtension (4.4.23):
     - mob_sharesdk/ShareSDK
     - MOBFoundation (>= 3.2.9)
-  - mob_sharesdk/ShareSDKPlatforms/Apple (4.4.13):
+  - mob_sharesdk/ShareSDKPlatforms/Apple (4.4.23):
     - mob_sharesdk/ShareSDK
     - MOBFoundation (>= 3.2.9)
-  - mob_sharesdk/ShareSDKPlatforms/QQ (4.4.13):
+  - mob_sharesdk/ShareSDKPlatforms/QQ (4.4.23):
     - mob_sharesdk/ShareSDK
     - MOBFoundation (>= 3.2.9)
-  - mob_sharesdk/ShareSDKPlatforms/WeChat_Lite (4.4.13):
+  - mob_sharesdk/ShareSDKPlatforms/WeChat_Lite (4.4.23):
     - mob_sharesdk/ShareSDK
     - MOBFoundation (>= 3.2.9)
-  - MOBFoundation (3.2.48)
-  - NIMSDK_LITE (8.9.110)
-  - NTESBaseComponent (1.4)
-  - NTESQuickPass (3.2.6):
+  - MOBFoundation (3.2.63)
+  - NIMSDK_LITE (8.9.124)
+  - NTESBaseComponent (1.8)
+  - NTESQuickPass (3.4.9):
     - NTESBaseComponent
   - pop (1.0.12)
-  - Protobuf (3.19.1)
-  - QGVAPlayer (1.0.15)
-  - Qiniu (8.3.2):
-    - HappyDNS (~> 0.3.17)
+  - Protobuf (3.25.3)
+  - QCloudCore/Default (6.3.5):
+    - QCloudTrack/Beacon (= 6.3.5)
+  - QCloudCOSXML (6.3.5):
+    - QCloudCOSXML/Default (= 6.3.5)
+  - QCloudCOSXML/Default (6.3.5):
+    - QCloudCore/Default (= 6.3.5)
+  - QCloudTrack/Beacon (6.3.5)
+  - QGVAPlayer (1.0.19)
   - QY_NIM_iOS_SDK (6.6.1)
   - ReactiveObjC (3.1.1)
   - SDCycleScrollView (1.82):
     - SDWebImage (>= 5.0.0)
-  - SDWebImage (5.11.1):
-    - SDWebImage/Core (= 5.11.1)
-  - SDWebImage/Core (5.11.1)
+  - SDWebImage (5.19.0):
+    - SDWebImage/Core (= 5.19.0)
+  - SDWebImage/Core (5.19.0)
   - SDWebImageFLPlugin (0.6.0):
     - FLAnimatedImage (>= 1.0.11)
     - SDWebImage/Core (~> 5.10)
   - SSKeychain (1.4.1)
-  - SSZipArchive (2.4.2)
+  - SSZipArchive (2.4.3)
   - SVGAPlayer (2.5.7):
     - SVGAPlayer/Core (= 2.5.7)
     - SVGAPlayer/ProtoFiles (= 2.5.7)
@@ -109,13 +115,17 @@ PODS:
   - SVGAPlayer/ProtoFiles (2.5.7):
     - Protobuf (~> 3.4)
   - SZTextView (1.3.0)
-  - TXLiteAVSDK_TRTC (11.4.14530):
-    - TXLiteAVSDK_TRTC/TRTC (= 11.4.14530)
-  - TXLiteAVSDK_TRTC/TRTC (11.4.14530)
-  - TZImagePickerController (3.8.1)
-  - UMCommon (7.3.5):
+  - TXLiteAVSDK_TRTC (11.4.14571):
+    - TXLiteAVSDK_TRTC/TRTC (= 11.4.14571)
+  - TXLiteAVSDK_TRTC/TRTC (11.4.14571)
+  - TZImagePickerController (3.8.4):
+    - TZImagePickerController/Basic (= 3.8.4)
+    - TZImagePickerController/Location (= 3.8.4)
+  - TZImagePickerController/Basic (3.8.4)
+  - TZImagePickerController/Location (3.8.4)
+  - UMCommon (7.4.5):
     - UMDevice
-  - UMDevice (2.0.5)
+  - UMDevice (3.3.0)
   - WechatOpenSDK (2.0.2)
   - YYCache (1.0.4)
   - YYImage (1.0.4):
@@ -154,8 +164,8 @@ DEPENDENCIES:
   - NIMSDK_LITE (~> 8.9.0)
   - NTESQuickPass
   - pop (~> 1.0.12)
+  - QCloudCOSXML
   - QGVAPlayer
-  - Qiniu
   - QY_NIM_iOS_SDK (~> 6.6.1)
   - ReactiveObjC
   - SDCycleScrollView
@@ -182,7 +192,6 @@ SPEC REPOS:
     - CocoaAsyncSocket
     - FFPopup
     - FLAnimatedImage
-    - HappyDNS
     - IAPHelper
     - IQKeyboardManager
     - JXCategoryView
@@ -201,8 +210,10 @@ SPEC REPOS:
     - NTESQuickPass
     - pop
     - Protobuf
+    - QCloudCore
+    - QCloudCOSXML
+    - QCloudTrack
     - QGVAPlayer
-    - Qiniu
     - QY_NIM_iOS_SDK
     - ReactiveObjC
     - SDCycleScrollView
@@ -224,53 +235,54 @@ SPEC REPOS:
 
 SPEC CHECKSUMS:
   AFNetworking: 3bd23d814e976cd148d7d44c3ab78017b744cd58
-  AgoraRtcEngine_iOS: c510de329cd905daff3f01fa4c872ea6d5eaee23
-  AlipaySDK-iOS: a07b6eafa847a5b29acb6c150ea16d9792d5d167
+  AgoraRtcEngine_iOS: ac647332ad8f86d79cf810601c9e62b28c3a4de0
+  AlipaySDK-iOS: 5e6011fbd546e7db6b43c1f527d164ee63f3d7cb
   Base64: cecfb41a004124895a7bcee567a89bae5a89d49b
   Bugly: b8715e6ec4004b7f7fbffab0643ba80545aee3da
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   FFPopup: a208dcee8db3e54ec4a88fcd6481f6f5d85b7a83
   FLAnimatedImage: bbf914596368867157cc71b38a8ec834b3eeb32b
-  HappyDNS: 848ef73e24f2b0e2752064223ce2dc0dd88900ea
   IAPHelper: fd74f53b0ac142eed085777b88b86a11746a2dd4
-  IQKeyboardManager: 241cc94ccabc9deb8f8bd7d12f00d73288d13ecc
-  JXCategoryView: 2ef9ecfd3735158d009ce02d1f29811aa822da65
+  IQKeyboardManager: 904d013844bbae0abe073f015487bfebe5476335
+  JXCategoryView: 7b1ee69ede4843c581688afe84d0f047723262f2
   JXPagingView: 90924b364a2ff7e94db534fad1fa50925ff69ee4
   LinkedME_LinkPage: 0b443cec28582eb2d7e1c09987072e33e44083ec
-  LookinServer: 743c1681771d0a8dcc38825325a080c3186404a5
+  LookinServer: de929b55f8fa2e241c18c39af3f900eaa9166389
   MarqueeLabel-ObjC: 696eaa82e4fcc7fb53e4fdf37ac138f03bf022d6
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
   MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406
-  MJExtension: 01704cca2b60a214c10761b6491eab74069d68a9
-  MJRefresh: ec9c53ff4abf3a9237b4283862f1bd51c2ee3fdb
-  mob_sharesdk: e8efde8dc7a872064c197a0af13eb5d06a2b143c
-  MOBFoundation: 5135f9e8310989a32b5ed4f130c01f4d8abc011a
-  NIMSDK_LITE: 299ff39677d705b91413d14ad352b32a1b0e72fe
-  NTESBaseComponent: 9e97373eec7e5a26c39db26477bf99a37ee9e71a
-  NTESQuickPass: 781bd12ee63681389fe9b646c837fa76e3a00e6e
+  MJExtension: 21c5f6f8c4d5d8844b7ae8fbae08fed0b501f961
+  MJRefresh: 2fe7fb43a5167ceda20bb7e63f130c04fd1814a5
+  mob_sharesdk: 6081cd4584b581be65cdcb78ff82e8288f037f97
+  MOBFoundation: 0f932708bf9fa5c07aea37992554ca1b3af9e572
+  NIMSDK_LITE: 48b43ff18d3d9634d36304e8c647a46bb05bc974
+  NTESBaseComponent: 7b310e7e80bb6c27183176188b98356d200dbbc5
+  NTESQuickPass: 248f5efa21c51227c391c3ff5110cf3ad4d3809b
   pop: d582054913807fd11fd50bfe6a539d91c7e1a55a
-  Protobuf: 3724efa50cb2846d7ccebc8691c574e85fd74471
-  QGVAPlayer: 002673a02b4e50f9f53d0673b87168b540a300ae
-  Qiniu: 61f1e2fdfb35b37f98c8f03a718faf12652f9994
+  Protobuf: 8e9074797a13c484a79959fdb819ef4ae6da7dbe
+  QCloudCore: 9ba71f98027912b87bde80084e074d4e443769f5
+  QCloudCOSXML: e10fecf4f3bf55b56930162483c41c246237853f
+  QCloudTrack: a1e25308ead00d58db596b8564c7f197a8a06102
+  QGVAPlayer: a0bca68c9bd6f1c8de5ac2d10ddf98be6038cce9
   QY_NIM_iOS_SDK: 7fbf411c9c299f3b904fcc5b494542f41a11f70c
   ReactiveObjC: 011caa393aa0383245f2dcf9bf02e86b80b36040
   SDCycleScrollView: a0d74c3384caa72bdfc81470bdbc8c14b3e1fbcf
-  SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
+  SDWebImage: 981fd7e860af070920f249fd092420006014c3eb
   SDWebImageFLPlugin: 72efd2cfbf565bc438421abb426f4bcf7b670754
   SSKeychain: 55cc80f66f5c73da827e3077f02e43528897db41
-  SSZipArchive: e7b4f3d9e780c2acc1764cd88fbf2de28f26e5b2
+  SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef
   SVGAPlayer: 318b85a78b61292d6ae9dfcd651f3f0d1cdadd86
   SZTextView: 094dc6acc9beec537685c545d6e3e0d4975174e1
-  TXLiteAVSDK_TRTC: 72ff3c596f55555be2dd733291501eef5fae9ce5
-  TZImagePickerController: 943511626019431372cf908f24c114521e484f0e
-  UMCommon: ab4d875ddefe1b06c60b577e4a58bc4d433ee067
-  UMDevice: c13bbb2e8ca6c67d1e23e03162553e3ec5a8b5b0
+  TXLiteAVSDK_TRTC: 5be9b8b610608ad24525e88ac0c7ec5f146523d5
+  TZImagePickerController: f1c9f1cae6ac0e30b31aaa9698f9bf4a7cf5b84f
+  UMCommon: 28cd03c308341f687f5269abd26a82d66f01837f
+  UMDevice: f67106f8f1a8bc465ba20d376d896e178be66ba7
   WechatOpenSDK: e79349b37d44c015210f39fd6d2379f0ec60efe2
   YYCache: 8105b6638f5e849296c71f331ff83891a4942952
   YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54
   YYText: 5c461d709e24d55a182d1441c41dc639a18a4849
   YYWebImage: 5f7f36aee2ae293f016d418c7d6ba05c4863e928
 
-PODFILE CHECKSUM: 0f2e29ba8c875f839292918f612c6ec567ad4318
+PODFILE CHECKSUM: 3bd419f422e49acfd1c9500a9a45ab79466fa77a
 
 COCOAPODS: 1.12.1

xplan-ios.xcodeproj/project.pbxproj

@@ -131,6 +131,10 @@
 		18F404BB2760982000A6C548 /* ChatLimitModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 18F404BA2760982000A6C548 /* ChatLimitModel.m */; };
 		18F404C3276098F100A6C548 /* Api+Message.m in Sources */ = {isa = PBXBuildFile; fileRef = 18F404C2276098F100A6C548 /* Api+Message.m */; };
 		18F404C927609A4300A6C548 /* MessagePresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 18F404C827609A4300A6C548 /* MessagePresenter.m */; };
+		230017E72B6357F70034A86C /* MewUnlockGiftBroadcastView.m in Sources */ = {isa = PBXBuildFile; fileRef = 230017E62B6357F70034A86C /* MewUnlockGiftBroadcastView.m */; };
+		230017EA2B635A790034A86C /* MewUnlockGiftBroadcastViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 230017E92B635A790034A86C /* MewUnlockGiftBroadcastViewCell.m */; };
+		230017ED2B639C8D0034A86C /* MewUnlockGiftModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 230017EC2B639C8D0034A86C /* MewUnlockGiftModel.m */; };
+		230017F02B639E730034A86C /* MewUnlockBaseGiftModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 230017EF2B639E730034A86C /* MewUnlockBaseGiftModel.m */; };
 		230496ED2A6E1EE0006D1F0C /* XPPrivilegeCardVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 230496EC2A6E1EE0006D1F0C /* XPPrivilegeCardVC.m */; };
 		230496F02A6E1F1F006D1F0C /* XPPrivilegeCardPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 230496EF2A6E1F1F006D1F0C /* XPPrivilegeCardPresenter.m */; };
 		230496F32A6E229B006D1F0C /* XPPrivilegeCardItemVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 230496F22A6E229B006D1F0C /* XPPrivilegeCardItemVC.m */; };
@@ -184,6 +188,8 @@
 		231EBB5D2B358C4C006F782E /* MewMainHomeGameTabModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 231EBB5C2B358C4C006F782E /* MewMainHomeGameTabModel.m */; };
 		232153DD2AF381E400B2FBC0 /* MovEncodeToMpegTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 232153DC2AF381E400B2FBC0 /* MovEncodeToMpegTool.m */; };
 		232153E02AF394BF00B2FBC0 /* XPPrivilegeCardVideoItemModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 232153DF2AF394BF00B2FBC0 /* XPPrivilegeCardVideoItemModel.m */; };
+		23494A012B68DA4B00655D8A /* XPMineDataSkillCardCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 23494A002B68DA4B00655D8A /* XPMineDataSkillCardCollectionViewCell.m */; };
+		23494A042B68DCBC00655D8A /* XPMineDataGiftHeadCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 23494A032B68DCBC00655D8A /* XPMineDataGiftHeadCell.m */; };
 		236FF06C2AF8892400BEB6EC /* XPClientH5UresModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 236FF06B2AF8892400BEB6EC /* XPClientH5UresModel.m */; };
 		237B89DC2A931479005DB380 /* XPMineUserGameVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 237B89DB2A931479005DB380 /* XPMineUserGameVC.m */; };
 		237B89DF2A933F52005DB380 /* XPMineUserGameCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 237B89DE2A933F52005DB380 /* XPMineUserGameCell.m */; };
@@ -213,10 +219,15 @@
 		23844FC62B3AADA8002AD661 /* kMewMainHomePlayVoice.svga in Resources */ = {isa = PBXBuildFile; fileRef = 23844FC52B3AADA8002AD661 /* kMewMainHomePlayVoice.svga */; };
 		23844FC82B3AADC5002AD661 /* kMewMainHoemloading.svga in Resources */ = {isa = PBXBuildFile; fileRef = 23844FC72B3AADC5002AD661 /* kMewMainHoemloading.svga */; };
 		23844FCB2B3AC267002AD661 /* MewMineUserInfoOnRoomView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23844FCA2B3AC267002AD661 /* MewMineUserInfoOnRoomView.m */; };
+		23C9DFBD2B82FDBA00B51558 /* MewRoomReceiveGiftLandscapeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23C9DFBC2B82FDBA00B51558 /* MewRoomReceiveGiftLandscapeView.m */; };
+		23C9DFC02B83057000B51558 /* MewRoomReceiveGiftPopupWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 23C9DFBF2B83057000B51558 /* MewRoomReceiveGiftPopupWindow.m */; };
 		23CEFB692AFB32BE00576D89 /* XPRoomAnimationTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 23CEFB682AFB32BE00576D89 /* XPRoomAnimationTool.m */; };
 		23E1708C2AED2E080039DE62 /* YYTextAsyncLayer+XPTextAsyncLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E1708B2AED2E080039DE62 /* YYTextAsyncLayer+XPTextAsyncLayer.m */; };
 		23EEB0622B3C1B3F00E8CA05 /* MewMainHomeEmptyCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 23EEB0612B3C1B3F00E8CA05 /* MewMainHomeEmptyCell.m */; };
 		23F8BFF82A7A392000A36763 /* XPRoomMessagePrivilegeCardCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 23F8BFF72A7A392000A36763 /* XPRoomMessagePrivilegeCardCell.m */; };
+		23FE47CF2BB2C8CE00F09D23 /* YinMineSettingFillCodeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FE47CE2BB2C8CE00F09D23 /* YinMineSettingFillCodeView.m */; };
+		23FE47D22BB2D98300F09D23 /* YinMineSettingPopUpView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FE47D12BB2D98300F09D23 /* YinMineSettingPopUpView.m */; };
+		23FE47EA2BB5076A00F09D23 /* YinUploadFileModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FE47E92BB5076A00F09D23 /* YinUploadFileModel.m */; };
 		73FFADDC93E195344047A2EC /* Pods_xplan_ios.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CACF623970097D653132D69A /* Pods_xplan_ios.framework */; };
 		9B0086C627BA392B0032BD2B /* AnchorStageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B0086C527BA392B0032BD2B /* AnchorStageView.m */; };
 		9B0086CA27BA4F570032BD2B /* AnchorMicroView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B0086C927BA4F570032BD2B /* AnchorMicroView.m */; };
@@ -825,7 +836,6 @@
 		E83DB47A27462C4500D8CBD1 /* XPGiftBigPrizeModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E83DB47927462C4500D8CBD1 /* XPGiftBigPrizeModel.m */; };
 		E83DB47D2746372300D8CBD1 /* XPRoomGiftBannerView.m in Sources */ = {isa = PBXBuildFile; fileRef = E83DB47C2746372300D8CBD1 /* XPRoomGiftBannerView.m */; };
 		E83DB481274649FB00D8CBD1 /* XPGiftBannerUserInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E83DB480274649FB00D8CBD1 /* XPGiftBannerUserInfoModel.m */; };
-		E83DB4842746661800D8CBD1 /* XPRoomGiftBroadcastView.m in Sources */ = {isa = PBXBuildFile; fileRef = E83DB4832746661800D8CBD1 /* XPRoomGiftBroadcastView.m */; };
 		E83DB487274670DA00D8CBD1 /* XPRoomGiftBroadCastModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E83DB486274670DA00D8CBD1 /* XPRoomGiftBroadCastModel.m */; };
 		E8412F9627795E34006E1101 /* XPRoomInviteFansView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8412F9527795E34006E1101 /* XPRoomInviteFansView.m */; };
 		E8412F9927799249006E1101 /* InviteFansModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8412F9827799249006E1101 /* InviteFansModel.m */; };
@@ -1189,7 +1199,6 @@
 		E8B825CA26EA1231009E8E9F /* LoginVerifCodeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8B825C826EA1231009E8E9F /* LoginVerifCodeViewController.m */; };
 		E8B825CD26EA18C8009E8E9F /* ThemeColor.m in Sources */ = {isa = PBXBuildFile; fileRef = E8B825CC26EA18C8009E8E9F /* ThemeColor.m */; };
 		E8B825D026EA3825009E8E9F /* LoginPasswordViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8B825CF26EA3825009E8E9F /* LoginPasswordViewController.m */; };
-		E8B846BC26FD7C1200A777FE /* UploadImage.m in Sources */ = {isa = PBXBuildFile; fileRef = E8B846BB26FD7C1200A777FE /* UploadImage.m */; };
 		E8B846BF26FD827900A777FE /* XPMineUserInfoAlbumViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8B846BE26FD827900A777FE /* XPMineUserInfoAlbumViewController.m */; };
 		E8B846C226FD82DC00A777FE /* XPMineUserInfoAlbumCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8B846C126FD82DC00A777FE /* XPMineUserInfoAlbumCollectionViewCell.m */; };
 		E8B846C526FDB41A00A777FE /* XPMineUserInfolbumPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8B846C426FDB41A00A777FE /* XPMineUserInfolbumPresenter.m */; };
@@ -1650,6 +1659,14 @@
 		18F404C6276099DF00A6C548 /* MessageProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageProtocol.h; sourceTree = "<group>"; };
 		18F404C727609A4300A6C548 /* MessagePresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessagePresenter.h; sourceTree = "<group>"; };
 		18F404C827609A4300A6C548 /* MessagePresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessagePresenter.m; sourceTree = "<group>"; };
+		230017E52B6357F70034A86C /* MewUnlockGiftBroadcastView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MewUnlockGiftBroadcastView.h; sourceTree = "<group>"; };
+		230017E62B6357F70034A86C /* MewUnlockGiftBroadcastView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MewUnlockGiftBroadcastView.m; sourceTree = "<group>"; };
+		230017E82B635A790034A86C /* MewUnlockGiftBroadcastViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MewUnlockGiftBroadcastViewCell.h; sourceTree = "<group>"; };
+		230017E92B635A790034A86C /* MewUnlockGiftBroadcastViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MewUnlockGiftBroadcastViewCell.m; sourceTree = "<group>"; };
+		230017EB2B639C8D0034A86C /* MewUnlockGiftModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MewUnlockGiftModel.h; sourceTree = "<group>"; };
+		230017EC2B639C8D0034A86C /* MewUnlockGiftModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MewUnlockGiftModel.m; sourceTree = "<group>"; };
+		230017EE2B639E730034A86C /* MewUnlockBaseGiftModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MewUnlockBaseGiftModel.h; sourceTree = "<group>"; };
+		230017EF2B639E730034A86C /* MewUnlockBaseGiftModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MewUnlockBaseGiftModel.m; sourceTree = "<group>"; };
 		230496EB2A6E1EE0006D1F0C /* XPPrivilegeCardVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPPrivilegeCardVC.h; sourceTree = "<group>"; };
 		230496EC2A6E1EE0006D1F0C /* XPPrivilegeCardVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPPrivilegeCardVC.m; sourceTree = "<group>"; };
 		230496EE2A6E1F1F006D1F0C /* XPPrivilegeCardPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPPrivilegeCardPresenter.h; sourceTree = "<group>"; };
@@ -1751,6 +1768,10 @@
 		232153DC2AF381E400B2FBC0 /* MovEncodeToMpegTool.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MovEncodeToMpegTool.m; sourceTree = "<group>"; };
 		232153DE2AF394BF00B2FBC0 /* XPPrivilegeCardVideoItemModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPPrivilegeCardVideoItemModel.h; sourceTree = "<group>"; };
 		232153DF2AF394BF00B2FBC0 /* XPPrivilegeCardVideoItemModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPPrivilegeCardVideoItemModel.m; sourceTree = "<group>"; };
+		234949FF2B68DA4B00655D8A /* XPMineDataSkillCardCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineDataSkillCardCollectionViewCell.h; sourceTree = "<group>"; };
+		23494A002B68DA4B00655D8A /* XPMineDataSkillCardCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineDataSkillCardCollectionViewCell.m; sourceTree = "<group>"; };
+		23494A022B68DCBC00655D8A /* XPMineDataGiftHeadCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineDataGiftHeadCell.h; sourceTree = "<group>"; };
+		23494A032B68DCBC00655D8A /* XPMineDataGiftHeadCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineDataGiftHeadCell.m; sourceTree = "<group>"; };
 		236FF06A2AF8892400BEB6EC /* XPClientH5UresModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPClientH5UresModel.h; sourceTree = "<group>"; };
 		236FF06B2AF8892400BEB6EC /* XPClientH5UresModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPClientH5UresModel.m; sourceTree = "<group>"; };
 		237B89DA2A931479005DB380 /* XPMineUserGameVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserGameVC.h; sourceTree = "<group>"; };
@@ -1808,6 +1829,10 @@
 		23844FC72B3AADC5002AD661 /* kMewMainHoemloading.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = kMewMainHoemloading.svga; sourceTree = "<group>"; };
 		23844FC92B3AC267002AD661 /* MewMineUserInfoOnRoomView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MewMineUserInfoOnRoomView.h; sourceTree = "<group>"; };
 		23844FCA2B3AC267002AD661 /* MewMineUserInfoOnRoomView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MewMineUserInfoOnRoomView.m; sourceTree = "<group>"; };
+		23C9DFBB2B82FDBA00B51558 /* MewRoomReceiveGiftLandscapeView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MewRoomReceiveGiftLandscapeView.h; sourceTree = "<group>"; };
+		23C9DFBC2B82FDBA00B51558 /* MewRoomReceiveGiftLandscapeView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MewRoomReceiveGiftLandscapeView.m; sourceTree = "<group>"; };
+		23C9DFBE2B83057000B51558 /* MewRoomReceiveGiftPopupWindow.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MewRoomReceiveGiftPopupWindow.h; sourceTree = "<group>"; };
+		23C9DFBF2B83057000B51558 /* MewRoomReceiveGiftPopupWindow.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MewRoomReceiveGiftPopupWindow.m; sourceTree = "<group>"; };
 		23CEFB672AFB32BE00576D89 /* XPRoomAnimationTool.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomAnimationTool.h; sourceTree = "<group>"; };
 		23CEFB682AFB32BE00576D89 /* XPRoomAnimationTool.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomAnimationTool.m; sourceTree = "<group>"; };
 		23E1708A2AED2E080039DE62 /* YYTextAsyncLayer+XPTextAsyncLayer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "YYTextAsyncLayer+XPTextAsyncLayer.h"; path = "xplan-ios/Appdelegate/YYTextAsyncLayer+XPTextAsyncLayer.h"; sourceTree = SOURCE_ROOT; };
@@ -1816,6 +1841,12 @@
 		23EEB0612B3C1B3F00E8CA05 /* MewMainHomeEmptyCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MewMainHomeEmptyCell.m; sourceTree = "<group>"; };
 		23F8BFF62A7A392000A36763 /* XPRoomMessagePrivilegeCardCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomMessagePrivilegeCardCell.h; sourceTree = "<group>"; };
 		23F8BFF72A7A392000A36763 /* XPRoomMessagePrivilegeCardCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomMessagePrivilegeCardCell.m; sourceTree = "<group>"; };
+		23FE47CD2BB2C8CE00F09D23 /* YinMineSettingFillCodeView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YinMineSettingFillCodeView.h; sourceTree = "<group>"; };
+		23FE47CE2BB2C8CE00F09D23 /* YinMineSettingFillCodeView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = YinMineSettingFillCodeView.m; sourceTree = "<group>"; };
+		23FE47D02BB2D98300F09D23 /* YinMineSettingPopUpView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YinMineSettingPopUpView.h; sourceTree = "<group>"; };
+		23FE47D12BB2D98300F09D23 /* YinMineSettingPopUpView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = YinMineSettingPopUpView.m; sourceTree = "<group>"; };
+		23FE47E82BB5076A00F09D23 /* YinUploadFileModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YinUploadFileModel.h; sourceTree = "<group>"; };
+		23FE47E92BB5076A00F09D23 /* YinUploadFileModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YinUploadFileModel.m; sourceTree = "<group>"; };
 		7DB00EC07F1D0ADFF900B38D /* Pods-xplan-ios.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-xplan-ios.debug.xcconfig"; path = "Target Support Files/Pods-xplan-ios/Pods-xplan-ios.debug.xcconfig"; sourceTree = "<group>"; };
 		9B0086C427BA392B0032BD2B /* AnchorStageView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AnchorStageView.h; sourceTree = "<group>"; };
 		9B0086C527BA392B0032BD2B /* AnchorStageView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AnchorStageView.m; sourceTree = "<group>"; };
@@ -2879,8 +2910,6 @@
 		E83DB47C2746372300D8CBD1 /* XPRoomGiftBannerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomGiftBannerView.m; sourceTree = "<group>"; };
 		E83DB47F274649FB00D8CBD1 /* XPGiftBannerUserInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPGiftBannerUserInfoModel.h; sourceTree = "<group>"; };
 		E83DB480274649FB00D8CBD1 /* XPGiftBannerUserInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPGiftBannerUserInfoModel.m; sourceTree = "<group>"; };
-		E83DB4822746661800D8CBD1 /* XPRoomGiftBroadcastView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomGiftBroadcastView.h; sourceTree = "<group>"; };
-		E83DB4832746661800D8CBD1 /* XPRoomGiftBroadcastView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomGiftBroadcastView.m; sourceTree = "<group>"; };
 		E83DB485274670DA00D8CBD1 /* XPRoomGiftBroadCastModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomGiftBroadCastModel.h; sourceTree = "<group>"; };
 		E83DB486274670DA00D8CBD1 /* XPRoomGiftBroadCastModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomGiftBroadCastModel.m; sourceTree = "<group>"; };
 		E8412F9427795E34006E1101 /* XPRoomInviteFansView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomInviteFansView.h; sourceTree = "<group>"; };
@@ -3621,8 +3650,6 @@
 		E8B825CC26EA18C8009E8E9F /* ThemeColor.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ThemeColor.m; sourceTree = "<group>"; };
 		E8B825CE26EA3825009E8E9F /* LoginPasswordViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LoginPasswordViewController.h; sourceTree = "<group>"; };
 		E8B825CF26EA3825009E8E9F /* LoginPasswordViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LoginPasswordViewController.m; sourceTree = "<group>"; };
-		E8B846BA26FD7C1200A777FE /* UploadImage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UploadImage.h; sourceTree = "<group>"; };
-		E8B846BB26FD7C1200A777FE /* UploadImage.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UploadImage.m; sourceTree = "<group>"; };
 		E8B846BD26FD827900A777FE /* XPMineUserInfoAlbumViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoAlbumViewController.h; sourceTree = "<group>"; };
 		E8B846BE26FD827900A777FE /* XPMineUserInfoAlbumViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoAlbumViewController.m; sourceTree = "<group>"; };
 		E8B846C026FD82DC00A777FE /* XPMineUserInfoAlbumCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoAlbumCollectionViewCell.h; sourceTree = "<group>"; };
@@ -4487,7 +4514,6 @@
 				E82D5C77276B25B000858D6D /* SpriteSheetManager */,
 				E865964E2701A1A900846EBD /* StatisticsService */,
 				E89DA6612700590A008483C1 /* IAPHelper */,
-				E8B846B926FD7BE600A777FE /* UploadImage */,
 				E8EEB8EA26FC2050007C6EBA /* SDPhotoBrowser */,
 				E81366E426F0A4820076364C /* NSString */,
 				E82109AA26F1C86E00FC3319 /* CountDown */,
@@ -5170,8 +5196,10 @@
 		9B33E3C827D85379003B0E62 /* File */ = {
 			isa = PBXGroup;
 			children = (
-				9B33E3C927D85379003B0E62 /* UploadFile.m */,
 				9B33E3CA27D85379003B0E62 /* UploadFile.h */,
+				9B33E3C927D85379003B0E62 /* UploadFile.m */,
+				23FE47E82BB5076A00F09D23 /* YinUploadFileModel.h */,
+				23FE47E92BB5076A00F09D23 /* YinUploadFileModel.m */,
 			);
 			path = File;
 			sourceTree = "<group>";
@@ -7047,8 +7075,10 @@
 				9B8DE0E3289CF7AA00FB6EC2 /* XPRoomGiftCompoundView.m */,
 				E83DB47B2746372300D8CBD1 /* XPRoomGiftBannerView.h */,
 				E83DB47C2746372300D8CBD1 /* XPRoomGiftBannerView.m */,
-				E83DB4822746661800D8CBD1 /* XPRoomGiftBroadcastView.h */,
-				E83DB4832746661800D8CBD1 /* XPRoomGiftBroadcastView.m */,
+				23C9DFBB2B82FDBA00B51558 /* MewRoomReceiveGiftLandscapeView.h */,
+				23C9DFBC2B82FDBA00B51558 /* MewRoomReceiveGiftLandscapeView.m */,
+				23C9DFBE2B83057000B51558 /* MewRoomReceiveGiftPopupWindow.h */,
+				23C9DFBF2B83057000B51558 /* MewRoomReceiveGiftPopupWindow.m */,
 				237B89EF2A948E60005DB380 /* XPRoomGameInviteBannerView.h */,
 				237B89F02A948E60005DB380 /* XPRoomGameInviteBannerView.m */,
 				E8A03DFD27635F960098D9EA /* XPRoomCandyGiftView.h */,
@@ -7760,6 +7790,10 @@
 				E8A3538428FD67320014A784 /* GiftLuckyBroadcastModel.m */,
 				E8D4DE452940473500EC788D /* GiftTwelveStarFirstModel.h */,
 				E8D4DE462940473500EC788D /* GiftTwelveStarFirstModel.m */,
+				230017EB2B639C8D0034A86C /* MewUnlockGiftModel.h */,
+				230017EC2B639C8D0034A86C /* MewUnlockGiftModel.m */,
+				230017EE2B639E730034A86C /* MewUnlockBaseGiftModel.h */,
+				230017EF2B639E730034A86C /* MewUnlockBaseGiftModel.m */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -7793,6 +7827,10 @@
 				E8901CF528B38D89001E9A92 /* XPGraffitiGiftView.m */,
 				9B4D449128F15765002572D5 /* XPGiftLuckyGiftBroadcastView.h */,
 				9B4D449228F15765002572D5 /* XPGiftLuckyGiftBroadcastView.m */,
+				230017E52B6357F70034A86C /* MewUnlockGiftBroadcastView.h */,
+				230017E62B6357F70034A86C /* MewUnlockGiftBroadcastView.m */,
+				230017E82B635A790034A86C /* MewUnlockGiftBroadcastViewCell.h */,
+				230017E92B635A790034A86C /* MewUnlockGiftBroadcastViewCell.m */,
 				9B4D449428F15EE7002572D5 /* XPGiftWeekStarBroadcastView.h */,
 				9B4D449528F15EE7002572D5 /* XPGiftWeekStarBroadcastView.m */,
 				E8D4DE422940462C00EC788D /* XPGiftTwelveStarBroadcastView.h */,
@@ -8090,6 +8128,10 @@
 				237B89DE2A933F52005DB380 /* XPMineUserGameCell.m */,
 				237B89EC2A945F81005DB380 /* XPMineUserGameTypeCell.h */,
 				237B89ED2A945F81005DB380 /* XPMineUserGameTypeCell.m */,
+				23FE47CD2BB2C8CE00F09D23 /* YinMineSettingFillCodeView.h */,
+				23FE47CE2BB2C8CE00F09D23 /* YinMineSettingFillCodeView.m */,
+				23FE47D02BB2D98300F09D23 /* YinMineSettingPopUpView.h */,
+				23FE47D12BB2D98300F09D23 /* YinMineSettingPopUpView.m */,
 			);
 			path = MineInfo;
 			sourceTree = "<group>";
@@ -8845,15 +8887,6 @@
 			path = Model;
 			sourceTree = "<group>";
 		};
-		E8B846B926FD7BE600A777FE /* UploadImage */ = {
-			isa = PBXGroup;
-			children = (
-				E8B846BA26FD7C1200A777FE /* UploadImage.h */,
-				E8B846BB26FD7C1200A777FE /* UploadImage.m */,
-			);
-			path = UploadImage;
-			sourceTree = "<group>";
-		};
 		E8B846D026FDDBCD00A777FE /* Recharge */ = {
 			isa = PBXGroup;
 			children = (
@@ -9994,12 +10027,16 @@
 				E8B846C126FD82DC00A777FE /* XPMineUserInfoAlbumCollectionViewCell.m */,
 				E8D34D4828080335009C4835 /* XPMineDataSkillCardTableViewCell.h */,
 				E8D34D4928080335009C4835 /* XPMineDataSkillCardTableViewCell.m */,
+				234949FF2B68DA4B00655D8A /* XPMineDataSkillCardCollectionViewCell.h */,
+				23494A002B68DA4B00655D8A /* XPMineDataSkillCardCollectionViewCell.m */,
 				E8D34D512808037E009C4835 /* XPMineDataSkillDataCollectionViewCell.h */,
 				E8D34D522808037E009C4835 /* XPMineDataSkillDataCollectionViewCell.m */,
 				E8D34D4B28080351009C4835 /* XPMineDataClanTableViewCell.h */,
 				E8D34D4C28080351009C4835 /* XPMineDataClanTableViewCell.m */,
 				E8D34D4E28080362009C4835 /* XPMineDataGiftTableViewCell.h */,
 				E8D34D4F28080362009C4835 /* XPMineDataGiftTableViewCell.m */,
+				23494A022B68DCBC00655D8A /* XPMineDataGiftHeadCell.h */,
+				23494A032B68DCBC00655D8A /* XPMineDataGiftHeadCell.m */,
 				E8D34D5428080393009C4835 /* XPMineDataGiftCollectionViewCell.h */,
 				E8D34D5528080393009C4835 /* XPMineDataGiftCollectionViewCell.m */,
 				E8D34D6528084E88009C4835 /* XPMineUserInfoGiftWallCollectionViewCell.h */,
@@ -10404,6 +10441,7 @@
 				E8E0DAE0285C20E500566A2F /* MessageContentFindNewGreetView.m in Sources */,
 				E8A3540128FEAC5E0014A784 /* XPWishGiftTableViewCell.m in Sources */,
 				E8A86E0427BA38DB001C21F9 /* SudCommon.m in Sources */,
+				230017ED2B639C8D0034A86C /* MewUnlockGiftModel.m in Sources */,
 				E8EEB90326FC31DC007C6EBA /* XPMineUserInfoProtocol.h in Sources */,
 				E8232603274E4AA0003A3332 /* ThemeColor+UserCard.m in Sources */,
 				E8E859C228264C2300EE4857 /* HTTPErrorResponse.m in Sources */,
@@ -10429,11 +10467,13 @@
 				E824545E26F5EF2200BE8163 /* XPMineVerifIdentityProtocol.h in Sources */,
 				E824545326F5CEAD00BE8163 /* XPMineModifPayProtocol.h in Sources */,
 				E84BF7D7277C6E2100EF8877 /* XPRoomRoleViewController.m in Sources */,
+				230017E72B6357F70034A86C /* MewUnlockGiftBroadcastView.m in Sources */,
 				E8AB631328ADDCF20023B0D2 /* XPMonentsTopicHeaderView.m in Sources */,
 				9B86D886281942D200494FCD /* SocialMicroView.m in Sources */,
 				E8664ED027E42238000171BA /* XPRoomPKTimePickerView.m in Sources */,
 				E824544826F5945300BE8163 /* XPMinePayPwdProtocol.h in Sources */,
 				9BFB10162897AAB300B3985E /* XPNewUserRechargeSucessView.m in Sources */,
+				23C9DFBD2B82FDBA00B51558 /* MewRoomReceiveGiftLandscapeView.m in Sources */,
 				E8AB633628AE54A40023B0D2 /* XPSailingPrizeCollectionViewCell.m in Sources */,
 				E824543A26F5880E00BE8163 /* XPLoginVerifBindPhoneProtocol.h in Sources */,
 				E8E20BE2281695800033B688 /* XPMineLoginPasswordViewController.m in Sources */,
@@ -10550,6 +10590,7 @@
 				9BEE3D0E27853BD000C83219 /* ThemeColor+NobleCenter.m in Sources */,
 				231EBB1A2B329B10006F782E /* MewHomeManager.m in Sources */,
 				E8998D7A2859784200C68558 /* XPSVGAPlayer.m in Sources */,
+				23494A012B68DA4B00655D8A /* XPMineDataSkillCardCollectionViewCell.m in Sources */,
 				9BD9A18427A0F128004186FE /* XPMineVisitorItemModel.m in Sources */,
 				E852D73E28631C18001465ED /* XPMonentsCommentTableViewCell.m in Sources */,
 				E80B0712280D0A6700A79F63 /* FansInfoModel.m in Sources */,
@@ -10834,6 +10875,7 @@
 				E81C1B1C27705F6B0020D1E4 /* XPArrangeMicPresenter.m in Sources */,
 				184862CE27213FD7005FC5DC /* ZegoRtcImpl.m in Sources */,
 				E8A88D2727E8193400CA8837 /* XPRoomPKSelectUserView.m in Sources */,
+				23FE47CF2BB2C8CE00F09D23 /* YinMineSettingFillCodeView.m in Sources */,
 				9B734F7C288AB05A00CBDAA9 /* XPMIneGameCollectionViewCell.m in Sources */,
 				9B0E1C5926E77022005D4442 /* BaseNavigationController.m in Sources */,
 				E8664ED927E4355C000171BA /* XPRoomPKRecordTableViewCell.m in Sources */,
@@ -10939,7 +10981,9 @@
 				18A61BE8274F9CF000A09A54 /* SessionListViewController.m in Sources */,
 				E8C1CD6A27D8937800376F83 /* XPRoomFaceCollectionViewCell.m in Sources */,
 				E8DBB6F927B639A300AA285D /* LittleGameStageView.m in Sources */,
+				23FE47EA2BB5076A00F09D23 /* YinUploadFileModel.m in Sources */,
 				9B2EA7C02804037700ED17BF /* AnchorPKStageView.m in Sources */,
+				23FE47D22BB2D98300F09D23 /* YinMineSettingPopUpView.m in Sources */,
 				E811FFF72742367B00918544 /* XPGiftEmptyCollectionViewCell.m in Sources */,
 				E8A86E0827BA38DB001C21F9 /* UIImage+RW.m in Sources */,
 				E800807927FD84560055A8AB /* ClanInfoModel.m in Sources */,
@@ -10998,6 +11042,7 @@
 				E8DAC5AC2858305A00012CFD /* XPRoomMessageBubbleView.m in Sources */,
 				E8A6C29F27CF5FE500AC7442 /* HomeLiveRoomModel.m in Sources */,
 				E8B9843028AB90200022D026 /* XPMoentsTopicListView.m in Sources */,
+				230017EA2B635A790034A86C /* MewUnlockGiftBroadcastViewCell.m in Sources */,
 				E84150B827747B8B00A7F548 /* XPFirstRechargeViewController.m in Sources */,
 				9BBC02872786D75C0007C24B /* XPNobleUpgradeLevelView.m in Sources */,
 				E8E20BDE28164D3A0033B688 /* SessionNavView.m in Sources */,
@@ -11054,7 +11099,6 @@
 				14A0CF4429C022D300B2375A /* XPMineRechargePayCollectionViewCell.m in Sources */,
 				E8D34D5A28082357009C4835 /* UserGiftWallInfoModel.m in Sources */,
 				189DD52E26DE255300AB55B1 /* AppDelegate.m in Sources */,
-				E83DB4842746661800D8CBD1 /* XPRoomGiftBroadcastView.m in Sources */,
 				E84150C527747E0900A7F548 /* FirstRechargeRewardModel.m in Sources */,
 				E8A1E4572762092700B294CA /* XPCandyTreePresenter.m in Sources */,
 				E8B9843328ABA2FF0022D026 /* MonentsPicResInfo.m in Sources */,
@@ -11292,7 +11336,6 @@
 				237B8A092A95A52B005DB380 /* XPMineGameOrderItemVC.m in Sources */,
 				E839533F276A0CDB00CF2F24 /* XPMineNameplateTableViewCell.m in Sources */,
 				9B73CD11279AE99B006AF255 /* XPSkillCardListCell.m in Sources */,
-				E8B846BC26FD7C1200A777FE /* UploadImage.m in Sources */,
 				9BCE6144277D657600CC0358 /* XPReleaseRadioTableViewCell.m in Sources */,
 				9B16A34827E17D9B00E13A98 /* XPRoomTrumpetViewController.m in Sources */,
 				186A534D26FC6ED900D67B2C /* TTActionSheetView.m in Sources */,
@@ -11387,6 +11430,7 @@
 				E84150BF27747BD300A7F548 /* Api+FirstRecharge.m in Sources */,
 				E8E859CF28264C2300EE4857 /* DDNumber.m in Sources */,
 				E84B0E422727EE0A008818C6 /* XPRoomMessageHeaderView.m in Sources */,
+				23494A042B68DCBC00655D8A /* XPMineDataGiftHeadCell.m in Sources */,
 				E8C6FFDD2754CF5D004DC9F0 /* HomeRecommendRoomModel.m in Sources */,
 				E852D73B286317F0001465ED /* XPMonentsDetailViewController.m in Sources */,
 				14C1F15729B874FB000A960F /* XPMineMoreItemTableViewCell.m in Sources */,
@@ -11395,6 +11439,7 @@
 				E8A30BEB28534A96003B4873 /* XPSessionFindNewFiltrateView.m in Sources */,
 				E84BF7E0277C869A00EF8877 /* XPRoomOnLineViewController.m in Sources */,
 				186A534826FC6ED900D67B2C /* TTAlertButtonConfig.m in Sources */,
+				23C9DFC02B83057000B51558 /* MewRoomReceiveGiftPopupWindow.m in Sources */,
 				E8ACEFF827C9034C00F66D1A /* XPHomeListEmptyTableViewCell.m in Sources */,
 				E88749B6282B8FC600C3C7DB /* MonentsInfoModel.m in Sources */,
 				E89D60BA271D643A001F8895 /* Api+Room.m in Sources */,
@@ -11405,6 +11450,7 @@
 				E887531929BB26680017A41A /* CandyTreeMoreItemModel.m in Sources */,
 				E8E859C628264C2300EE4857 /* HTTPAsyncFileResponse.m in Sources */,
 				E845D16F283354A300BE21F7 /* XPEnterpriseTarotPayView.m in Sources */,
+				230017F02B639E730034A86C /* MewUnlockBaseGiftModel.m in Sources */,
 				E877A7EB2783E24700EFACED /* DatingStageView.m in Sources */,
 				9BD2ECDA288F867000F5CD9A /* XPMineFootPrintTableViewCell.m in Sources */,
 				E8001635280410BD00D6D17A /* XPGuildIncomeSectionView.m in Sources */,
@@ -11633,7 +11679,7 @@
 				CODE_SIGN_ENTITLEMENTS = "xplan-ios/xplan-ios.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 48UCG35Q9W;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -11649,7 +11695,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.0;
+				MARKETING_VERSION = 2.1.5;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -11747,8 +11793,6 @@
 					"-framework",
 					"\"Foundation\"",
 					"-framework",
-					"\"HappyDNS\"",
-					"-framework",
 					"\"IAPHelper\"",
 					"-framework",
 					"\"IQKeyboardManager\"",
@@ -11801,8 +11845,6 @@
 					"-framework",
 					"\"QYSDK_NIM\"",
 					"-framework",
-					"\"Qiniu\"",
-					"-framework",
 					"\"QuartzCore\"",
 					"-framework",
 					"\"ReactiveObjC\"",
@@ -11853,12 +11895,8 @@
 					"-framework",
 					"\"VideoToolbox\"",
 					"-framework",
-					"\"WYEAccountApiSDK\"",
-					"-framework",
 					"\"WYOAuth\"",
 					"-framework",
-					"\"WYTYRZUISDK\"",
-					"-framework",
 					"\"WebKit\"",
 					"-framework",
 					"\"WechatConnector\"",
@@ -11896,7 +11934,7 @@
 				CODE_SIGN_ENTITLEMENTS = "xplan-ios/xplan-iosRelease.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 48UCG35Q9W;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -11912,7 +11950,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.0;
+				MARKETING_VERSION = 2.1.5;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -12010,8 +12048,6 @@
 					"-framework",
 					"\"Foundation\"",
 					"-framework",
-					"\"HappyDNS\"",
-					"-framework",
 					"\"IAPHelper\"",
 					"-framework",
 					"\"IQKeyboardManager\"",
@@ -12062,8 +12098,6 @@
 					"-framework",
 					"\"QYSDK_NIM\"",
 					"-framework",
-					"\"Qiniu\"",
-					"-framework",
 					"\"QuartzCore\"",
 					"-framework",
 					"\"ReactiveObjC\"",
@@ -12114,12 +12148,8 @@
 					"-framework",
 					"\"VideoToolbox\"",
 					"-framework",
-					"\"WYEAccountApiSDK\"",
-					"-framework",
 					"\"WYOAuth\"",
 					"-framework",
-					"\"WYTYRZUISDK\"",
-					"-framework",
 					"\"WebKit\"",
 					"-framework",
 					"\"WechatConnector\"",

xplan-ios.xcodeproj/xcshareddata/xcschemes/xplan-ios.xcscheme

@@ -31,7 +31,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

xplan-ios/Assets.xcassets/AccentColor.colorset/Contents.json

@@ -1,11 +0,0 @@
-{
-  "colors" : [
-    {
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

xplan-ios/Assets.xcassets/Mine/mine_user_infi_gift_bg1.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "room_gift_broadcast_send@2x.png",
+      "filename" : "mine_user_infi_gift_bg1@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "room_gift_broadcast_send@3x.png",
+      "filename" : "mine_user_infi_gift_bg1@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

xplan-ios/Assets.xcassets/Mine/mine_user_infi_gift_bg2.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "room_gift_broadcast_close@2x.png",
+      "filename" : "mine_user_infi_gift_bg2@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "room_gift_broadcast_close@3x.png",
+      "filename" : "mine_user_infi_gift_bg2@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

xplan-ios/Assets.xcassets/Mine/mine_user_infi_gift_bg3.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "room_gift_broadcast_low_bg@2x.png",
+      "filename" : "mine_user_infi_gift_bg3@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "room_gift_broadcast_low_bg@3x.png",
+      "filename" : "mine_user_infi_gift_bg3@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

xplan-ios/Assets.xcassets/Mine/mine_user_infi_gift_bg4.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "room_gift_broadcast_high_bg@2x.png",
+      "filename" : "mine_user_infi_gift_bg4@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "room_gift_broadcast_high_bg@3x.png",
+      "filename" : "mine_user_infi_gift_bg4@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

xplan-ios/Assets.xcassets/Mine/mine_user_infi_gift_bg5.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Mine/mine_user_infi_gift_bg6.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Mine/mine_user_infi_gift_bg7.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Mine/mine_user_infi_gift_bg8.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Mine/mine_user_info_gift_tip_icon.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Room/Broadcast/mew_room_receive_high_bg.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Room/Broadcast/mew_room_receive_low_bg.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Room/Broadcast/mew_room_receive_middle_bg.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Room/Broadcast/mew_room_receive_room_icon.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Room/Broadcast/mew_room_receive_window_no_select.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "room_gift_broadcast_avatar_board@2x.png",
+      "filename" : "mew_room_receive_window_no_select@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "room_gift_broadcast_avatar_board@3x.png",
+      "filename" : "mew_room_receive_window_no_select@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

xplan-ios/Assets.xcassets/Room/Broadcast/mew_room_receive_window_select.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "room_gift_broadcast_middle_bg@2x.png",
+      "filename" : "mew_room_receive_window_select@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "room_gift_broadcast_middle_bg@3x.png",
+      "filename" : "mew_room_receive_window_select@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

xplan-ios/Assets.xcassets/Room/Broadcast/room_gift_broadcast_higher_nick_bg.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Room/Broadcast/room_gift_broadcast_normal_nick_bg.imageset/Contents.json

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

xplan-ios/Base/MVP/Api/Api.h

@@ -85,6 +85,8 @@ NS_ASSUME_NONNULL_BEGIN
 				   position:(NSString *)position
 					 ticket:(NSString *)ticket
 						uid:(NSString *)uid;
+///得到腾讯存储信息
++ (void)getQCloudInfo:(HttpRequestHelperCompletion)completion;
 @end
 
 NS_ASSUME_NONNULL_END

xplan-ios/Base/MVP/Api/Api.m

@@ -115,4 +115,8 @@
 + (void)microLockCompletion:(HttpRequestHelperCompletion)complection roomUid:(NSString *)roomUid state:(NSString *)state position:(NSString *)position ticket:(NSString *)ticket uid:(NSString *)uid {
 	[self makeRequest:@"room/mic/lockpos" method:HttpRequestHelperMethodPOST completion:complection, __FUNCTION__, roomUid, state, position, ticket, uid, nil];
 }
+///得到腾讯存储信息
++ (void)getQCloudInfo:(HttpRequestHelperCompletion)completion{
+    [self  makeRequest:@"tencent/cos/getToken" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, nil];
+}
 @end

xplan-ios/Base/MVP/Model/UserInfoModel.h

@@ -145,6 +145,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property(nonatomic,strong) NSArray<UserGameInfoVo *> *userGamePartner;
 ///pk时不能禁麦
 @property(nonatomic,assign) BOOL isNoProhibitMic;
+///控制是否有补填弹窗入口
+@property(nonatomic,assign) BOOL canRefillInviteCode;
 @end
 
 NS_ASSUME_NONNULL_END

xplan-ios/Base/MVP/Presenter/BaseMvpPresenter.m

@@ -109,14 +109,14 @@
 				break;
             case 10111: // 提现时，金额过大，需要先实名认证
                 [self.view hideHUD];
-                [[self getView] showRealNameAuthenticationTipsAlertView];
+                [[self getView] showRealNameAuthenticationTipsAlertView:@"为了营造更安全的网络环境\n保护您和他人的财产安全\n请先进行实名认证" isShowRoom:NO];
                 if (fail) {
                     fail(code, msg);
                 }
                 return;
             case 10108: // 未实名认证
                 [self.view hideHUD];
-                [[self getView] showRealNameAuthenticationTipsAlertView];
+                [[self getView] showRealNameAuthenticationTipsAlertView:@"为了营造更安全的网络环境\n保护您和他人的财产安全\n请先进行实名认证" isShowRoom:NO];
                 if (fail) {
                     fail(code, msg);
                 }

xplan-ios/Base/MVP/Protocol/BaseMvpProtocol.h

@@ -17,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)accountCanceled:(NSDictionary *)data;
 
 ///实名认证弹窗
-- (void)showRealNameAuthenticationTipsAlertView;
+- (void)showRealNameAuthenticationTipsAlertView:(NSString *)text isShowRoom:(BOOL)isShowRoom;
 
 ///封禁账号
 - (void)accountBanned:(BaseModel *)data;

xplan-ios/Base/MVP/View/MvpViewController.h

@@ -16,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (__kindof T)createPresenter;
 ///实名认证弹窗
-- (void)showRealNameAuthenticationTipsAlertView;
+- (void)showRealNameAuthenticationTipsAlertView:(NSString *)text isShowRoom:(BOOL)isShowRoom;
 @end
 
 NS_ASSUME_NONNULL_END

xplan-ios/Base/MVP/View/MvpViewController.m

@@ -78,18 +78,36 @@
 }
 
 ///实名认证弹窗
-- (void)showRealNameAuthenticationTipsAlertView {
+- (void)showRealNameAuthenticationTipsAlertView:(NSString *)text isShowRoom:(BOOL)isShowRoom{
     TTAlertConfig *config = [[TTAlertConfig alloc] init];
-    config.message = @"为了营造更安全的网络环境\n保护您和他人的财产安全\n请先进行实名认证";
+    config.title = @"提示";
+    config.message = text;
     config.messageLineSpacing = 4;
     config.confirmButtonConfig.title = @"前往认证";
     config.confirmButtonConfig.titleColor = UIColor.whiteColor;
     config.confirmButtonConfig.backgroundColor = [ThemeColor appMainColor];
     
+    NSArray *configList ;
+   
+        TTAlertMessageAttributedConfig *roomAtt = [[TTAlertMessageAttributedConfig alloc] init];
+        roomAtt.text = @"开通个人房间前";
+        roomAtt.color = [ThemeColor appMainColor];
+    
+    
+    
+    
     TTAlertMessageAttributedConfig *nameAttrConf = [[TTAlertMessageAttributedConfig alloc] init];
     nameAttrConf.text = @"实名认证";
     nameAttrConf.color = [ThemeColor appMainColor];
-    config.messageAttributedConfig = @[nameAttrConf];
+    
+    
+    if(isShowRoom){
+        configList = @[roomAtt,nameAttrConf];
+    }else{
+        configList = @[nameAttrConf];
+    }
+    
+    config.messageAttributedConfig = configList;
     
     @kWeakify(self);
     [TTPopup alertWithConfig:config confirmHandler:^{

xplan-ios/Base/Tool/Date/NSDate+DateUtils.h

@@ -17,6 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (NSDate *)dateByAddingDays:(NSInteger)days;
 
 - (NSString *)stringForFormat:(NSString *)format;
++(NSString *)getNowTimeTimestamp;
 @end
 
 @interface NSCalendar (Pick)

xplan-ios/Base/Tool/Date/NSDate+DateUtils.m

@@ -7,6 +7,7 @@
 
 #import "NSDate+DateUtils.h"
 
+
 NSString * const kDateFormatYYYYMMDD = @"yyyy-MM-dd";
 NSString * const kDateFormatYYMMDDTHHmmss = @"yyyy-MM-dd'T'HH:mm:ss";
 
@@ -43,7 +44,16 @@ NSString * const kDateFormatYYMMDDTHHmmss = @"yyyy-MM-dd'T'HH:mm:ss";
 - (NSString *) stringForYearMonthDayDashed {
 	return [self stringForFormat:kDateFormatYYYYMMDD];
 }
++(NSString *)getNowTimeTimestamp{
 
+    NSDate* dat = [NSDate dateWithTimeIntervalSinceNow:0];
+
+    NSTimeInterval a=[dat timeIntervalSince1970];
+
+    NSString*timeString = [NSString stringWithFormat:@"%0.f", a];//转为字符型
+
+    return timeString;
+}
 - (NSString *)stringForFormat:(NSString *)format {
 	if (!format) {
 		return nil;

xplan-ios/Base/Tool/File/UploadFile.h

@@ -1,8 +1,8 @@
 //
 //  UploadFile.h
-//  xplan-ios
+//  YUMI
 //
-//  Created by GreenLand on 2022/2/23.
+//  Created by YUMI on 2022/2/23.
 //
 
 #import <Foundation/Foundation.h>
@@ -10,19 +10,40 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface UploadFile : NSObject
++ (instancetype)share;
+-(void)initQCloud;
 
++ (void)downloadAudioWithFileName:(NSString *)fileName musicUrl:(NSString *)musicUrl mainFileName:(NSString *)mainFileName completion:(void (^) (BOOL isSuccess, NSString *editAudioPath))completion;
 /// 上传一个文件
 /// @param filePath 文件地址
 /// @param fileName 文件的名字
-/// @param token token
+
 /// @param success 成功
 /// @param failure 失败
-+ (void)uploadFile:(NSString *)filePath
+- (void)QCloudUploadFile:(NSString *)filePath
               named:(NSString *)fileName
-              token:(NSString *)token
+            
             success:(void (^)(NSString *key, NSDictionary *resp))success
-            failure:(void (^)(NSNumber *resCode, NSString *message))failure;
-+ (void)mew_downloadAudioWithFileName:(NSString *)fileName musicUrl:(NSString *)musicUrl mainFileName:(NSString *)mainFileName completion:(void (^) (BOOL isSuccess, NSString *editAudioPath))completion;
+                 failure:(void (^)(NSNumber *resCode, NSString *message))failure;
+/// 上传一个Image
+/// @param image 图片
+/// @param imageName 图片的名字
+
+/// @param success 成功
+/// @param failure 失败
+- (void)QCloudUploadImage:(NSData *)data
+              named:(NSString *)name
+            success:(void (^)(NSString *key, NSDictionary *resp))success
+                  failure:(void (^)(NSNumber *resCode, NSString *message))failure;
+/// 上传一个文件
+/// @param data 文件
+/// @param fileName 文件的名字
+/// @param success 成功
+/// @param failure 失败
+- (void)QCloudUploadFileWithData:(NSData *)data
+              named:(NSString *)fileName
+            success:(void (^)(NSString *key, NSDictionary *resp))success
+                         failure:(void (^)(NSNumber *resCode, NSString *message))failure;
 @end
 
 NS_ASSUME_NONNULL_END

xplan-ios/Base/Tool/File/UploadFile.m

@@ -4,36 +4,267 @@
 //
 //  Created by GreenLand on 2022/2/23.
 //
-
+#import <QCloudCOSXML/QCloudCOSXML.h>
 #import "UploadFile.h"
-#import <Qiniu/QiniuSDK.h>
 #import <AFNetworking.h>
+#import "Api+Mine.h"
+#import "YinUploadFileModel.h"
+static UploadFile* manager;
+
+@interface UploadFile()<QCloudSignatureProvider,QCloudCredentailFenceQueueDelegate>
+// 一个脚手架实例
+@property (nonatomic) QCloudCredentailFenceQueue* credentialFenceQueue;
+@property(nonatomic,strong) YinUploadFileModel *fileModel;
+@end
+
 @implementation UploadFile
 
++ (instancetype)share {
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        manager = [[UploadFile alloc] init];
+    });
+    return  manager;
+}
+
+-(void)initQCloud{
+    [Api getQCloudInfo:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
+        if (code == 200){
+            YinUploadFileModel *fileModel = [YinUploadFileModel modelWithDictionary:data.data];
+            self.fileModel = fileModel;
+            QCloudServiceConfiguration* configuration = [QCloudServiceConfiguration new];
+            configuration.appID = fileModel.appId;
+             QCloudCOSXMLEndPoint* endpoint = [[QCloudCOSXMLEndPoint alloc] init];
+             endpoint.regionName = fileModel.region;
+             // 使用 HTTPS
+             endpoint.useHTTPS = YES;
+             configuration.endpoint = endpoint;
+             // 密钥提供者为自己
+             configuration.signatureProvider = self;
+             // 初始化 COS 服务示例
+             [QCloudCOSXMLService registerDefaultCOSXMLWithConfiguration:configuration];
+             [QCloudCOSTransferMangerService registerDefaultCOSTransferMangerWithConfiguration:
+                 configuration];
+            
+            self.credentialFenceQueue = [QCloudCredentailFenceQueue new];
+            self.credentialFenceQueue.delegate = self;
+
+        }
+    }];
+}
+#pragma mark- QCloudSignatureProvider
+- (void) signatureWithFields:(QCloudSignatureFields*)fileds
+                     request:(QCloudBizHTTPRequest*)request
+                  urlRequest:(NSMutableURLRequest*)urlRequst
+                   compelete:(QCloudHTTPAuthentationContinueBlock)continueBlock
+{
+   
+    [Api getQCloudInfo:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
+        if (code == 200){
+            YinUploadFileModel *fileModel = [YinUploadFileModel modelWithDictionary:data.data];
+            QCloudCredential* credential = [QCloudCredential new];
+            
+          
+            // 临时密钥 SecretId
+         
+            credential.secretID = fileModel.secretId;
+            // 临时密钥 SecretKey
+         
+            credential.secretKey = fileModel.secretKey;
+            // 临时密钥 Token
+          
+            credential.token = fileModel.sessionToken;
+            /** 强烈建议返回服务器时间作为签名的开始时间, 用来避免由于用户手机本地时间偏差过大导致的签名不正确(参数startTime和expiredTime单位为秒)
+             */
+            credential.startDate = [NSDate dateWithTimeIntervalSince1970:fileModel.startTime]; // 单位是秒
+            credential.expirationDate = [NSDate dateWithTimeIntervalSince1970:fileModel.expireTime];// 单位是秒
+            
+            
+            QCloudAuthentationV5Creator* creator = [[QCloudAuthentationV5Creator alloc]
+                                                    initWithCredential:credential];
+            // 注意 这里不要对urlRequst 进行copy以及mutableCopy操作
+            QCloudSignature *signature = [creator signatureForData:urlRequst];
+            continueBlock(signature, nil);
+            
+        }
+    }
+    ];
+   
+}
+
+#pragma mark - QCloudCredentailFenceQueueDelegate
+- (void) fenceQueue:(QCloudCredentailFenceQueue * )queue requestCreatorWithContinue:(QCloudCredentailFenceQueueContinue)continueBlock
+{
+    //这里同步从◊后台服务器获取临时密钥，强烈建议将获取临时密钥的逻辑放在这里，最大程度上保证密钥的可用性
+    //...
+
+    [Api getQCloudInfo:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
+        if (code == 200){
+            YinUploadFileModel *fileModel = [YinUploadFileModel modelWithDictionary:data.data];
+            QCloudCredential* credential = [QCloudCredential new];
+            // 临时密钥 SecretId
+            credential.secretID = fileModel.secretId;
+            // 临时密钥 SecretKey
+           
+            credential.secretKey = fileModel.secretKey;
+            // 临时密钥 Token
+           
+            credential.token = fileModel.sessionToken;
+            /** 强烈建议返回服务器时间作为签名的开始时间, 用来避免由于用户手机本地时间偏差过大导致的签名不正确(参数startTime和expiredTime单位为秒)
+             */
+            credential.startDate = [NSDate dateWithTimeIntervalSince1970:fileModel.startTime]; // 单位是秒
+            credential.expirationDate = [NSDate dateWithTimeIntervalSince1970:fileModel.expireTime];// 单位是秒
+            QCloudAuthentationV5Creator* creator = [[QCloudAuthentationV5Creator alloc]
+                                                    initWithCredential:credential];
+            continueBlock(creator, nil);
+        }
+    }];
+}
 /// 上传一个文件
 /// @param filePath 文件地址
 /// @param fileName 文件的名字
-/// @param token token
 /// @param success 成功
 /// @param failure 失败
-+ (void)uploadFile:(NSString *)filePath
+- (void)QCloudUploadFile:(NSString *)filePath
               named:(NSString *)fileName
-              token:(NSString *)token
             success:(void (^)(NSString *key, NSDictionary *resp))success
-            failure:(void (^)(NSNumber *resCode, NSString *message))failure {
-    QNConfiguration *config = [QNConfiguration build:^(QNConfigurationBuilder *builder) {
-        builder.zone = [QNFixedZone zone2];
+                 failure:(void (^)(NSNumber *resCode, NSString *message))failure {
+    
+    
+    QCloudCOSXMLUploadObjectRequest* put = [QCloudCOSXMLUploadObjectRequest new];
+    // 本地文件路径
+    NSURL* url = [NSURL fileURLWithPath:filePath];
+    // 存储桶名称，由BucketName-Appid 组成，可以在COS控制台查看 https://console.cloud.tencent.com/cos5/bucket
+    put.bucket = self.fileModel.bucket;
+    // 对象键，是对象在 COS 上的完整路径，如果带目录的话，格式为 "video/xxx/movie.mp4"
+    put.object = fileName;
+    //需要上传的对象内容。可以传入NSData*或者NSURL*类型的变量
+    put.body =  url;
+    //监听上传进度
+    [put setSendProcessBlock:^(int64_t bytesSent,
+                                int64_t totalBytesSent,
+                                int64_t totalBytesExpectedToSend) {
+        //      bytesSent                 本次要发送的字节数（一个大文件可能要分多次发送）
+        //      totalBytesSent            已发送的字节数
+        //      totalBytesExpectedToSend  本次上传要发送的总字节数（即一个文件大小）
     }];
-    QNUploadManager *upManager = [[QNUploadManager alloc] initWithConfiguration:config];
-    [upManager putFile:filePath key:fileName token:token  complete:^(QNResponseInfo *info, NSString *key, NSDictionary *resp) {
-        if (resp) {
-            success(key,resp);
-        }else{
-            failure(@(info.statusCode),info.error.localizedDescription);
+
+    //监听上传结果
+    [put setFinishBlock:^(id outputObject, NSError *error) {
+        //可以从 outputObject 中获取 response 中 etag 或者自定义头部等信息
+        if (error) {
+            failure(@(error.code),error.localizedDescription);
+            return;
         }
-    } option:nil];
+        QCloudUploadObjectResult * result = (QCloudUploadObjectResult *)outputObject;
+        NSArray *urlList = [result.location componentsSeparatedByString:@".com/"];
+        if (urlList.count == 2){
+            NSString *url = [NSString stringWithFormat:@"%@/%@",self.fileModel.customDomain,urlList[1]];
+            success(url,nil);
+            return;
+        }
+        success(result.location,nil);
+    }];
+
+    [[QCloudCOSTransferMangerService defaultCOSTransferManager] UploadObject:put];
+    
 }
-+ (void)mew_downloadAudioWithFileName:(NSString *)fileName musicUrl:(NSString *)musicUrl mainFileName:(NSString *)mainFileName completion:(void (^) (BOOL isSuccess, NSString *editAudioPath))completion{
+/// 上传一个文件
+/// @param data 文件
+/// @param fileName 文件的名字
+/// @param success 成功
+/// @param failure 失败
+- (void)QCloudUploadFileWithData:(NSData *)data
+              named:(NSString *)fileName
+            success:(void (^)(NSString *key, NSDictionary *resp))success
+                 failure:(void (^)(NSNumber *resCode, NSString *message))failure {
+    
+    
+    QCloudCOSXMLUploadObjectRequest* put = [QCloudCOSXMLUploadObjectRequest new];
+\
+    // 存储桶名称，由BucketName-Appid 组成，可以在COS控制台查看 https://console.cloud.tencent.com/cos5/bucket
+    put.bucket = self.fileModel.bucket;
+    // 对象键，是对象在 COS 上的完整路径，如果带目录的话，格式为 "video/xxx/movie.mp4"
+    put.object = fileName;
+    //需要上传的对象内容。可以传入NSData*或者NSURL*类型的变量
+    put.body =  data;
+    //监听上传进度
+    [put setSendProcessBlock:^(int64_t bytesSent,
+                                int64_t totalBytesSent,
+                                int64_t totalBytesExpectedToSend) {
+        //      bytesSent                 本次要发送的字节数（一个大文件可能要分多次发送）
+        //      totalBytesSent            已发送的字节数
+        //      totalBytesExpectedToSend  本次上传要发送的总字节数（即一个文件大小）
+    }];
+
+    //监听上传结果
+    [put setFinishBlock:^(id outputObject, NSError *error) {
+        //可以从 outputObject 中获取 response 中 etag 或者自定义头部等信息
+        if (error) {
+            failure(@(error.code),error.localizedDescription);
+            return;
+        }
+        QCloudUploadObjectResult * result = (QCloudUploadObjectResult *)outputObject;
+        NSArray *urlList = [result.location componentsSeparatedByString:@".com/"];
+        if (urlList.count == 2){
+            NSString *url = [NSString stringWithFormat:@"%@/%@",self.fileModel.customDomain,urlList[1]];
+            success(url,nil);
+            return;
+        }
+        success(result.location,nil);
+    }];
+
+    [[QCloudCOSTransferMangerService defaultCOSTransferManager] UploadObject:put];
+    
+}
+/// 上传一个Image
+/// @param image 图片
+/// @param imageName 图片的名字
+
+/// @param success 成功
+/// @param failure 失败
+- (void)QCloudUploadImage:(NSData *)data
+              named:(NSString *)name
+            success:(void (^)(NSString *key, NSDictionary *resp))success
+            failure:(void (^)(NSNumber *resCode, NSString *message))failure{
+   
+    QCloudCOSXMLUploadObjectRequest* put = [QCloudCOSXMLUploadObjectRequest new];
+    put.bucket = self.fileModel.bucket;
+    // 对象键，是对象在 COS 上的完整路径，如果带目录的话，格式为 "video/xxx/movie.mp4"
+    put.object = name;
+    //需要上传的对象内容。可以传入NSData*或者NSURL*类型的变量
+    put.body = data;
+    //监听上传进度
+    [put setSendProcessBlock:^(int64_t bytesSent,
+                                int64_t totalBytesSent,
+                                int64_t totalBytesExpectedToSend) {
+        //      bytesSent                 本次要发送的字节数（一个大文件可能要分多次发送）
+        //      totalBytesSent            已发送的字节数
+        //      totalBytesExpectedToSend  本次上传要发送的总字节数（即一个文件大小）
+    }];
+
+    //监听上传结果
+    [put setFinishBlock:^(id outputObject, NSError *error) {
+        
+        if (error) {
+            failure(@(error.code),error.localizedDescription);
+            return;
+        }
+        QCloudUploadObjectResult * result = (QCloudUploadObjectResult *)outputObject;
+        NSArray *urlList = [result.location componentsSeparatedByString:@".com/"];
+        if (urlList.count == 2){
+            NSString *url = [NSString stringWithFormat:@"%@/%@",self.fileModel.customDomain,urlList[1]];
+            success(url,nil);
+            return;
+        }
+        success(result.location,nil);
+    }];
+
+    [[QCloudCOSTransferMangerService defaultCOSTransferManager] UploadObject:put];
+}
+
+
++(void)downloadAudioWithFileName:(NSString *)fileName musicUrl:(NSString *)musicUrl mainFileName:(NSString *)mainFileName completion:(void (^) (BOOL isSuccess, NSString *editAudioPath))completion {
     AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
     NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:musicUrl]];
     NSURLSessionDownloadTask *download = [manager downloadTaskWithRequest:request progress:^(NSProgress * _Nonnull downloadProgress) {

xplan-ios/Base/Tool/File/YinUploadFileModel.h

@@ -0,0 +1,24 @@
+//
+//  YinUploadFileModel.h
+//  xplan-ios
+//
+//  Created by duoban on 2024/3/26.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface YinUploadFileModel : NSObject
+@property(nonatomic,copy) NSString *secretId;
+@property(nonatomic,copy) NSString *secretKey;
+@property(nonatomic,copy) NSString *sessionToken;
+@property(nonatomic,copy) NSString *bucket;
+@property(nonatomic,copy) NSString *region;
+@property(nonatomic,copy) NSString *customDomain;
+@property(nonatomic,assign) long startTime;
+@property(nonatomic,assign) long expireTime;
+@property(nonatomic,copy) NSString *appId;
+@end
+
+NS_ASSUME_NONNULL_END

xplan-ios/Base/Tool/File/YinUploadFileModel.m

@@ -0,0 +1,12 @@
+//
+//  YinUploadFileModel.m
+//  xplan-ios
+//
+//  Created by duoban on 2024/3/26.
+//
+
+#import "YinUploadFileModel.h"
+
+@implementation YinUploadFileModel
+
+@end

xplan-ios/Base/Tool/NSString/NSString+Utils.h

@@ -32,6 +32,7 @@ NS_ASSUME_NONNULL_BEGIN
 + (NSInteger) getDay:(long) time;
 + (NSString *)calculateConstellationWithMonth:(long)time;
 + (NSString *)calculateAge:(long)time;
++(NSString *)createUUID;
 @end
 
 NS_ASSUME_NONNULL_END

xplan-ios/Base/Tool/NSString/NSString+Utils.m

@@ -7,7 +7,7 @@
 
 #import "NSString+Utils.h"
 #import <CommonCrypto/CommonDigest.h>
-
+#import "NSDate+DateUtils.h"
 @implementation NSString (Utils)
 
 ///是否是正确的手机号
@@ -246,5 +246,15 @@
     NSLog(@"用户年龄是%ld",userAge);
     return [NSString stringWithFormat:@"%ld", userAge];
 }
++(NSString *)createUUID{
 
+    CFUUIDRef uuid;
+    CFStringRef uuidText;
+    uuid = CFUUIDCreate(NULL);
+    uuidText = CFUUIDCreateString(NULL, uuid);
+    NSString *time = [NSDate getNowTimeTimestamp];
+    NSString *result = [NSString stringWithFormat:@"%@%@",uuidText,time];
+    return [result MD5String];
+
+}
 @end

xplan-ios/Base/Tool/UploadImage/UploadImage.h

@@ -1,37 +0,0 @@
-//
-//  UploadImage.h
-//  xplan-ios
-//
-//  Created by 冯硕 on 2021/9/24.
-// 上传图片类
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface UploadImage : NSObject
-/// 上传一个Image
-/// @param image 图片
-/// @param imageName 图片的名字
-/// @param token token
-/// @param success 成功
-/// @param failure 失败
-+ (void)uploadImage:(UIImage *)image
-			  named:(NSString *)imageName
-			  token:(NSString *)token
-			success:(void (^)(NSString *key, NSDictionary *resp))success
-			failure:(void (^)(NSNumber *resCode, NSString *message))failure;
-/// 上传一个gif图片
-/// @param data 图片
-/// @param imageName 图片的名字
-/// @param token token
-/// @param success 成功
-/// @param failure 失败
-+ (void)uploadGifImageData:(NSData *)data
-              named:(NSString *)imageName
-              token:(NSString *)token
-            success:(void (^)(NSString *key, NSDictionary *resp))success
-                   failure:(void (^)(NSNumber *resCode, NSString *message))failure;
-@end
-
-NS_ASSUME_NONNULL_END

xplan-ios/Base/Tool/UploadImage/UploadImage.m

@@ -1,63 +0,0 @@
-//
-//  UploadImage.m
-//  xplan-ios
-//
-//  Created by 冯硕 on 2021/9/24.
-//
-
-#import "UploadImage.h"
-#import <Qiniu/QiniuSDK.h>
-
-@implementation UploadImage
-
-/// 上传一个Image
-/// @param image 图片
-/// @param imageName 图片的名字
-/// @param token token
-/// @param success 成功
-/// @param failure 失败
-+ (void)uploadImage:(UIImage *)image
-			  named:(NSString *)imageName
-			  token:(NSString *)token
-			success:(void (^)(NSString *key, NSDictionary *resp))success
-			failure:(void (^)(NSNumber *resCode, NSString *message))failure{
-	QNConfiguration *config = [QNConfiguration build:^(QNConfigurationBuilder *builder) {
-		builder.zone = [QNFixedZone zone2];
-		
-	}];
-	QNUploadManager *upManager = [[QNUploadManager alloc] initWithConfiguration:config];
-	NSData *data = UIImageJPEGRepresentation(image, 0.5);
-	[upManager putData:data key:imageName token:token complete:^(QNResponseInfo *info, NSString *key, NSDictionary *resp) {
-		if (resp) {
-			success(key,resp);
-		}else{
-			failure(@(info.statusCode),info.error.localizedDescription);
-		}
-	} option:nil];
-}
-/// 上传一个gif图片
-/// @param data 图片
-/// @param imageName 图片的名字
-/// @param token token
-/// @param success 成功
-/// @param failure 失败
-+ (void)uploadGifImageData:(NSData *)data
-              named:(NSString *)imageName
-              token:(NSString *)token
-            success:(void (^)(NSString *key, NSDictionary *resp))success
-            failure:(void (^)(NSNumber *resCode, NSString *message))failure{
-    QNConfiguration *config = [QNConfiguration build:^(QNConfigurationBuilder *builder) {
-        builder.zone = [QNFixedZone zone2];
-        
-    }];
-    QNUploadManager *upManager = [[QNUploadManager alloc] initWithConfiguration:config];
-   
-    [upManager putData:data key:imageName token:token complete:^(QNResponseInfo *info, NSString *key, NSDictionary *resp) {
-        if (resp) {
-            success(key,resp);
-        }else{
-            failure(@(info.statusCode),info.error.localizedDescription);
-        }
-    } option:nil];
-}
-@end

xplan-ios/Base/UI/UIImage/UIImage+Utils.h

@@ -52,4 +52,5 @@ typedef NS_ENUM(NSUInteger, GradientType) {
 + (BOOL)isGifWithImageData: (NSData *)data;
 + (NSTimeInterval)durationForGifData:(NSData *)data;
 +(UIImage *)mew_setImageGaussBlur:(UIImage *)image value:(CGFloat )value;
++ (NSString *)contentTypeWithImageData: (NSData *)data;
 @end

xplan-ios/Global/XPConstant.m

@@ -43,7 +43,7 @@ NSString * const KeyWithType(KeyType type) {
 		///正式环境
 		@(YES):@{
 			@(KeyType_PasswordEncode)           : @"1ea53d260ecf11e7b56e00163e046a26",
-			@(KeyType_NTESQuickLoginBusinessId) : @"200c83103d4a413591c7969dd8d4d6e2",
+			@(KeyType_NTESQuickLoginBusinessId) : @"57ccd6209f12437496611aec8c315c46",
 			@(KeyType_QQAppid)                  : @"102044928",
 			@(KeyType_QQSecret)                 : @"715dd2601777347cd57af77c3e28402f",
 			@(KeyType_WechatAppid)              : @"wx4b772d5ebc964a38",
@@ -66,7 +66,7 @@ NSString * const KeyWithType(KeyType type) {
         ///测试环境
 		@(NO):@{
 			@(KeyType_PasswordEncode)           : @"1ea53d260ecf11e7b56e00163e046a26",
-			@(KeyType_NTESQuickLoginBusinessId) : @"200c83103d4a413591c7969dd8d4d6e2",
+			@(KeyType_NTESQuickLoginBusinessId) : @"57ccd6209f12437496611aec8c315c46",
 			@(KeyType_QQAppid)                  : @"102044928",
 			@(KeyType_QQSecret)                 : @"715dd2601777347cd57af77c3e28402f",
 			@(KeyType_WechatAppid)              : @"wx4b772d5ebc964a38",

xplan-ios/Global/XPHtmlUrl.h

@@ -86,6 +86,8 @@ typedef NS_ENUM(NSUInteger, URLType) {
 	kXinZuoStarURL,
     ///特权卡
     kPrivilegeCardURL,
+    ///礼物等级说明
+    kGiftLevelURL,
 };
 
 NSString * const URLWithType(URLType type);

xplan-ios/Global/XPHtmlUrl.m

@@ -55,6 +55,7 @@ NSString * const URLWithType(URLType type) {
         @(kRedPacketRuleURL)     : @"modules/rule/red-packet-rule.html",///红包规则
 		@(kXinZuoStarURL)        : @"activity/act-constellation/index.html",///星座礼物
         @(kPrivilegeCardURL)     : @"modules/rule/privilegeCardRule.html",///特权卡说明
+        @(kGiftLevelURL)         : @"modules/rule/giftWallRule.html",///礼物等级说明
 	};
 	NSString * url = [dic objectForKey:@(type)];
 	return [NSString stringWithFormat:@"%@/%@",prefix, url];

xplan-ios/Info.plist

@@ -136,6 +136,8 @@
 	<false/>
 	<key>linkedme_key</key>
 	<dict>
+		<key>New item</key>
+		<string>“音萌”需要您的同意,才可以访问进行拍照并上传您的图片，然后展示在您的个人主页上，便于他人查看</string>
 		<key>live</key>
 		<string>4e75ead0ff84424339dc8b0616e7094c</string>
 	</dict>

xplan-ios/Main/Home/View/Mew/MewHomeView/MewMainHomeMakeFriendVC.m

@@ -274,7 +274,7 @@
                     }
                 } else {
                     if(code == 10108){
-                        [self showRealNameAuthenticationTipsAlertView];
+                        [self showRealNameAuthenticationTipsAlertView:@"为了营造更安全的网络环境\n在 开通个人房间前\n需要先进行实名认证" isShowRoom:YES];
                         return;
                     }
                     [XCHUDTool showErrorWithMessage:msg];
@@ -422,7 +422,7 @@
                 NSFileManager *fileMgr = [[NSFileManager alloc] init];
                 [fileMgr createDirectoryAtPath:filePath withIntermediateDirectories:YES attributes:nil error:nil];
             }
-            [UploadFile mew_downloadAudioWithFileName:fileName musicUrl:model.playUrl mainFileName:@"kMewMainHomeVoiceCard" completion:^(BOOL isSuccess, NSString *editAudioPath) {
+            [UploadFile downloadAudioWithFileName:fileName musicUrl:model.playUrl mainFileName:@"kMewMainHomeVoiceCard" completion:^(BOOL isSuccess, NSString *editAudioPath) {
                 if(isSuccess){
                     [self mew_setplayAudioWithUrl:editAudioPath];
                     

xplan-ios/Main/Home/View/Mew/MewHomeView/MewMainHomeMoreGameVC.m

@@ -116,7 +116,7 @@
                 }
             } else {
                 if(code == 10108){
-                    [self showRealNameAuthenticationTipsAlertView];
+                    [self showRealNameAuthenticationTipsAlertView:@"为了营造更安全的网络环境\n在 开通个人房间前\n需要先进行实名认证" isShowRoom:YES];
                     return;
                 }
                 [XCHUDTool showErrorWithMessage:msg];

xplan-ios/Main/Home/View/Mew/MewHomeView/MewMainHomePartyVC.m

@@ -179,7 +179,7 @@
                     }
                 } else {
                     if(code == 10108){
-                        [self showRealNameAuthenticationTipsAlertView];
+                        [self showRealNameAuthenticationTipsAlertView:@"为了营造更安全的网络环境\n在 开通个人房间前\n需要先进行实名认证" isShowRoom:YES];
                         return;
                     }
                     [XCHUDTool showErrorWithMessage:msg];

xplan-ios/Main/Home/View/Mew/MewHomeView/MewMainHomeViewController.m

@@ -233,6 +233,10 @@
         if (code == 200) {
             RoomInfoModel * roomInfo = [RoomInfoModel modelWithJSON:data.data];
             if (roomInfo.isReselect) {
+                if(self.mewInfoModel.isCertified == NO && [ClientConfig shareConfig].configInfo.certificationType > 0){
+                    [self showRealNameAuthenticationTipsAlertView:@"为了营造更安全的网络环境\n在 开通个人房间前\n需要先进行实名认证" isShowRoom:YES] ;
+                    return;
+                }
                 XPLittleGameRoomOpenView * roomOpenView = [[XPLittleGameRoomOpenView alloc] init];
                 roomOpenView.roomInfo = roomInfo;
                 roomOpenView.currentVC = self;
@@ -243,7 +247,7 @@
         } else {
             if(code == 10108 && self.mewInfoModel){
                 if(self.mewInfoModel.isCertified == NO){
-                    [self showRealNameAuthenticationTipsAlertView];
+                    [self showRealNameAuthenticationTipsAlertView:@"为了营造更安全的网络环境\n在 开通个人房间前\n需要先进行实名认证" isShowRoom:YES];
                 }
                 return;
             }