图标更换

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,6 +219,8 @@
 		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 */; };
@@ -825,7 +833,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 */; };
@@ -1650,6 +1657,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 +1766,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 +1827,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; };
@@ -2879,8 +2902,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>"; };
@@ -7047,8 +7068,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 +7783,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 +7820,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 */,
@@ -9994,12 +10025,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 +10439,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 +10465,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 +10588,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 */,
@@ -10998,6 +11037,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 +11094,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 */,
@@ -11387,6 +11426,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 +11435,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 +11446,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 +11675,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 +11691,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.0;
+				MARKETING_VERSION = 2.1.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -11896,7 +11938,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 +11954,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.0;
+				MARKETING_VERSION = 2.1.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

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/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/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/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/MewHomeApi/Api+MewHomeApi.h

@@ -48,6 +48,8 @@ NS_ASSUME_NONNULL_BEGIN
 +(void)mew_RequsetMainHomeGameFriend:(HttpRequestHelperCompletion)completion;
 ///大神推荐
 +(void)mew_RequestMainHomeFriendMahogany:(HttpRequestHelperCompletion)completion;
+///请求用户信息
++ (void)mew_RequestMainHomeUserInfo:(HttpRequestHelperCompletion)completion uid:(NSString *)uid;
 @end
 
 NS_ASSUME_NONNULL_END

xplan-ios/Main/Home/View/Mew/MewHomeApi/Api+MewHomeApi.m

@@ -84,4 +84,8 @@
     [self makeRequest:@"home/mahogany" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, nil];
     
 }
+///请求用户信息
++ (void)mew_RequestMainHomeUserInfo:(HttpRequestHelperCompletion)completion uid:(NSString *)uid {
+    [self makeRequest:@"user/get" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, uid, nil];
+}
 @end

xplan-ios/Main/Home/View/Mew/MewHomeManager/MewHomeManager.h

@@ -6,7 +6,7 @@
 //
 
 #import "BaseMvpPresenter.h"
-
+#import "UserInfoModel.h"
 NS_ASSUME_NONNULL_BEGIN
 
 @interface MewHomeManager : BaseMvpPresenter
@@ -29,6 +29,8 @@ NS_ASSUME_NONNULL_BEGIN
 -(void)mew_getMainHomeGameFriendList;
 ///大神推荐
 -(void)mew_RequestMainHomeFriendMahoganyList;
+///请求用户信息
+- (void)mew_getMainHomeUserInfo;
 @end
 
 NS_ASSUME_NONNULL_END

xplan-ios/Main/Home/View/Mew/MewHomeManager/MewHomeManager.m

@@ -114,8 +114,8 @@
         NSArray *list = [MewMainHomeHotRoomModel modelsWithArray:data.data[@"playRooms"]];
         [[self getView]mew_getMainHomeGameFriendListSuccess:list];
         } fail:^(NSInteger code, NSString * _Nullable msg) {
-            
-        } showLoading:YES errorToast:YES]];
+            [[self getView]mew_getMainHomeGameFriendListFail];
+        }  errorToast:YES]];
 }
 ///大神推荐
 -(void)mew_RequestMainHomeFriendMahoganyList{
@@ -126,4 +126,15 @@
             
         }]];
 }
+///请求用户信息
+- (void)mew_getMainHomeUserInfo{
+    NSString * uid = [[AccountInfoStorage instance] getUid];
+    if (!uid.length) {
+        return;
+    }
+    [Api getUserInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) {
+        UserInfoModel * infoModel = [UserInfoModel modelWithDictionary:data.data];
+        [[self getView] mew_RequestMainHomeUserInfoSuccess:infoModel];
+    }] uid:uid];
+}
 @end

xplan-ios/Main/Home/View/Mew/MewHomeProtocol/MewMainHomeProtocol.h

@@ -6,7 +6,7 @@
 //
 
 #import <Foundation/Foundation.h>
-
+@class UserInfoModel;
 NS_ASSUME_NONNULL_BEGIN
 
 @protocol MewMainHomeProtocol <NSObject>
@@ -37,10 +37,14 @@ NS_ASSUME_NONNULL_BEGIN
 -(void)mew_getMainHomeLittleGameListSuccess:(NSArray *)list;
 ///获取游戏列表用户成功
 -(void)mew_getMainHomeGameFriendListSuccess:(NSArray *)list;
+///获取游戏列表失败
+-(void)mew_getMainHomeGameFriendListFail;
 ///获取大神推荐成功
 -(void)mew_RequestMainHomeFriendMahoganyListSuccess:(NSArray *)list;
 ///得到轮播图
 -(void)mew_getMainHomeBannerListSuccess:(NSArray *)list;
+///请求用户信息成功
+-(void)mew_RequestMainHomeUserInfoSuccess:(UserInfoModel *)userInfo;
 @end
 
 NS_ASSUME_NONNULL_END

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];

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

@@ -38,14 +38,19 @@
     [super viewDidLoad];
     [self installUI];
     [self installConstraints];
-    [self mew_headerRefresh];
+    [self initHeaderAndFooterRrfresh];
 }
 -(void)installUI{
     [self.view addSubview:self.mewBgImageView];
     [self.view addSubview:self.mewBackBtn];
     [self.view addSubview:self.mewCollectionView];
 }
+- (void)initHeaderAndFooterRrfresh {
+    MewRefreshSvgaHeader *header = [MewRefreshSvgaHeader headerWithRefreshingTarget:self refreshingAction:@selector(mew_headerRefresh)];
+    self.mewCollectionView.mj_header = header;
+    [self.mewCollectionView.mj_header beginRefreshing];
 
+}
 -(void)mew_headerRefresh{
     [self.presenter mew_getMainHomeLittleGameList];
     [self.presenter mew_getMainHomeGameFriendList];
@@ -76,9 +81,13 @@
 }
 ///获取游戏列表用户成功
 -(void)mew_getMainHomeGameFriendListSuccess:(NSArray *)list{
+    [self.mewCollectionView.mj_header endRefreshing];
     self.mewRoomList = [NSMutableArray arrayWithArray:list];
     [self.mewCollectionView reloadData];
 }
