1.5.2版本发版 此commit置顶

Gemfile.lock

@@ -1,10 +1,10 @@
 GEM
   remote: https://gems.ruby-china.com/
   specs:
-    CFPropertyList (3.0.4)
+    CFPropertyList (3.0.6)
       rexml
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     admqr_knife (0.1.5)
       api_tools
       thor
@@ -14,24 +14,24 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.529.0)
-    aws-sdk-core (3.122.1)
+    aws-partitions (1.733.0)
+    aws-sdk-core (3.171.0)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.525.0)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.5)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.63.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-kms (1.51.0)
-      aws-sdk-core (~> 3, >= 3.122.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.105.1)
-      aws-sdk-core (~> 3, >= 3.122.0)
+    aws-sdk-s3 (1.119.2)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.4.0)
+    aws-sigv4 (1.5.2)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     chunky_png (1.4.0)
-    claide (1.0.3)
+    claide (1.1.0)
     colored (1.2)
     colored2 (3.1.2)
     commander (4.6.0)
@@ -41,19 +41,20 @@ GEM
       rake (>= 12.0.0, < 14.0.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.7.6)
+    dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.88.0)
-    faraday (1.8.0)
+    excon (0.99.0)
+    faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
       faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
+      faraday-net_http_persistent (~> 1.0)
       faraday-patron (~> 1.0)
       faraday-rack (~> 1.0)
-      multipart-post (>= 1.2, < 3)
+      faraday-retry (~> 1.0)
       ruby2_keywords (>= 0.0.4)
     faraday-cookie_jar (0.0.7)
       faraday (>= 0.8.0)
@@ -62,14 +63,17 @@ GEM
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    fastimage (2.2.5)
-    fastlane (2.197.0)
+    fastimage (2.2.6)
+    fastlane (2.212.1)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -108,10 +112,10 @@ GEM
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
-    fastlane-plugin-fir_cli (2.0.12)
-      fir-cli (~> 2.0.12)
-    fastlane-plugin-pgyer (0.2.2)
-    fir-cli (2.0.14)
+    fastlane-plugin-fir_cli (2.0.19)
+      fir-cli (~> 2.0.19)
+    fastlane-plugin-pgyer (0.2.4)
+    fir-cli (2.0.19)
       CFPropertyList
       admqr_knife (~> 0.1.5)
       api_tools (~> 0.1.1)
@@ -119,11 +123,11 @@ GEM
       rexml
       rqrcode (~> 0.7)
       ruby_android_apk (~> 0.7.7.1)
