修复技能卡没图片时闪退问题

Podfile

@@ -18,12 +18,13 @@ target 'xplan-ios' do
 	pod 'MJExtension'
 	#图片加载
 	pod 'SDWebImage'
+        pod 'FLAnimatedImage'
+        pod 'SDWebImageFLPlugin' # 对FLAnimatedImage和SDWebImage的桥接
 	#输入
 	pod 'SZTextView'
 	#轮播图
 	pod 'SDCycleScrollView'
-	#上传图片
-	pod 'Qiniu'
+	
 	#内购
 	pod 'IAPHelper'
 	#持久化存储
@@ -32,9 +33,9 @@ target 'xplan-ios' do
 	#文字自动滚动
 	pod 'MarqueeLabel-ObjC'
   #声网
-  pod 'AgoraRtcEngine_iOS', '~> 3.0.1'
+  pod 'AgoraRtcEngine_iOS', '~> 4.2.2'
   #TRTC
-	pod 'TXLiteAVSDK_TRTC', '~> 10.3.12271'
+	pod 'TXLiteAVSDK_TRTC', '~> 11.4.14530'
 	#pop动画
 	pod 'pop', '~> 1.0.12'
 	#云信
@@ -47,7 +48,7 @@ target 'xplan-ios' do
 	pod 'mob_sharesdk/ShareSDKPlatforms/WeChat_Lite'
 	pod 'mob_sharesdk/ShareSDKPlatforms/Apple'
 	pod 'mob_sharesdk/ShareSDKExtension'
-	pod 'SVGAPlayer', '~> 2.3'
+	pod 'SVGAPlayer'
 	# 滑动标签栏
 	pod 'JXCategoryView'
 	pod 'JXPagingView/Pager'
@@ -70,6 +71,7 @@ target 'xplan-ios' do
 	pod 'WechatOpenSDK'
 	#调试
 	pod 'LookinServer', :configurations => ['Debug']
+        pod 'QCloudCOSXML'
 	
 end
 post_install do |installer|
@@ -77,6 +79,10 @@ post_install do |installer|
     project.targets.each do |target|
       target.build_configurations.each do |config|
             config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0'
+            xcconfig_path = config.base_configuration_reference.real_path
+            xcconfig = File.read(xcconfig_path)
+            xcconfig_mod = xcconfig.gsub(/DT_TOOLCHAIN_DIR/, "TOOLCHAIN_DIR")
+            File.open(xcconfig_path, "w") { |file| file << xcconfig_mod }
        end
     end
   end

Podfile.lock

@@ -14,60 +14,98 @@ PODS:
   - AFNetworking/Serialization (4.0.1)
   - AFNetworking/UIKit (4.0.1):
     - AFNetworking/NSURLSession
-  - AgoraRtcEngine_iOS (3.0.1.1)
-  - 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)
-  - HappyDNS (0.3.17)
+  - FLAnimatedImage (1.0.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)
@@ -77,13 +115,17 @@ PODS:
   - SVGAPlayer/ProtoFiles (2.5.7):
     - Protobuf (~> 3.4)
   - SZTextView (1.3.0)
-  - TXLiteAVSDK_TRTC (10.3.12288):
-    - TXLiteAVSDK_TRTC/TRTC (= 10.3.12288)
-  - TXLiteAVSDK_TRTC/TRTC (10.3.12288)
-  - 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):
@@ -96,12 +138,13 @@ PODS:
 
 DEPENDENCIES:
   - AFNetworking
-  - AgoraRtcEngine_iOS (~> 3.0.1)
+  - AgoraRtcEngine_iOS (~> 4.2.2)
   - AlipaySDK-iOS
   - Base64
   - Bugly
   - CocoaAsyncSocket
   - FFPopup
+  - FLAnimatedImage
   - IAPHelper
   - IQKeyboardManager (~> 6.5.5)
   - JXCategoryView
@@ -121,16 +164,17 @@ DEPENDENCIES:
   - NIMSDK_LITE (~> 8.9.0)
   - NTESQuickPass
   - pop (~> 1.0.12)
+  - QCloudCOSXML
   - QGVAPlayer
-  - Qiniu
   - QY_NIM_iOS_SDK (~> 6.6.1)
   - ReactiveObjC
   - SDCycleScrollView
   - SDWebImage
+  - SDWebImageFLPlugin
   - SSKeychain
-  - SVGAPlayer (~> 2.3)
+  - SVGAPlayer
   - SZTextView
-  - TXLiteAVSDK_TRTC (~> 10.3.12271)
+  - TXLiteAVSDK_TRTC (~> 11.4.14530)
   - TZImagePickerController
   - UMCommon
   - UMDevice
@@ -147,7 +191,7 @@ SPEC REPOS:
     - Bugly
     - CocoaAsyncSocket
     - FFPopup
-    - HappyDNS
+    - FLAnimatedImage
     - IAPHelper
     - IQKeyboardManager
     - JXCategoryView
@@ -166,12 +210,15 @@ SPEC REPOS:
     - NTESQuickPass
     - pop
     - Protobuf
+    - QCloudCore
+    - QCloudCOSXML
+    - QCloudTrack
     - QGVAPlayer
-    - Qiniu
     - QY_NIM_iOS_SDK
     - ReactiveObjC
     - SDCycleScrollView
     - SDWebImage
+    - SDWebImageFLPlugin
     - SSKeychain
     - SSZipArchive
     - SVGAPlayer