+-(void)mew_getMainHomeGameFriendListFail{
+    [self.mewCollectionView.mj_header endRefreshing];
+}
 #pragma mark - MewMainHomeMoreGameHeadViewDelegate
 - (void)mew_selectGameAction:(MewMainHomeLittleGameInfoModel *)gameInfo{
     [StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventRecent_homepage_moregame_tab_click eventAttributes:@{@"name":gameInfo.name}];
@@ -107,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

@@ -19,7 +19,8 @@
 #import "XPLittleGameRoomOpenView.h"
 #import "XPTeenagerHomeView.h"
 #import "XPWeakTimer.h"
-
+#import "MewHomeManager.h"
+#import "UserInfoModel.h"
 @interface MewMainHomeViewController ()<MewMainHomePartyVCDelegate,MewMainHomeMakeFriendVCDelegate,MewMainHomeNavViewDelegate,JXCategoryViewDelegate,JXPagerViewDelegate,JXPagerMainTableViewGestureDelegate>
 {
     NSTimer * _mewTimer;
@@ -39,12 +40,15 @@
 @property(nonatomic,strong) MewMainHomeMakeFriendVC *mewMakeFriendVC;
 ///青少年空白view
 @property (nonatomic, strong) XPTeenagerHomeView *mewTeenagerView;
+@property(nonatomic,strong) UserInfoModel *mewInfoModel;
 @end
 
 @implementation MewMainHomeViewController
 
 @synthesize parentMode = _parentMode;
-
+- (MewHomeManager *)createPresenter {
+    return [[MewHomeManager alloc] init];
+}
 - (void)setParentMode:(BOOL)parentMode {
     _parentMode = parentMode;
     if (parentMode) {
@@ -134,8 +138,13 @@
 - (void)initHeaderAndFooterRrfresh {
     MewRefreshSvgaHeader *header = [MewRefreshSvgaHeader headerWithRefreshingTarget:self refreshingAction:@selector(mew_headerRefresh)];
     self.mewPagingView.mainTableView.mj_header = header;
+    
+    [self.presenter mew_getMainHomeUserInfo];
 
-
+}
+///请求用户信息成功
+-(void)mew_RequestMainHomeUserInfoSuccess:(UserInfoModel *)userInfo{
+    self.mewInfoModel = userInfo;
 }
 -(void)mew_headerRefresh{
     if(self.mewTopTitleView.selectedIndex == 1){
@@ -224,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;
@@ -232,6 +245,12 @@
                 [XPRoomViewController openRoom:roomUid viewController:self];
             }
         } else {
+            if(code == 10108 && self.mewInfoModel){
+                if(self.mewInfoModel.isCertified == NO){
+                    [self showRealNameAuthenticationTipsAlertView:@"为了营造更安全的网络环境\n在 开通个人房间前\n需要先进行实名认证" isShowRoom:YES];
+                }
+                return;
+            }
             [self showErrorToast:msg];
         }
     } uid:roomUid intoUid:roomUid];

xplan-ios/Main/IM/Model/AttachmentModel.h

@@ -104,6 +104,8 @@ typedef NS_ENUM(NSUInteger, CustomMessageType) {
 	CustomMessageType_Starred_Kitchen = 96,
     ///小时榜更新
     CustomMessageType_Hour_Update = 97,
+    ///礼物升级更新
+    CustomMessageType_UnlockGift_Update = 98,
     ///特权卡
     CustomMessageType_Privilege_Card = 102,
     ///发起邀请
@@ -555,6 +557,13 @@ typedef NS_ENUM(NSInteger, CustomMessageHourUpdate) {
 
     Custom_Message_Sub_Hour_Update = 971,
    
+};
+//解锁礼物升级 CustomMessageType_UnlockGift_Update
+typedef NS_ENUM(NSInteger, CustomMessageUnlockGiftUpdate) {
+
+    Custom_Message_Sub_UnlockGift = 981,
+    Custom_Message_Sub_DressUpGift = 982,
+   
 };
 
 ///发起邀请 CustomMessageType_Initiat_Invitation

xplan-ios/Main/Login/View/LoginFullInfoViewController.m

@@ -200,7 +200,7 @@ UIKIT_EXTERN NSString * kUserCompleteInfoFinishKey;
 	if ([self.presenter getThirdUserInfo] && [self.presenter getThirdUserInfo].avatarUrl.length > 0) {
 		avatar = [self.presenter getThirdUserInfo].avatarUrl;
 	} else {
-		avatar =  @"https://image.nnbc123.cn/default_avatar.png";
+		avatar =  @"https://yinmeng-1318633625.cos.ap-guangzhou.myqcloud.com/default_avatar.png";
 	}
 	return avatar;
 }

xplan-ios/Main/Login/View/LoginViewController.m

@@ -80,6 +80,11 @@ typedef NS_ENUM(NSUInteger, XYLoginType) {
     [self setUpConstraints];
     [self setEvents];
     [self loginAnimation];
+    NTESQuickLoginManager *qlManager = [NTESQuickLoginManager sharedInstance];
+    BOOL shouldQL = [qlManager shouldQuickLogin];
+    if (!shouldQL) {
+        [_loginButton setTitle:@"手机号登录" forState:UIControlStateNormal];
+    }
 }
 
 - (void)viewWillAppear:(BOOL)animated {
@@ -168,6 +173,9 @@ typedef NS_ENUM(NSUInteger, XYLoginType) {
         make.bottom.mas_equalTo(self.authBubbleView).mas_offset(-6);
     }];
 
+    
+    
+    
 //#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
 //	[self.appleButton mas_makeConstraints:^(MASConstraintMaker *make) {
 //		make.width.mas_equalTo(50);
@@ -245,7 +253,7 @@ typedef NS_ENUM(NSUInteger, XYLoginType) {
 }
 
 - (void)phoneQuickLogin {
-	[self showLoading];
+	
 	// 在使用一键登录之前，请先调用shouldQuickLogin方法，判断当前上网卡的网络环境和运营商是否可以一键登录
 	@weakify(self)
 	NTESQuickLoginManager *qlManager = [NTESQuickLoginManager sharedInstance];
@@ -254,6 +262,7 @@ typedef NS_ENUM(NSUInteger, XYLoginType) {
 		[self phoneQuickLoginFail];
 		return;
 	}
+    [self showLoading];
 	[qlManager registerWithBusinessID:KeyWithType(KeyType_NTESQuickLoginBusinessId) configURL:nil extData:nil];
 	[qlManager getPhoneNumberCompletion:^(NSDictionary * _Nonnull resultDic) {
 		@strongify(self)
@@ -298,7 +307,7 @@ typedef NS_ENUM(NSUInteger, XYLoginType) {
 }
 
 - (void)phoneQuickLoginFail {
-    [self showErrorToast:@"一键登录失败，请检查手机网络状态。"];
+//    [self showErrorToast:@"一键登录失败，请检查手机网络状态。"];
 	LoginPhoneViewController *inputPhoneVC = [[LoginPhoneViewController alloc] init];
     [self.navigationController pushViewController:inputPhoneVC animated:YES];
 }

xplan-ios/Main/Message/View/Session/Content/MessageContentTweetView.m

@@ -90,7 +90,7 @@
 	
 	
 	CGFloat desHeight = [model.desc boundingRectWithSize:CGSizeMake(240, CGFLOAT_MAX) options:NSStringDrawingUsesFontLeading | NSStringDrawingUsesLineFragmentOrigin
-											attributes:[self messageTextAttibutes:[UIFont systemFontOfSize:13] color:[ThemeColor mainTextColor]] context:nil].size.height;
+											attributes:[self messageTextAttibutes:[UIFont systemFontOfSize:13] color:[ThemeColor mainTextColor]] context:nil].size.height + 10;
 	[self.subTitleLabel mas_updateConstraints:^(MASConstraintMaker *make) {
 		make.height.mas_equalTo(desHeight);
 	}];

xplan-ios/Main/Mine/Model/UserInfo/UserGiftWallInfoModel.h

@@ -22,6 +22,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,copy) NSString *picUrl;
 ///个数
 @property (nonatomic,assign) NSInteger reciveCount;
+@property(nonatomic,assign) int giftLevel;
 @end
 
 NS_ASSUME_NONNULL_END

xplan-ios/Main/Mine/Presenter/XPMineUserInfoEditPresenter.m

@@ -8,10 +8,11 @@
 #import "XPMineUserInfoEditPresenter.h"
 ///Api
 #import "Api+Mine.h"
+#import "NSMutableDictionary+Saft.h"
 ///Tool
 #import "AccountInfoStorage.h"
 #import "UploadImage.h"
-#import "NSMutableDictionary+Saft.h"
+
 ///Model
 #import "XPMineUserInfoEditModel.h"
 #import "UserInfoModel.h"

xplan-ios/Main/Mine/View/Cell/MineInfo/XPMineDataGiftCollectionViewCell.m

@@ -22,6 +22,7 @@
 @property (nonatomic,strong) NetImageView *giftImageView;
 ///礼物个数
 @property (nonatomic,strong) UILabel *giftNumberLabel;
+
 @end
 
 @implementation XPMineDataGiftCollectionViewCell

xplan-ios/Main/Mine/View/Cell/MineInfo/XPMineDataGiftHeadCell.h

@@ -0,0 +1,26 @@
+//
+//  XPMineDataGiftHeadCell.h
+//  xplan-ios
+//
+//  Created by duoban on 2024/1/30.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+@class XPMineDataGiftHeadCell, UserGiftWallInfoModel;
+@protocol XPMineDataGiftHeadCellDelegate <NSObject>
+
+- (void)xPMineDataGiftHeadCell:(XPMineDataGiftHeadCell *)view didClickMore:(UIButton *)sender;
+- (void)xPMineDataGiftHeadCell:(XPMineDataGiftHeadCell *)view didClickNormal:(UIButton *)sender;
+- (void)xPMineDataGiftHeadCell:(XPMineDataGiftHeadCell *)view didClickLucky:(UIButton *)sender;
+@end
+@interface XPMineDataGiftHeadCell : UICollectionViewCell
+@property(nonatomic,copy) NSString *userId;
+
+///代理
+@property (nonatomic,weak) id<XPMineDataGiftHeadCellDelegate> delegate;
+@end
+
+
+NS_ASSUME_NONNULL_END

xplan-ios/Main/Mine/View/Cell/MineInfo/XPMineDataGiftHeadCell.m

@@ -0,0 +1,198 @@
+//
+//  XPMineDataGiftHeadCell.m
+//  xplan-ios
+//
+//  Created by duoban on 2024/1/30.
+//
+
+#import "XPMineDataGiftHeadCell.h"
+
+@interface XPMineDataGiftHeadCell ()
+@property (nonatomic,strong) UIButton *arrowButton;
+///标题
+@property (nonatomic,strong) UILabel *titleLabel;
+@property(nonatomic,strong) UIImageView *tipsView;
+@property(nonatomic,strong) UILabel *levelTitelView;
+@property(nonatomic,strong) UIButton *normalGiftBtn;
+@property(nonatomic,strong) UIButton *luckyGiftBtn;
+@property(nonatomic,strong) UIView *lineView;
+@property(nonatomic,strong) UIView *bgView;
+@end
+
+@implementation XPMineDataGiftHeadCell
+-(instancetype)initWithFrame:(CGRect)frame{
+    self = [super initWithFrame:frame];
+    if(self){
+        [self installUI];
+        [self installConstraints];
+    }
+    return self;
+}
+-(void)installUI{
+    self.contentView.backgroundColor = [UIColor whiteColor];
+    [self.contentView addSubview:self.bgView];
+    [self.contentView addSubview:self.titleLabel];
+    [self.contentView addSubview:self.tipsView];
+    [self.contentView addSubview:self.levelTitelView];
+    [self.contentView addSubview:self.arrowButton];
+    [self.contentView addSubview:self.normalGiftBtn];
+    [self.contentView addSubview:self.luckyGiftBtn];
+    [self.contentView addSubview:self.lineView];
+}
+-(void)installConstraints{
+    [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.top.right.equalTo(self.contentView);
+        make.height.mas_equalTo(10);
+    }];
+    [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(self.contentView).offset(12);
+        make.top.mas_equalTo(self.contentView).offset(18);
+    }];
+    [self.levelTitelView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.right.mas_equalTo(-13);
+        make.centerY.equalTo(self.titleLabel);
+    }];
+    [self.tipsView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.right.equalTo(self.levelTitelView.mas_left).mas_offset(-4);
+        make.centerY.equalTo(self.levelTitelView);
+        make.width.height.mas_equalTo(12);
+    }];
+    [self.arrowButton mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.height.mas_equalTo(12);
+        make.left.equalTo(self.tipsView);
+        make.right.equalTo(self.levelTitelView);
+        make.centerY.equalTo(self.titleLabel);
+    }];
+    [self.normalGiftBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(62);
+        make.right.equalTo(self.contentView.mas_centerX).mas_offset(-20);
+        make.width.mas_equalTo(58);
+        make.height.mas_equalTo(20);
+    }];
+    [self.luckyGiftBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(62);
+        make.left.equalTo(self.contentView.mas_centerX).mas_offset(20);
+        make.width.mas_equalTo(58);
+        make.height.mas_equalTo(20);
+    }];
+    [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.width.mas_equalTo(13);
+        make.height.mas_equalTo(4);
+        make.top.equalTo(self.normalGiftBtn.mas_bottom).mas_offset(1);
+        make.centerX.equalTo(self.normalGiftBtn);
+    }];
+}
+-(void)didClickBtnAction:(UIButton *)sender{
+ 
+    if(sender == self.normalGiftBtn){
+        self.normalGiftBtn.selected = YES;
+        self.luckyGiftBtn.selected = NO;
+        self.normalGiftBtn.titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium];
+        self.luckyGiftBtn.titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightRegular];
+        [self.lineView.superview layoutIfNeeded];
+        [UIView animateWithDuration:0.5 animations:^{
+            [self.lineView mas_remakeConstraints:^(MASConstraintMaker *make) {
+                make.width.mas_equalTo(13);
+                make.height.mas_equalTo(4);
+                make.top.equalTo(self.normalGiftBtn.mas_bottom).mas_offset(1);
+                make.centerX.equalTo(self.normalGiftBtn);
+            }];
+        }];
+        if(self.delegate && [self.delegate respondsToSelector:@selector(xPMineDataGiftHeadCell:didClickNormal:)]){
+            [self.delegate xPMineDataGiftHeadCell:self didClickNormal:sender];
+        }
+        return;
+    }
+    self.normalGiftBtn.selected = NO;
+    self.luckyGiftBtn.selected = YES;
+    self.luckyGiftBtn.titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium];
+    self.normalGiftBtn.titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightRegular];
+    [self.lineView.superview layoutIfNeeded];
+    [UIView animateWithDuration:0.5 animations:^{
+        [self.lineView mas_remakeConstraints:^(MASConstraintMaker *make) {
+            make.width.mas_equalTo(13);
+            make.height.mas_equalTo(4);
+            make.top.equalTo(self.normalGiftBtn.mas_bottom).mas_offset(1);
+            make.centerX.equalTo(self.luckyGiftBtn);
+        }];
+    }];
+    if(self.delegate && [self.delegate respondsToSelector:@selector(xPMineDataGiftHeadCell:didClickLucky:)]){
+        [self.delegate xPMineDataGiftHeadCell:self didClickLucky:sender];
+    }
+}
+-(void)arrowButtonAction:(UIButton *)sender{
+    if(self.delegate && [self.delegate respondsToSelector:@selector(xPMineDataGiftHeadCell:didClickMore:)]){
+        [self.delegate xPMineDataGiftHeadCell:self didClickMore:sender];
+    }
+}
+#pragma mark - 懒加载
+- (UIButton *)normalGiftBtn{
+    if(!_normalGiftBtn){
+        _normalGiftBtn = [UIButton new];
+        [_normalGiftBtn setTitle:@"普通礼物" forState:UIControlStateNormal];
+        [_normalGiftBtn setTitleColor:UIColorFromRGB(0x2B2D33) forState:UIControlStateSelected];
+        [_normalGiftBtn setTitleColor:UIColorFromRGB(0xA2A7B8) forState:UIControlStateNormal];
+        _normalGiftBtn.titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium];
+        _normalGiftBtn.selected = YES;
+        [_normalGiftBtn addTarget:self action:@selector(didClickBtnAction:) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _normalGiftBtn;
+}
+- (UIButton *)luckyGiftBtn{
+    if(!_luckyGiftBtn){
+        _luckyGiftBtn = [UIButton new];
+        [_luckyGiftBtn setTitle:@"幸运礼物" forState:UIControlStateNormal];
+        [_luckyGiftBtn setTitleColor:UIColorFromRGB(0x2B2D33) forState:UIControlStateSelected];
+        [_luckyGiftBtn setTitleColor:UIColorFromRGB(0xA2A7B8) forState:UIControlStateNormal];
+        _luckyGiftBtn.titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightRegular];
+        [_luckyGiftBtn addTarget:self action:@selector(didClickBtnAction:) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _luckyGiftBtn;
+}
+- (UIImageView *)tipsView{
+    if(!_tipsView){
+        _tipsView = [UIImageView new];
+        _tipsView.image = kImage(@"mine_user_info_gift_tip_icon");
+    }
+    return _tipsView;
+}
+- (UILabel *)levelTitelView{
+    if(!_levelTitelView){
+        _levelTitelView = [UILabel labelInitWithText:@"礼物等级说明" font:[UIFont systemFontOfSize:11 weight:UIFontWeightMedium] textColor:UIColorFromRGB(0xA2A7B8)];
+    }
+    return _levelTitelView;
+}
+- (UILabel *)titleLabel {
+    if (!_titleLabel) {
+        _titleLabel = [[UILabel alloc] init];
+        _titleLabel.text = @"礼物墙";
+        _titleLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium];
+        _titleLabel.textColor = [ThemeColor mainTextColor];
+    }
+    return _titleLabel;
+}
+- (UIButton *)arrowButton {
+    if (!_arrowButton) {
+        _arrowButton = [UIButton buttonWithType:UIButtonTypeCustom];
+        [_arrowButton addTarget:self action:@selector(arrowButtonAction:) forControlEvents:UIControlEventTouchUpInside];
+        [_arrowButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10];
+    }
+    return _arrowButton;
+}
+- (UIView *)lineView{
+    if(!_lineView){
+        _lineView = [UIView new];
+        _lineView.backgroundColor = UIColorFromRGB(0xFFDA24);
+        _lineView.layer.cornerRadius = 2;
+        _lineView.layer.masksToBounds = YES;
+    }
+    return _lineView;
+}
+- (UIView *)bgView{
+    if(!_bgView){
+        _bgView = [UIView new];
+        _bgView.backgroundColor = UIColorFromRGB(0xF8F8FB);
+    }
+    return _bgView;
+}
+@end

xplan-ios/Main/Mine/View/Cell/MineInfo/XPMineDataGiftTableViewCell.h

@@ -15,10 +15,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 @interface XPMineDataGiftTableViewCell : UITableViewCell
-///礼物墙中的礼物
-@property (nonatomic,strong) NSArray<UserGiftWallInfoModel *> *userGiftWall;
-///礼物墙中的幸运礼物礼物
-@property (nonatomic,strong) NSArray<UserGiftWallInfoModel *> *userLuckyBagGiftWall;
+@property(nonatomic,copy) NSString *userId;
+
 ///代理
 @property (nonatomic,weak) id<XPMineDataGiftTableViewCellDelegate> delegate;
 @end

xplan-ios/Main/Mine/View/Cell/MineInfo/XPMineDataGiftTableViewCell.m

@@ -25,6 +25,9 @@
 @property (nonatomic,strong) UIImageView * backImageView;
 ///显示更多
 @property (nonatomic,strong) UIButton *arrowButton;
+
+@property(nonatomic,strong) UIImageView *tipsView;
+@property(nonatomic,strong) UILabel *levelTitelView;
 ///标题
 @property (nonatomic,strong) UILabel *titleLabel;
 ///分页标题
@@ -56,6 +59,8 @@
 	[self.contentView addSubview:self.backImageView];
 	
 	[self.backImageView addSubview:self.titleLabel];
+    [self.backImageView addSubview:self.tipsView];
+    [self.backImageView addSubview:self.levelTitelView];
 	[self.backImageView addSubview:self.arrowButton];
 	[self.backImageView addSubview:self.titleView];
 	[self.backImageView addSubview:self.containerView];
@@ -72,11 +77,20 @@
 		make.left.mas_equalTo(self.backImageView).offset(15);
 		make.top.mas_equalTo(self.backImageView).offset(12);
 	}];