-      thor (~> 0.19)
+      thor (~> 1.2.1)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.13.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-core (0.4.1)
+    google-apis-androidpublisher_v3 (0.37.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-core (0.11.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -132,28 +136,28 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-iamcredentials_v1 (0.8.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-playcustomapp_v1 (0.6.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-storage_v1 (0.9.0)
-      google-apis-core (>= 0.4, < 2.a)
+    google-apis-iamcredentials_v1 (0.17.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-playcustomapp_v1 (0.13.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-storage_v1 (0.19.0)
+      google-apis-core (>= 0.9.0, < 2.a)
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.5.0)
-      faraday (>= 0.17.3, < 2.0)
-    google-cloud-errors (1.2.0)
-    google-cloud-storage (1.34.1)
-      addressable (~> 2.5)
+    google-cloud-env (1.6.0)
+      faraday (>= 0.17.3, < 3.0)
+    google-cloud-errors (1.3.1)
+    google-cloud-storage (1.44.0)
+      addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.1)
+      google-apis-storage_v1 (~> 0.19.0)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.1.0)
-      faraday (>= 0.17.3, < 2.0)
+    googleauth (1.5.0)
+      faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
@@ -161,17 +165,17 @@ GEM
       signet (>= 0.16, < 2.a)
     highline (2.0.3)
     http-accept (1.7.0)
-    http-cookie (1.0.4)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    jmespath (1.4.0)
-    json (2.6.1)
-    jwt (2.3.0)
+    jmespath (1.6.2)
+    json (2.6.3)
+    jwt (2.7.0)
     memoist (0.16.2)
-    mime-types (3.3.1)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0901)
-    mini_magick (4.11.0)
+    mime-types-data (3.2023.0218.1)
+    mini_magick (4.12.0)
     mini_mime (1.1.2)
     multi_json (1.15.0)
     multipart-post (2.0.0)
@@ -180,10 +184,10 @@ GEM
     netrc (0.11.0)
     optparse (0.1.1)
     os (1.1.4)
-    plist (3.6.0)
-    public_suffix (4.0.6)
+    plist (3.7.0)
+    public_suffix (5.0.1)
     rake (13.0.6)
-    representable (3.1.1)
+    representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
@@ -202,18 +206,18 @@ GEM
       rubyzip (>= 1.1.6)
     rubyzip (2.3.2)
     security (0.1.3)
-    signet (0.16.0)
+    signet (0.17.0)
       addressable (~> 2.8)
-      faraday (>= 0.17.3, < 2.0)
+      faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    simctl (1.6.8)
+    simctl (1.6.10)
       CFPropertyList
       naturally
     terminal-notifier (2.0.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    thor (0.20.3)
+    thor (1.2.1)
     trailblazer-option (0.1.2)
     tty-cursor (0.7.1)
     tty-screen (0.8.1)
@@ -222,11 +226,11 @@ GEM
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8)
+    unf_ext (0.0.8.2)
     unicode-display_width (1.8.0)
-    webrick (1.7.0)
+    webrick (1.8.1)
     word_wrap (1.0.0)
-    xcodeproj (1.21.0)
+    xcodeproj (1.22.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
@@ -248,4 +252,4 @@ DEPENDENCIES
   fastlane-plugin-pgyer
 
 BUNDLED WITH
-   2.2.3
+   2.3.19

Podfile

@@ -18,6 +18,8 @@ target 'xplan-ios' do
 	pod 'MJExtension'
 	#图片加载
 	pod 'SDWebImage'
+        pod 'FLAnimatedImage'
+        pod 'SDWebImageFLPlugin' # 对FLAnimatedImage和SDWebImage的桥接
 	#输入
 	pod 'SZTextView'
 	#轮播图
@@ -32,22 +34,22 @@ 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'
 	#云信
-	pod 'NIMSDK_LITE', '~> 9.0.1'
+	pod 'NIMSDK_LITE', '~> 8.9.0'
 	#下拉刷新控件
 	pod 'MJRefresh'
 	#登录的
 	pod 'mob_sharesdk'
 	pod 'mob_sharesdk/ShareSDKPlatforms/QQ'
-	pod 'mob_sharesdk/ShareSDKPlatforms/WeChat'
+	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'
@@ -61,9 +63,28 @@ target 'xplan-ios' do
 	pod 'IQKeyboardManager', '~> 6.5.5'
 	pod 'TZImagePickerController'
 	pod 'Bugly'
+	pod 'QY_NIM_iOS_SDK', '~> 6.6.1'
+	pod 'LinkedME_LinkPage'
 	#上传音乐
 	pod 'CocoaAsyncSocket',:modular_headers => true
+  #微信支付，支付宝支付
+	pod 'AlipaySDK-iOS'
+	pod 'WechatOpenSDK'
 	#调试
 	pod 'LookinServer', :configurations => ['Debug']
 	
 end
+post_install do |installer|
+  installer.generated_projects.each do |project|
+    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
+end
+

Podfile.lock

@@ -14,41 +14,72 @@ PODS:
   - AFNetworking/Serialization (4.0.1)
   - AFNetworking/UIKit (4.0.1):
     - AFNetworking/NSURLSession
-  - AgoraRtcEngine_iOS (3.0.1.1)
+  - AgoraRtcEngine_iOS (4.2.2):
+    - AgoraRtcEngine_iOS/AIAEC (= 4.2.2)
+    - AgoraRtcEngine_iOS/AINS (= 4.2.2)
+    - AgoraRtcEngine_iOS/AudioBeauty (= 4.2.2)
+    - AgoraRtcEngine_iOS/ClearVision (= 4.2.2)
+    - AgoraRtcEngine_iOS/ContentInspect (= 4.2.2)
+    - AgoraRtcEngine_iOS/DRM (= 4.2.2)
+    - AgoraRtcEngine_iOS/FaceDetection (= 4.2.2)
+    - AgoraRtcEngine_iOS/ReplayKit (= 4.2.2)
+    - AgoraRtcEngine_iOS/RtcBasic (= 4.2.2)
+    - AgoraRtcEngine_iOS/SpatialAudio (= 4.2.2)
+    - AgoraRtcEngine_iOS/VideoCodecDec (= 4.2.2)
+    - AgoraRtcEngine_iOS/VideoCodecEnc (= 4.2.2)
+    - AgoraRtcEngine_iOS/VirtualBackground (= 4.2.2)
+    - AgoraRtcEngine_iOS/VQA (= 4.2.2)
+  - AgoraRtcEngine_iOS/AIAEC (4.2.2)
+  - AgoraRtcEngine_iOS/AINS (4.2.2)
+  - AgoraRtcEngine_iOS/AudioBeauty (4.2.2)
+  - AgoraRtcEngine_iOS/ClearVision (4.2.2)
+  - AgoraRtcEngine_iOS/ContentInspect (4.2.2)
+  - AgoraRtcEngine_iOS/DRM (4.2.2)
+  - AgoraRtcEngine_iOS/FaceDetection (4.2.2)
+  - AgoraRtcEngine_iOS/ReplayKit (4.2.2)
+  - AgoraRtcEngine_iOS/RtcBasic (4.2.2)
+  - AgoraRtcEngine_iOS/SpatialAudio (4.2.2)
+  - AgoraRtcEngine_iOS/VideoCodecDec (4.2.2)
+  - AgoraRtcEngine_iOS/VideoCodecEnc (4.2.2)
+  - AgoraRtcEngine_iOS/VirtualBackground (4.2.2)
+  - AgoraRtcEngine_iOS/VQA (4.2.2)
+  - AlipaySDK-iOS (15.8.11)
   - Base64 (1.1.2)
   - Bugly (2.5.93)
   - CocoaAsyncSocket (7.6.5)
   - FFPopup (1.1.5)
+  - FLAnimatedImage (1.0.17)
   - HappyDNS (0.3.17)
   - IAPHelper (1.1)
   - IQKeyboardManager (6.5.9)
   - JXCategoryView (1.5.9)
   - JXPagingView/Pager (2.1.2)
+  - LinkedME_LinkPage (1.5.5.4)
   - LookinServer (1.0.4)
   - 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.2):
-    - mob_sharesdk/ShareSDK (= 4.4.2)
+  - mob_sharesdk (4.4.13):
+    - mob_sharesdk/ShareSDK (= 4.4.13)
     - MOBFoundation (>= 3.2.9)
-  - mob_sharesdk/ShareSDK (4.4.2):
+  - mob_sharesdk/ShareSDK (4.4.13):
     - MOBFoundation (>= 3.2.9)
-  - mob_sharesdk/ShareSDKExtension (4.4.2):
+  - mob_sharesdk/ShareSDKExtension (4.4.13):
     - mob_sharesdk/ShareSDK
     - MOBFoundation (>= 3.2.9)
-  - mob_sharesdk/ShareSDKPlatforms/Apple (4.4.2):
+  - mob_sharesdk/ShareSDKPlatforms/Apple (4.4.13):
     - mob_sharesdk/ShareSDK
     - MOBFoundation (>= 3.2.9)
-  - mob_sharesdk/ShareSDKPlatforms/QQ (4.4.2):
+  - mob_sharesdk/ShareSDKPlatforms/QQ (4.4.13):
     - mob_sharesdk/ShareSDK
     - MOBFoundation (>= 3.2.9)
-  - mob_sharesdk/ShareSDKPlatforms/WeChat (4.4.2):
+  - mob_sharesdk/ShareSDKPlatforms/WeChat_Lite (4.4.13):
     - mob_sharesdk/ShareSDK
     - MOBFoundation (>= 3.2.9)
-  - MOBFoundation (3.2.27)
-  - NIMSDK_LITE (9.0.1)
+  - MOBFoundation (3.2.48)
+  - NIMSDK_LITE (8.9.110)
   - NTESBaseComponent (1.4)
   - NTESQuickPass (3.2.6):
     - NTESBaseComponent
@@ -57,12 +88,16 @@ PODS:
   - QGVAPlayer (1.0.15)
   - Qiniu (8.3.2):
     - HappyDNS (~> 0.3.17)
+  - 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)
+  - SDWebImageFLPlugin (0.6.0):
+    - FLAnimatedImage (>= 1.0.11)
+    - SDWebImage/Core (~> 5.10)
   - SSKeychain (1.4.1)
   - SSZipArchive (2.4.2)
   - SVGAPlayer (2.5.7):
@@ -74,13 +109,14 @@ 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)
+  - TXLiteAVSDK_TRTC (11.4.14530):
+    - TXLiteAVSDK_TRTC/TRTC (= 11.4.14530)
+  - TXLiteAVSDK_TRTC/TRTC (11.4.14530)
   - TZImagePickerController (3.8.1)
   - UMCommon (7.3.5):
     - UMDevice
   - UMDevice (2.0.5)