@@ -188,51 +235,54 @@ SPEC REPOS:
 
 SPEC CHECKSUMS:
   AFNetworking: 3bd23d814e976cd148d7d44c3ab78017b744cd58
-  AgoraRtcEngine_iOS: 8ccceaaecff2e80ab28fcd33f3dfd2b417eb5365
-  AlipaySDK-iOS: a07b6eafa847a5b29acb6c150ea16d9792d5d167
+  AgoraRtcEngine_iOS: ac647332ad8f86d79cf810601c9e62b28c3a4de0
+  AlipaySDK-iOS: 5e6011fbd546e7db6b43c1f527d164ee63f3d7cb
   Base64: cecfb41a004124895a7bcee567a89bae5a89d49b
   Bugly: b8715e6ec4004b7f7fbffab0643ba80545aee3da
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   FFPopup: a208dcee8db3e54ec4a88fcd6481f6f5d85b7a83
-  HappyDNS: 848ef73e24f2b0e2752064223ce2dc0dd88900ea
+  FLAnimatedImage: bbf914596368867157cc71b38a8ec834b3eeb32b
   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: feed0da4a473927afd3ca7e5a59d11ab0654ad5b
-  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: 80d17907323e578d6ed774b6c6bbdb99cf9cde74
+PODFILE CHECKSUM: 3bd419f422e49acfd1c9500a9a45ab79466fa77a
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.1

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/Appdelegate/AppDelegate+ThirdConfig.m

@@ -54,8 +54,8 @@ UIKIT_EXTERN NSString * adImageName;
 	[ShareSDK registPlatforms:^(SSDKRegister *platformsRegister) {
 		//QQ
 		NSString *universalLink = @"https://f02efc69cbad775287063e8ee37733a5.share2dlink.com/";
-		NSString *qqUniversalLink = @"https://f02efc69cbad775287063e8ee37733a5.share2dlink.com/qq_conn/102044928";
-        [platformsRegister setupQQWithAppId:KeyWithType(KeyType_QQAppid) appkey:KeyWithType(KeyType_QQSecret) enableUniversalLink:YES universalLink:qqUniversalLink];
+//		NSString *qqUniversalLink = @"https://f02efc69cbad775287063e8ee37733a5.share2dlink.com/qq_conn/102044928";
+        [platformsRegister setupQQWithAppId:KeyWithType(KeyType_QQAppid) appkey:KeyWithType(KeyType_QQSecret) enableUniversalLink:NO universalLink:nil];
         [platformsRegister setupWeChatWithAppId:KeyWithType(KeyType_WechatAppid) appSecret:KeyWithType(KeyType_WechatSecret) universalLink:universalLink];
     }];
 }

xplan-ios/Appdelegate/YYTextAsyncLayer+XPTextAsyncLayer.h

@@ -0,0 +1,16 @@
+//
+//  YYTextAsyncLayer+XPTextAsyncLayer.h
+//  xplan-ios
+//
+//  Created by duoban on 2023/10/28.
+//
+
+#import <YYText/YYTextAsyncLayer.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface YYTextAsyncLayer (XPTextAsyncLayer)
+
+@end
+
+NS_ASSUME_NONNULL_END

xplan-ios/Appdelegate/YYTextAsyncLayer+XPTextAsyncLayer.m

@@ -0,0 +1,26 @@
+//
+//  YYTextAsyncLayer+XPTextAsyncLayer.m
+//  xplan-ios
+//
+//  Created by duoban on 2023/10/28.
+//
+
+#import "YYTextAsyncLayer+XPTextAsyncLayer.h"
+
+@implementation YYTextAsyncLayer (XPTextAsyncLayer)
+///iOS17bug，如果不把方法替换会闪退
++(void)load {
+    Method xp_displayMethod = class_getInstanceMethod(self, @selector(display));
+    Method xp_swizzingMethod = class_getInstanceMethod(self, @selector(xp_swizzing_display));
+    method_exchangeImplementations(xp_displayMethod, xp_swizzingMethod);
+}
+-(void)xp_swizzing_display{
+    //通过变量名称获取类中的实例成员变量
+    if (self.bounds.size.width <= 0 || self.bounds.size.height <= 0) {
+        self.contents = nil;
+        return;
+    } else {
+        [self xp_swizzing_display];
+    }
+}
+@end

xplan-ios/Assets.xcassets/Charm/Contents.json

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

xplan-ios/Assets.xcassets/Charm/new_charm_01.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Charm/new_charm_02.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Charm/new_charm_03.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Charm/new_charm_04.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Charm/new_charm_05.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Charm/new_charm_06.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Charm/new_charm_07.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Charm/new_charm_08.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Charm/new_charm_09.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Charm/new_charm_10.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Charm/new_charm_100.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Charm/new_charm_101.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Charm/new_charm_102.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Charm/new_charm_103.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Charm/new_charm_104.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Charm/new_charm_105.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Charm/new_charm_106.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Charm/new_charm_107.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Charm/new_charm_108.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Charm/new_charm_109.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Charm/new_charm_11.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Charm/new_charm_110.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Charm/new_charm_12.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Charm/new_charm_13.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Charm/new_charm_14.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Charm/new_charm_15.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Charm/new_charm_16.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Charm/new_charm_17.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Charm/new_charm_18.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Charm/new_charm_19.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Charm/new_charm_20.imageset/Contents.json

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