-	
+    [self.levelTitelView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.right.mas_equalTo(-13);
+        make.centerY.equalTo(self.titleLabel);
+    }];
+    [self.tipsView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.right.equalTo(self.levelTitelView.mas_left).mas_offset(-4);
+        make.centerY.equalTo(self.levelTitelView);
+        make.width.height.mas_equalTo(12);
+    }];
 	[self.arrowButton mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.size.mas_equalTo(CGSizeMake(13, 22));
-		make.centerY.mas_equalTo(self.titleView);
-		make.right.mas_equalTo(self.backImageView).offset(-15);
+        make.height.mas_equalTo(12);
+        make.left.equalTo(self.tipsView);
+        make.right.equalTo(self.levelTitelView);
+        make.centerY.equalTo(self.titleLabel);
 	}];
 	
 	[self.titleView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -111,23 +125,10 @@
 	}
 }
 
-#pragma mark - Getters And Setters
-- (void)setUserGiftWall:(NSArray<UserGiftWallInfoModel *> *)userGiftWall {
-	_userGiftWall = userGiftWall;
-	if (_userGiftWall.count > 12) {
-		NSMutableArray * array = [_userGiftWall mutableCopy];
-		_userGiftWall = [array subarrayWithRange:NSMakeRange(0, 12)];
-	}
-	self.normalGiftView.datasource = _userGiftWall;
-}
-
-- (void)setUserLuckyBagGiftWall:(NSArray<UserGiftWallInfoModel *> *)userLuckyBagGiftWall {
-	_userLuckyBagGiftWall = userLuckyBagGiftWall;
-	if (_userLuckyBagGiftWall.count > 12) {
-		NSMutableArray * array = [_userLuckyBagGiftWall mutableCopy];
-		_userLuckyBagGiftWall = [array subarrayWithRange:NSMakeRange(0, 12)];
-	}
-	self.luckyGiftView.datasource = _userLuckyBagGiftWall;
+-(void)setUserId:(NSString *)userId{
+    _userId = userId;
+    self.normalGiftView.userId = _userId;
+    self.luckyGiftView.userId = _userId;
 }
 
 - (UIImageView *)backImageView {
@@ -152,8 +153,6 @@
 - (UIButton *)arrowButton {
 	if (!_arrowButton) {
 		_arrowButton = [UIButton buttonWithType:UIButtonTypeCustom];
-		[_arrowButton setImage:[UIImage imageNamed:@"room_setting_arrow"] forState:UIControlStateNormal];
-		[_arrowButton setImage:[UIImage imageNamed:@"room_setting_arrow"] forState:UIControlStateSelected];
 		[_arrowButton addTarget:self action:@selector(arrowButtonAction:) forControlEvents:UIControlEventTouchUpInside];
 		[_arrowButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10];
 	}
@@ -205,16 +204,28 @@
 
 - (XPMineUserInfoGiftView *)normalGiftView {
 	if (!_normalGiftView) {
-		_normalGiftView = [[XPMineUserInfoGiftView alloc] init];
+		_normalGiftView = [[XPMineUserInfoGiftView alloc] initWithFrame:CGRectZero  type:@"1"];
 	}
 	return _normalGiftView;
 }
 
 - (XPMineUserInfoGiftView *)luckyGiftView {
 	if (!_luckyGiftView) {
-		_luckyGiftView = [[XPMineUserInfoGiftView alloc] init];
+        _luckyGiftView = [[XPMineUserInfoGiftView alloc] initWithFrame:CGRectZero  type:@"2"];;
 	}
 	return _luckyGiftView;
 }
-
+- (UIImageView *)tipsView{
+    if(!_tipsView){
+        _tipsView = [UIImageView new];
+        _tipsView.image = kImage(@"mine_user_info_gift_tip_icon");
+    }
+    return _tipsView;
+}
+- (UILabel *)levelTitelView{
+    if(!_levelTitelView){
+        _levelTitelView = [UILabel labelInitWithText:@"礼物等级说明" font:[UIFont systemFontOfSize:11 weight:UIFontWeightMedium] textColor:UIColorFromRGB(0xA2A7B8)];
+    }
+    return _levelTitelView;
+}
 @end

xplan-ios/Main/Mine/View/Cell/MineInfo/XPMineDataSkillCardCollectionViewCell.h

@@ -0,0 +1,25 @@
+//
+//  XPMineDataSkillCardCollectionViewCell.h
+//  xplan-ios
+//
+//  Created by duoban on 2024/1/30.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+@class XPMineDataSkillCardCollectionViewCell, MineSkillCardListInfoModel;
+@protocol XPMineDataSkillCardCollectionViewCell <NSObject>
+
+- (void)xPMineDataSkillCardTableViewCell:(XPMineDataSkillCardCollectionViewCell *)view didSelectItem:(nullable MineSkillCardListInfoModel *)skillInfo;
+
+@end
+
+@interface XPMineDataSkillCardCollectionViewCell : UICollectionViewCell
+@property (nonatomic,strong) NSArray *datasourece;
+///代理
+@property (nonatomic,weak) id<XPMineDataSkillCardCollectionViewCell> delegate;
+@end
+
+
+NS_ASSUME_NONNULL_END

xplan-ios/Main/Mine/View/Cell/MineInfo/XPMineDataSkillCardCollectionViewCell.m

@@ -0,0 +1,216 @@
+//
+//  XPMineDataSkillCardCollectionViewCell.m
+//  xplan-ios
+//
+//  Created by duoban on 2024/1/30.
+//
+
+#import "XPMineDataSkillCardCollectionViewCell.h"
+///Third
+#import <Masonry/Masonry.h>
+///Tool
+#import "ThemeColor.h"
+#import "NSArray+Safe.h"
+///View
+#import "XPMineDataSkillDataCollectionViewCell.h"
+@interface XPMineDataSkillCardCollectionViewCell()<UICollectionViewDelegate, UICollectionViewDataSource>
+///背景
+@property (nonatomic,strong) UIImageView * backImageView;
+///标题
+@property (nonatomic,strong) UILabel *titleLabel;
+///列表
+@property (nonatomic,strong) UICollectionView *collectionView;
+///空的容器
+@property (nonatomic,strong) UIView *emptyView;
+///为空
+@property (nonatomic,strong) UILabel *emptyLabel;
+///箭头
+@property (nonatomic,strong) UIImageView *arrowImageView;
+@property(nonatomic,strong) UIView *bgView;
+@end
+@implementation XPMineDataSkillCardCollectionViewCell
+-(instancetype)initWithFrame:(CGRect)frame{
+    self = [super initWithFrame:frame];
+    if(self){
+        [self initSubViews];
+        [self initSubViewConstraints];
+    }
+    return self;
+}
+
+
+#pragma mark - Private Method
+- (void)initSubViews {
+    self.backgroundColor = [UIColor clearColor];
+    [self.contentView addSubview:self.bgView];
+    [self.contentView addSubview:self.backImageView];
+    
+    [self.backImageView addSubview:self.titleLabel];
+    [self.backImageView addSubview:self.collectionView];
+    [self.backImageView addSubview:self.emptyView];
+
+    [self.emptyView addSubview:self.emptyLabel];
+    [self.emptyView addSubview:self.arrowImageView];
+}
+
+- (void)initSubViewConstraints {
+    [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.right.top.equalTo(self.contentView);
+        make.height.mas_equalTo(10);
+    }];
+    [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.right.mas_equalTo(self.contentView).inset(0);
+        make.top.mas_equalTo(self.contentView).offset(22);
+        make.bottom.mas_equalTo(self.contentView);
+    }];
+    
+    [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(self.backImageView).offset(15);
+        make.top.mas_equalTo(self.backImageView).offset(12);
+    }];
+    
+    [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(self.titleLabel);
+        make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(18);
+        make.height.mas_equalTo(47);
+        make.right.mas_equalTo(self.backImageView).offset(-6);
+    }];
+    
+    [self.emptyView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.right.mas_equalTo(self.backImageView).inset(18);
+        make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(12);
+        make.height.mas_equalTo(47);
+    }];
+
+    [self.arrowImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.size.mas_equalTo(CGSizeMake(6.5, 11));
+        make.centerY.mas_equalTo(self.emptyView);
+        make.right.mas_equalTo(self.emptyView).offset(-12);
+    }];
+
+    [self.emptyLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerY.mas_equalTo(self.emptyView);
+        make.centerX.mas_equalTo(self.emptyView);
+    }];
+}
+
+#pragma mark - UICollectionViewDelegate And UICollectionViewDatasource
+- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
+    return self.datasourece.count;
+}
+
+- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
+    XPMineDataSkillDataCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPMineDataSkillDataCollectionViewCell class]) forIndexPath:indexPath];
+    cell.skillInfo = [self.datasourece safeObjectAtIndex1:indexPath.row];
+    return cell;
+}
+
+- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
+    [collectionView deselectItemAtIndexPath:indexPath animated:YES];
+    if (self.datasourece.count > 0) {
+        MineSkillCardListInfoModel * skillInfo = [self.datasourece safeObjectAtIndex1:indexPath.row];
+        if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineDataSkillCardTableViewCell:didSelectItem:)]) {
+            [self.delegate xPMineDataSkillCardTableViewCell:self didSelectItem:skillInfo];
+        }
+    }
+}
+
+- (void)tapEmptySkillCard {
+    if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineDataSkillCardTableViewCell:didSelectItem:)]) {
+        [self.delegate xPMineDataSkillCardTableViewCell:self didSelectItem:nil];
+    }
+}
+
+#pragma mark - Getters And Setters
+- (void)setDatasourece:(NSArray *)datasourece {
+    _datasourece = datasourece;
+    if (_datasourece.count > 0) {
+        self.emptyView.hidden = YES;
+        self.collectionView.hidden = NO;
+    } else {
+        self.emptyView.hidden = NO;
+        self.collectionView.hidden = YES;
+    }
+    [self.collectionView reloadData];
+}
+
+- (UIImageView *)backImageView {
+    if (!_backImageView) {
+        _backImageView = [[UIImageView alloc] init];
+        _backImageView.userInteractionEnabled = YES;
+        _backImageView.backgroundColor =[ThemeColor appCellBackgroundColor];
+    }
+    return _backImageView;
+}
+
+
+- (UILabel *)titleLabel {
+    if (!_titleLabel) {
+        _titleLabel = [[UILabel alloc] init];
+        _titleLabel.text = @"技能卡";
+        _titleLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium];
+        _titleLabel.textColor = [ThemeColor mainTextColor];
+    }
+    return _titleLabel;
+}
+
+- (UICollectionView *)collectionView{
+    if (!_collectionView) {
+        UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init];
+        layout.scrollDirection = UICollectionViewScrollDirectionHorizontal;
+        layout.itemSize = CGSizeMake(142, 47);
+        layout.minimumLineSpacing = 10;
+        layout.sectionInset = UIEdgeInsetsMake(0, 0, 0, 0);
+        _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout];
+        _collectionView.dataSource = self;
+        _collectionView.showsHorizontalScrollIndicator = NO;
+        _collectionView.delegate = self;
+        _collectionView.tag = 1005;
+        _collectionView.backgroundColor = [UIColor clearColor];
+        [_collectionView registerClass:[XPMineDataSkillDataCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPMineDataSkillDataCollectionViewCell class])];
+        
+    }
+    return _collectionView;
+}
+
+- (UIView *)emptyView {
+    if (!_emptyView) {
+        _emptyView = [[UIView alloc] init];
+        _emptyView.backgroundColor = UIColorFromRGB(0xF4F7FF);
+        _emptyView.layer.masksToBounds = YES;
+        _emptyView.layer.cornerRadius = 8;
+        UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapEmptySkillCard)];
+        [_emptyView addGestureRecognizer:tap];
+    }
+    return _emptyView;
+}
+
+
+- (UIImageView *)arrowImageView {
+    if (!_arrowImageView) {
+        _arrowImageView = [[UIImageView alloc] init];
+        _arrowImageView.userInteractionEnabled = YES;
+        _arrowImageView.image = [UIImage imageNamed:@"common_right_arrow"];
+    }
+    return _arrowImageView;
+}
+
+- (UILabel *)emptyLabel {
+    if (!_emptyLabel) {
+        _emptyLabel = [[UILabel alloc] init];
+        _emptyLabel.text = @"还未添加技能卡喔";
+        _emptyLabel.font = [UIFont systemFontOfSize:12];
+        _emptyLabel.textAlignment = NSTextAlignmentCenter;
+        _emptyLabel.textColor = [ThemeColor secondTextColor];
+        _emptyLabel.userInteractionEnabled = YES;
+    }
+    return _emptyLabel;
+}
+- (UIView *)bgView{
+    if(!_bgView){
+        _bgView = [UIView new];
+        _bgView.backgroundColor = UIColorFromRGB(0xF8F8FB);
+    }
+    return _bgView;
+}
+@end