+  - WechatOpenSDK (2.0.2)
   - YYCache (1.0.4)
   - YYImage (1.0.4):
     - YYImage/Core (= 1.0.4)
@@ -92,15 +128,18 @@ 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
   - JXPagingView/Pager
+  - LinkedME_LinkPage
   - LookinServer
   - MarqueeLabel-ObjC
   - Masonry
@@ -111,22 +150,25 @@ DEPENDENCIES:
   - mob_sharesdk/ShareSDKExtension
   - mob_sharesdk/ShareSDKPlatforms/Apple
   - mob_sharesdk/ShareSDKPlatforms/QQ
-  - mob_sharesdk/ShareSDKPlatforms/WeChat
-  - NIMSDK_LITE (~> 9.0.1)
+  - mob_sharesdk/ShareSDKPlatforms/WeChat_Lite
+  - NIMSDK_LITE (~> 8.9.0)
   - NTESQuickPass
   - pop (~> 1.0.12)
   - 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
+  - WechatOpenSDK
   - YYText
   - YYWebImage (~> 1.0.5)
 
@@ -134,15 +176,18 @@ SPEC REPOS:
   https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git:
     - AFNetworking
     - AgoraRtcEngine_iOS
+    - AlipaySDK-iOS
     - Base64
     - Bugly
     - CocoaAsyncSocket
     - FFPopup