xplan-ios/Main/Mine/View/Cell/MineInfo/XPMineUserInfoGiftWallCollectionViewCell.m

@@ -16,10 +16,11 @@
 #import "UserGiftWallInfoModel.h"
 
 @interface XPMineUserInfoGiftWallCollectionViewCell ()
+@property(nonatomic,strong) UIImageView *bgImageView;
 ///礼物的图片
 @property (nonatomic,strong) NetImageView *giftImageView;
 ///礼物的数量
-@property (nonatomic,strong) UIButton *numberButton;
+@property (nonatomic,strong) UILabel *numberButton;
 ///礼物的名
 @property (nonatomic,strong) UILabel *giftNameLabel;
 ///礼物的价值容器
@@ -43,6 +44,7 @@
 #pragma mark - Private Method
 - (void)initSubViews {
 	self.backgroundColor = [UIColor clearColor];
+    [self.contentView addSubview:self.bgImageView];
 	[self.contentView addSubview:self.giftImageView];
 	[self.contentView addSubview:self.numberButton];
 	[self.contentView addSubview:self.giftNameLabel];
@@ -53,21 +55,25 @@
 }
 
 - (void)initSubViewConstraints {
+    [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.edges.equalTo(self.contentView);
+    }];
 	[self.giftImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.left.right.mas_equalTo(self.contentView).inset(5);
-		make.top.mas_equalTo(self.contentView);
-		make.height.mas_equalTo(self.giftImageView.mas_width);
+        make.centerX.equalTo(self.contentView);
+		make.top.mas_equalTo(8);
+		make.height.width.mas_equalTo(56);
 	}];
 	
 	[self.numberButton mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.size.mas_equalTo(CGSizeMake(55, 15));
+        make.height.mas_equalTo(14);
 		make.centerX.mas_equalTo(self.contentView);
-		make.top.mas_equalTo(self.giftImageView.mas_bottom).offset(2);
+		make.top.mas_equalTo(self.giftImageView.mas_bottom).offset(1);
 	}];
 	
 	[self.giftNameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
 		make.left.right.mas_equalTo(self.contentView);
-		make.top.mas_equalTo(self.numberButton.mas_bottom).offset(10);
+		make.top.mas_equalTo(self.numberButton.mas_bottom).offset(1);
+        make.height.mas_equalTo(17);
 	}];
 	
 	[self.stackView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -76,8 +82,12 @@
 	}];
 	
 	[self.diamondImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.size.mas_equalTo(CGSizeMake(13, 13));
+		make.size.mas_equalTo(CGSizeMake(10, 8));
 	}];
+
+    self.numberButton.textColor =  UIColorFromRGB(0x7F8494);
+    self.giftNameLabel.textColor =  UIColorFromRGB(0x696D7A);
+    self.giftPriceLabel.textColor =  UIColorFromRGB(0x7F8494);
 }
 
 #pragma mark - Getters And Setters
@@ -87,7 +97,17 @@
 		self.giftImageView.imageUrl = _giftInfo.picUrl;
 		self.giftNameLabel.text = _giftInfo.giftName;
 		self.giftPriceLabel.text = [NSString stringWithFormat:@"%ld",  _giftInfo.giftPrice];
-		[self.numberButton setTitle:[NSString stringWithFormat:@"X%ld", _giftInfo.reciveCount] forState:UIControlStateNormal];
+        self.numberButton.text = [NSString stringWithFormat:@"x%ld", _giftInfo.reciveCount];
+        _bgImageView.layer.cornerRadius = _giftInfo.giftLevel == 1 ? 5 : 0;
+        _bgImageView.backgroundColor = _giftInfo.giftLevel == 1 ? UIColorFromRGB(0xE6E8F0) : [UIColor clearColor];
+        if(_giftInfo.giftLevel > 1){
+            NSString *image = [NSString stringWithFormat:@"mine_user_infi_gift_bg%d",_giftInfo.giftLevel];
+            _bgImageView.image = kImage(image);
+            self.numberButton.textColor = _giftInfo.giftLevel == 1 ? UIColorFromRGB(0x7F8494):UIColorFromRGB(0xF5F6FA);
+            self.giftNameLabel.textColor = _giftInfo.giftLevel == 1 ? UIColorFromRGB(0x696D7A):UIColorFromRGB(0xFFFFFF);
+            self.giftPriceLabel.textColor = _giftInfo.giftLevel == 1 ? UIColorFromRGB(0x7F8494):UIColorFromRGB(0xF5F6FA);
+        }
+        
 	}
 }
 