+    - FLAnimatedImage
     - HappyDNS
     - IAPHelper
     - IQKeyboardManager
     - JXCategoryView
     - JXPagingView
+    - LinkedME_LinkPage
     - LookinServer
     - MarqueeLabel-ObjC
     - Masonry
@@ -158,9 +203,11 @@ SPEC REPOS:
     - Protobuf
     - QGVAPlayer
     - Qiniu
+    - QY_NIM_iOS_SDK
     - ReactiveObjC
     - SDCycleScrollView
     - SDWebImage
+    - SDWebImageFLPlugin
     - SSKeychain
     - SSZipArchive
     - SVGAPlayer
@@ -169,54 +216,61 @@ SPEC REPOS:
     - TZImagePickerController
     - UMCommon
     - UMDevice
+    - WechatOpenSDK
     - YYCache
     - YYImage
     - YYText
     - YYWebImage
 
 SPEC CHECKSUMS:
-  AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce
-  AgoraRtcEngine_iOS: 8ccceaaecff2e80ab28fcd33f3dfd2b417eb5365
+  AFNetworking: 3bd23d814e976cd148d7d44c3ab78017b744cd58
+  AgoraRtcEngine_iOS: c510de329cd905daff3f01fa4c872ea6d5eaee23
+  AlipaySDK-iOS: a07b6eafa847a5b29acb6c150ea16d9792d5d167
   Base64: cecfb41a004124895a7bcee567a89bae5a89d49b
   Bugly: b8715e6ec4004b7f7fbffab0643ba80545aee3da
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   FFPopup: a208dcee8db3e54ec4a88fcd6481f6f5d85b7a83
+  FLAnimatedImage: bbf914596368867157cc71b38a8ec834b3eeb32b
   HappyDNS: 848ef73e24f2b0e2752064223ce2dc0dd88900ea
   IAPHelper: fd74f53b0ac142eed085777b88b86a11746a2dd4
   IQKeyboardManager: 241cc94ccabc9deb8f8bd7d12f00d73288d13ecc
   JXCategoryView: 2ef9ecfd3735158d009ce02d1f29811aa822da65
   JXPagingView: 90924b364a2ff7e94db534fad1fa50925ff69ee4
+  LinkedME_LinkPage: 0b443cec28582eb2d7e1c09987072e33e44083ec
   LookinServer: 743c1681771d0a8dcc38825325a080c3186404a5
   MarqueeLabel-ObjC: 696eaa82e4fcc7fb53e4fdf37ac138f03bf022d6
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
   MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406
   MJExtension: 01704cca2b60a214c10761b6491eab74069d68a9
   MJRefresh: ec9c53ff4abf3a9237b4283862f1bd51c2ee3fdb
-  mob_sharesdk: a60006891a079486ff3269ed326adfa05a967c01
-  MOBFoundation: efdc3ce6b843fbc10ae8c1c6122a02b0d845b39b
-  NIMSDK_LITE: c376a3f90c1cd79d9cca39fbdeb6a718e99e244a
+  mob_sharesdk: e8efde8dc7a872064c197a0af13eb5d06a2b143c
+  MOBFoundation: 5135f9e8310989a32b5ed4f130c01f4d8abc011a
+  NIMSDK_LITE: 299ff39677d705b91413d14ad352b32a1b0e72fe
   NTESBaseComponent: 9e97373eec7e5a26c39db26477bf99a37ee9e71a
   NTESQuickPass: 781bd12ee63681389fe9b646c837fa76e3a00e6e
   pop: d582054913807fd11fd50bfe6a539d91c7e1a55a
   Protobuf: 3724efa50cb2846d7ccebc8691c574e85fd74471
   QGVAPlayer: 002673a02b4e50f9f53d0673b87168b540a300ae
   Qiniu: 61f1e2fdfb35b37f98c8f03a718faf12652f9994
+  QY_NIM_iOS_SDK: 7fbf411c9c299f3b904fcc5b494542f41a11f70c
   ReactiveObjC: 011caa393aa0383245f2dcf9bf02e86b80b36040
   SDCycleScrollView: a0d74c3384caa72bdfc81470bdbc8c14b3e1fbcf
   SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
+  SDWebImageFLPlugin: 72efd2cfbf565bc438421abb426f4bcf7b670754
   SSKeychain: 55cc80f66f5c73da827e3077f02e43528897db41
   SSZipArchive: e7b4f3d9e780c2acc1764cd88fbf2de28f26e5b2
   SVGAPlayer: 318b85a78b61292d6ae9dfcd651f3f0d1cdadd86
   SZTextView: 094dc6acc9beec537685c545d6e3e0d4975174e1
-  TXLiteAVSDK_TRTC: feed0da4a473927afd3ca7e5a59d11ab0654ad5b
+  TXLiteAVSDK_TRTC: 72ff3c596f55555be2dd733291501eef5fae9ce5
   TZImagePickerController: 943511626019431372cf908f24c114521e484f0e
   UMCommon: ab4d875ddefe1b06c60b577e4a58bc4d433ee067
   UMDevice: c13bbb2e8ca6c67d1e23e03162553e3ec5a8b5b0
+  WechatOpenSDK: e79349b37d44c015210f39fd6d2379f0ec60efe2
   YYCache: 8105b6638f5e849296c71f331ff83891a4942952
   YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54
   YYText: 5c461d709e24d55a182d1441c41dc639a18a4849
   YYWebImage: 5f7f36aee2ae293f016d418c7d6ba05c4863e928
 
-PODFILE CHECKSUM: 89b628f1802cd346dba7b8c67843e04ac421b2ed
+PODFILE CHECKSUM: 0f2e29ba8c875f839292918f612c6ec567ad4318
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.1

fastlane/Fastfile

@@ -64,7 +64,7 @@ platform :ios do
   desc "2. 发布iOS Release ipa 到 firim 网站"
   lane :r do
     CONFIGURATION = "Release"
-    EXPORT_METHOD = "development"
+    EXPORT_METHOD = "ad-hoc"
 
     archiveAction
   end
@@ -153,7 +153,7 @@ platform :ios do
   lane :uploadToFirim do
     puts "" + magenta("====== 🚀🚀 ==== 执行上传到 fir 的命令 ==== 🚀🚀 ======") + ""
     # fir 的配置信息