@@ -103,14 +123,12 @@
 	return _giftImageView;
 }
 
-- (UIButton *)numberButton {
+- (UILabel *)numberButton {
 	if (!_numberButton) {
-		_numberButton = [UIButton buttonWithType:UIButtonTypeCustom];
-		[_numberButton setBackgroundColor:[ThemeColor appCellBackgroundColor]];
-		[_numberButton setTitleColor:[ThemeColor mainTextColor] forState:UIControlStateNormal];
-		_numberButton.titleLabel.font = [UIFont systemFontOfSize:10];
-		_numberButton.layer.masksToBounds = YES;
-		[_numberButton setCornerWithLeftTopCorner:2 rightTopCorner:6 bottomLeftCorner:6 bottomRightCorner:2 size:CGSizeMake(55, 15)];
+		_numberButton = [UILabel new];
+        _numberButton.text = @"0";
+        _numberButton.font = [UIFont systemFontOfSize:10 weight:UIFontWeightRegular];
+        _numberButton.textAlignment = NSTextAlignmentCenter;
 	}
 	return _numberButton;
 }
@@ -118,8 +136,7 @@
 - (UILabel *)giftNameLabel {
 	if (!_giftNameLabel) {
 		_giftNameLabel = [[UILabel alloc] init];
-		_giftNameLabel.font = [UIFont systemFontOfSize:13];
-		_giftNameLabel.textColor = [ThemeColor mainTextColor];
+		_giftNameLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightRegular];
 		_giftNameLabel.textAlignment = NSTextAlignmentCenter;
 	}
 	return _giftNameLabel;
@@ -148,11 +165,19 @@
 - (UILabel *)giftPriceLabel {
 	if (!_giftPriceLabel) {
 		_giftPriceLabel = [[UILabel alloc] init];
-		_giftPriceLabel.font = [UIFont systemFontOfSize:11];
+		_giftPriceLabel.font = [UIFont systemFontOfSize:9 weight:UIFontWeightRegular];
 		_giftPriceLabel.textColor = [ThemeColor secondTextColor];
 	}
 	return _giftPriceLabel;
 }
-
+- (UIImageView *)bgImageView{
+    if(!_bgImageView){
+        _bgImageView = [UIImageView new];
+        _bgImageView.layer.masksToBounds = YES;
+        
+        
+    }
+    return _bgImageView;
+}
 
 @end

xplan-ios/Main/Mine/View/Cell/MineInfo/XPMineUserInfoTableViewCell.m

@@ -90,7 +90,7 @@
 	if (_userInfo) {
 		self.nameLabel.text = _userInfo.nick;
 		self.idLabel.text = [NSString stringWithFormat:@"%@号：%ld",AppName, (long)_userInfo.erbanNo];
-		self.signLabel.text = _userInfo.userDesc.length > 0 ? _userInfo.userDesc : @"我是个默认签名";
+		self.signLabel.text = _userInfo.userDesc.length > 0 ? _userInfo.userDesc : @"他还没有写个人介绍~";
 		NSString * sexStr;
 		if (_userInfo.gender == GenderType_Male) {
 			sexStr = @"common_male";