-     fir_cli api_token: "ed9d92c209718eb877522b2a716065ad",  changelog: "Hello fir.im"
+     fir_cli api_token: "ed9d92c209718eb877522b2a716065ad",  changelog: "Hello fir.im", specify_file_path:"#{OUTPUT_DIRECTORY}/#{IPA_NAME}"
     # pgyer(api_key: "d1b2989cde5da7909baa2e7677104a48",
     # 	 user_key: "fe25d4bc286baf919209843d9cb45da0", 
     # 		  ipa: "#{OUTPUT_DIRECTORY}/#{IPA_NAME}")

fastlane/README.md

@@ -1,74 +1,104 @@
 fastlane documentation
-================
+----
+
 # Installation
 
 Make sure you have the latest version of the Xcode command line tools installed:
 
-```
+```sh
 xcode-select --install
 ```
 
-Install _fastlane_ using
-```
-[sudo] gem install fastlane -NV
-```
-or alternatively using `brew install fastlane`
+For _fastlane_ installation instructions, see [Installing _fastlane_](https://docs.fastlane.tools/#installing-fastlane)
 
 # Available Actions
+
 ## iOS
+
 ### ios d
-```
-fastlane ios d
-```
-1. 发布iOS Dubug ipa 到 firim 网站
-### ios r
-```
-fastlane ios r
-```
-2. 发布iOS Release ipa 到 firim 网站
-### ios store
-```
-fastlane ios store
-```
-3. 发布iOS Release ipa 到 苹果商店
-### ios archiveAction
-```
-fastlane ios archiveAction
-```
-4. 打包操作
-### ios uploadToFirim
-```
-fastlane ios uploadToFirim
-```
-5. 执行上传操作
-### ios uploadAppleStore
-```
-fastlane ios uploadAppleStore
-```
-6. 发布到 Apple Store
-### ios updateProjectBuildNumber
-```
-fastlane ios updateProjectBuildNumber
-```
-7. 用于更新 App 的 build Num 的方法
-### ios upload_dSYM
-```
-fastlane ios upload_dSYM
-```
-8. 上传符号表操作
-### ios resigh
-```
-fastlane ios resigh
+
+```sh
+[bundle exec] fastlane ios d
 ```
 
+1. 发布iOS Dubug ipa 到 firim 网站
+
+### ios r
+
+```sh
+[bundle exec] fastlane ios r
+```
+
+2. 发布iOS Release ipa 到 firim 网站
+
+### ios store
+
+```sh
+[bundle exec] fastlane ios store
+```
+
+3. 发布iOS Release ipa 到 苹果商店
+
+### ios archiveAction
+
+```sh
+[bundle exec] fastlane ios archiveAction
+```
+
+4. 打包操作
+
+### ios uploadToFirim
+
+```sh
+[bundle exec] fastlane ios uploadToFirim
+```
+
+5. 执行上传操作
+
+### ios uploadAppleStore
+
+```sh
+[bundle exec] fastlane ios uploadAppleStore
+```
+
+6. 发布到 Apple Store
+
+### ios updateProjectBuildNumber
+
+```sh
+[bundle exec] fastlane ios updateProjectBuildNumber
+```
+
+7. 用于更新 App 的 build Num 的方法
+
+### ios upload_dSYM
+
+```sh
+[bundle exec] fastlane ios upload_dSYM
+```
+
+8. 上传符号表操作
+
+### ios resigh
+
+```sh
+[bundle exec] fastlane ios resigh
+```
+
+
+
 ### ios review
+
+```sh
+[bundle exec] fastlane ios review
 ```
-fastlane ios review
-```
+
 
 
 ----
 
 This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run.
-More information about fastlane can be found on [fastlane.tools](https://fastlane.tools).
-The documentation of fastlane can be found on [docs.fastlane.tools](https://docs.fastlane.tools).
+
+More information about _fastlane_ can be found on [fastlane.tools](https://fastlane.tools).
+
+The documentation of _fastlane_ can be found on [docs.fastlane.tools](https://docs.fastlane.tools).

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

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

xplan-ios/Appdelegate/AppDelegate+ThirdConfig.m

@@ -12,6 +12,8 @@
 #import <UMCommon/UMCommon.h>
 #import <UserNotifications/UNUserNotificationCenter.h>
 #import <Bugly/Bugly.h>
+#import <QYSDK_NIM/QYSDK.h>
+#import <IQKeyboardManager.h>
 ///Tool
 #import "XPConstant.h"
 #import "CustomAttachmentDecoder.h"
@@ -23,6 +25,7 @@
 #import "XPWebViewController.h"
 #import "XPRoomViewController.h"
 #import "XCCurrentVCStackManager.h"
+#import <RPSDK/RPSDK.h>
 
 UIKIT_EXTERN NSString * kYinyouPrivateKey;
 UIKIT_EXTERN NSString * adImageName;
@@ -37,14 +40,22 @@ UIKIT_EXTERN NSString * adImageName;
 	[self configUMengSDK];
 	[self initEmojiData];
 	[self configBugly];
+	[self configQIYUSDK];
+    [self configCloudShield];
+}
+- (void)configCloudShield {
+    [RPSDK setup];
+    #if !TARGET_OS_SIMULATOR
+//        [RPSDK initialize:RPSDKEnvOnline]; //必须为RPSDKEnvOnline
+    #endif
 }
 
 - (void)configShareSDK {
 	[ShareSDK registPlatforms:^(SSDKRegister *platformsRegister) {
 		//QQ
-		NSString *universalLink = @"https://a6lno.share2dlink.com/";
-		NSString *qqUniversalLink = @"https://a6lno.share2dlink.com/qq_conn/101902443";
-        [platformsRegister setupQQWithAppId:KeyWithType(KeyType_QQAppid) appkey:KeyWithType(KeyType_QQSecret) enableUniversalLink:YES universalLink:qqUniversalLink];
+		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:NO universalLink:nil];
         [platformsRegister setupWeChatWithAppId:KeyWithType(KeyType_WechatAppid) appSecret:KeyWithType(KeyType_WechatSecret) universalLink:universalLink];
     }];
 }
@@ -58,7 +69,7 @@ UIKIT_EXTERN NSString * adImageName;
 	
 	// NIM SDK初始化
     [NIMCustomObject registerCustomDecoder:[[CustomAttachmentDecoder alloc] init]];
-    
+
 #ifdef DEBUG
     [NIMSDKConfig sharedConfig].enabledHttpsForInfo = NO;
     [NIMSDKConfig sharedConfig].enabledHttpsForMessage = NO;
@@ -71,9 +82,14 @@ UIKIT_EXTERN NSString * adImageName;
 	}
 	[[UIApplication sharedApplication] registerForRemoteNotifications];
 }
+- (void)configQIYUSDK {
+	[[QYSDK sharedSDK] registerAppId:@"b6b7ca22f8ce319dea3a7456dc211fec" appName:@"音萌"];
+	[QYSDK sharedSDK].customUIConfig.showAudioEntry = NO;
+	[QYSDK sharedSDK].customUIConfig.autoShowKeyboard = NO;
+	[QYSDK sharedSDK].customUIConfig.serviceHeadImage = [UIImage imageNamed:@"ming_setting_about_us"];
+}
 
-
-/**
+/**ming_setting_about_us
  崩溃收集 Bugly
  */
 - (void) configBugly {

xplan-ios/Appdelegate/AppDelegate.m

@@ -8,11 +8,12 @@
 #import "AppDelegate.h"
 #import "TabbarViewController.h"
 #import "BaseNavigationController.h"
-#import "FlutterBoost+Xplan.h"
 #import "AppDelegate+ThirdConfig.h"
 #import <AppTrackingTransparency/AppTrackingTransparency.h>
 #import <NIMSDK/NIMSDK.h>
-
+#import <LinkedME_iOS/LinkedME.h>
+#import "LinkMeModel.h"
+#import "NSObject+MJExtension.h"
 @interface AppDelegate ()
 
 @end
@@ -20,16 +21,85 @@
 @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-    [[FlutterBoost instance] setup:application];
     TabbarViewController *vc = [[TabbarViewController alloc] init];
     BaseNavigationController *bnc = [[BaseNavigationController alloc] initWithRootViewController:vc];
     self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
+    ///禁用暗黑
+    if (@available(iOS 13.0, *)) {
+        self.window.overrideUserInterfaceStyle = UIUserInterfaceStyleLight;
+    }
     self.window.rootViewController = bnc;
     [self.window makeKeyAndVisible];
 	///设置广告页
 	[self setupLaunchADView];
 	///初始化一些 sdk配置
 	[self initThirdConfig];
+	LinkedME* linkedme = [LinkedME getInstance];
+	[linkedme initSessionWithLaunchOptions:launchOptions automaticallyDisplayDeepLinkController:NO deepLinkHandler:^(NSDictionary* params, NSError* error) {
+			if (!error) {
+				//防止传递参数出错取不到数据,导致App崩溃这里一定要用try catch
+				@try {
+					NSLog(@"LinkedME finished init with params = %@",[params description]);
+					//获取标题
+					NSString *title = [params objectForKey:@"$og_title"];
+					NSString * H5URL;
+					NSDictionary *control = params[@"$control"];
+					if (![params[@"h5_url"] isEqualToString:@""]) {
+						NSString *channel = params[@"h5_url"];
+						H5URL = channel;
+					}
+					NSString * linkedmeChannel = control[@"linkedmeChannel"];
+					if (title.length >0) {
+						LinkMeModel *linkme = [LinkMeModel modelWithJSON:control];
+						if (linkme.url) {
+							H5URL = linkme.url;
+						}
+
+						switch (linkme.type) {
+							case LinkedMESkipType_Room:
+							{
+
+							}
+								break;
+							case LinkedMESkipType_H5:
+							{
+
+							}
+								break;
+
+							default:
+								break;
+						}
+						//[自动跳转]使用自动跳转
+						//SDK提供的跳转方法
+						/**
+						 *  pushViewController : 类名
+						 *  storyBoardID : 需要跳转的页面的storyBoardID
+						 *  animated : 是否开启动画
+						 *  customValue : 传参
+						 *
+						 *warning  需要在被跳转页中实现次方法 - (void)configureControlWithData:(NSDictionary *)data;
+						 */
+
+						//                    [LinkedME pushViewController:title storyBoardID:@"detailView" animated:YES customValue:@{@"tag":tag} completion:^{
+						////
+						//                    }];
+
+						//自定义跳转
+						//                    dvc.openUrl = params[@"$control"][@"ViewId"];
+						//                    [[LinkedME getViewController] showViewController:dvc sender:nil];
+						}
+
+				} @catch (NSException *exception) {
+
+				} @finally {
+
+				}
+
+			} else {
+				NSLog(@"LinkedME failed init: %@", error);
+			}
+		}];
     return YES;
 }
 
@@ -152,5 +222,35 @@
 	}
 }
 
+#pragma mark 实现深度链接技术
+//URI Scheme 实现深度链接技术
+- (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options {
+	//判断是否是通过LinkedME的UrlScheme唤起App
+	if ([[url description] rangeOfString:@"click_id"].location != NSNotFound) {
+		[[LinkedME getInstance] handleDeepLink:url];
+	}
+	return YES;
+}
+
+- (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation {
+	//判断是否是通过LinkedME的UrlScheme唤起App
+	if ([[url description] rangeOfString:@"click_id"].location != NSNotFound) {
+		[[LinkedME getInstance] handleDeepLink:url];
+	}
+	return YES;
+}
+
+//Universal Links 通用链接实现深度链接技术
+- (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void (^)(NSArray<id<UIUserActivityRestoring>> * _Nullable))restorationHandler {
+	//判断是否是通过LinkedME的Universal Links唤起App
+	if ([[userActivity.webpageURL description] rangeOfString:@"lkme.cc"].location != NSNotFound) {
+		[[LinkedME getInstance] continueUserActivity:userActivity];
+	}
+
+	return YES;
+}
+
+
+
 
 @end

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

@@ -0,0 +1,6 @@
+{
+  "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" : "room_mini_background@2x.png",
+      "filename" : "new_charm_02@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "room_mini_background@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_candy_tree_header@2x.png",
+      "filename" : "new_charm_03@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "room_candy_tree_header@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
+  }
+}