修复bug

Podfile

@@ -4,9 +4,9 @@ source 'https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git'
 target 'YuMi' do
   use_frameworks!
   #pag动画
-  pod 'libpag', '~> 4.3.21'
+  pod 'libpag'
   pod 'Bugly'
-  pod 'Adjust', '~> 4.31.0'
+  pod 'Adjust'
   pod 'Firebase/Analytics'
   pod 'FBSDKLoginKit'
   pod 'FBSDKCoreKit'
@@ -40,21 +40,20 @@ target 'YuMi' do
   pod 'IQKeyboardManager'
   pod 'TZImagePickerController'
   #TRTC
-  pod 'TXLiteAVSDK_TRTC', '~> 11.4.14530'
+  pod 'TXLiteAVSDK_TRTC'
   #vap礼物动画
   pod 'QGVAPlayer'
   #上传音乐
   pod 'CocoaAsyncSocket',:modular_headers => true
   #声网
-  pod 'AgoraRtcEngine_iOS', '~> 4.2.2'	
-	#持久化存储
+  pod 'AgoraRtcEngine_iOS'
   pod 'SSKeychain'
   pod 'Base64'
   #pop动画
-  pod 'pop', '~> 1.0.12'
+  pod 'pop'
   #云信
-  pod 'NIMSDK_LITE', '~> 9.2.8'
-  pod 'GKCycleScrollView', '~> 1.2.0'
+  pod 'NIMSDK_LITE'
+  pod 'GKCycleScrollView'
   pod 'SVGAPlayer'
   pod 'GoogleSignIn'
   pod 'mob_linksdk_pro'

YuMi.xcodeproj/project.pbxproj

@@ -153,6 +153,7 @@
 		232C43EA2AB15F4100D4B2ED /* XPRoomTarrowBannerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 232C43E92AB15F4100D4B2ED /* XPRoomTarrowBannerView.m */; };
 		232C43EC2AB169EC00D4B2ED /* pi_room_tarrow_banner.svga in Resources */ = {isa = PBXBuildFile; fileRef = 232C43EB2AB169EB00D4B2ED /* pi_room_tarrow_banner.svga */; };
 		232C444B2AB4363200D4B2ED /* pi_room_tarrow_h5_banner.svga in Resources */ = {isa = PBXBuildFile; fileRef = 232C444A2AB4363200D4B2ED /* pi_room_tarrow_h5_banner.svga */; };
+		232EBBFF2BD7A25500E8CEAD /* MSParamsDecode.m in Sources */ = {isa = PBXBuildFile; fileRef = 232EBBFE2BD7A25500E8CEAD /* MSParamsDecode.m */; };
 		2331C0DC2A5E9E9000E1D940 /* PIFullScreenBannerAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C0DB2A5E9E9000E1D940 /* PIFullScreenBannerAnimation.m */; };
 		2331C1632A5EB71000E1D940 /* XPNobleCenterPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C1322A5EB71000E1D940 /* XPNobleCenterPresenter.m */; };
 		2331C1642A5EB71000E1D940 /* NobleInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C1362A5EB71000E1D940 /* NobleInfo.m */; };
@@ -261,6 +262,7 @@
 		2377010E2BCF73F400D661F1 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2377010D2BCF73F400D661F1 /* CoreGraphics.framework */; };
 		237701102BCF740400D661F1 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 2377010F2BCF740400D661F1 /* libsqlite3.tbd */; };
 		237701122BCF742C00D661F1 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 237701112BCF742C00D661F1 /* libz.tbd */; };
+		237701192BD6143700D661F1 /* pi_happy_egg_smash.svga in Resources */ = {isa = PBXBuildFile; fileRef = 237701182BD6143700D661F1 /* pi_happy_egg_smash.svga */; };
 		237B94BC2A984DA7007853E3 /* XPTrumpetPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 237B94AE2A984DA7007853E3 /* XPTrumpetPresenter.m */; };
 		237B94BD2A984DA7007853E3 /* XPNobleTrumpetModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 237B94B32A984DA7007853E3 /* XPNobleTrumpetModel.m */; };
 		237B94BE2A984DA7007853E3 /* XPRoomTrumpetViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 237B94B72A984DA7007853E3 /* XPRoomTrumpetViewController.m */; };
@@ -1801,6 +1803,8 @@
 		232C43E92AB15F4100D4B2ED /* XPRoomTarrowBannerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomTarrowBannerView.m; sourceTree = "<group>"; };
 		232C43EB2AB169EB00D4B2ED /* pi_room_tarrow_banner.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = pi_room_tarrow_banner.svga; sourceTree = "<group>"; };
 		232C444A2AB4363200D4B2ED /* pi_room_tarrow_h5_banner.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = pi_room_tarrow_h5_banner.svga; sourceTree = "<group>"; };
+		232EBBFD2BD7A25500E8CEAD /* MSParamsDecode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSParamsDecode.h; sourceTree = "<group>"; };
+		232EBBFE2BD7A25500E8CEAD /* MSParamsDecode.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSParamsDecode.m; sourceTree = "<group>"; };
 		2331C0DA2A5E9E9000E1D940 /* PIFullScreenBannerAnimation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIFullScreenBannerAnimation.h; sourceTree = "<group>"; };
 		2331C0DB2A5E9E9000E1D940 /* PIFullScreenBannerAnimation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIFullScreenBannerAnimation.m; sourceTree = "<group>"; };
 		2331C1312A5EB71000E1D940 /* XPNobleCenterPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPNobleCenterPresenter.h; sourceTree = "<group>"; };
@@ -2007,6 +2011,7 @@
 		2377010D2BCF73F400D661F1 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
 		2377010F2BCF740400D661F1 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; };
 		237701112BCF742C00D661F1 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
+		237701182BD6143700D661F1 /* pi_happy_egg_smash.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = pi_happy_egg_smash.svga; sourceTree = "<group>"; };
 		237B94AD2A984DA7007853E3 /* XPTrumpetPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPTrumpetPresenter.h; sourceTree = "<group>"; };
 		237B94AE2A984DA7007853E3 /* XPTrumpetPresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPTrumpetPresenter.m; sourceTree = "<group>"; };
 		237B94B02A984DA7007853E3 /* XPRoomTrumpetProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPRoomTrumpetProtocol.h; sourceTree = "<group>"; };
@@ -4471,6 +4476,8 @@
 			children = (
 				189DD6FD26E20E5900AB55B1 /* HttpRequestHelper.h */,
 				189DD6FE26E20E5900AB55B1 /* HttpRequestHelper.m */,
+				232EBBFD2BD7A25500E8CEAD /* MSParamsDecode.h */,
+				232EBBFE2BD7A25500E8CEAD /* MSParamsDecode.m */,
 			);
 			path = Network;
 			sourceTree = "<group>";
@@ -9550,6 +9557,7 @@
 			isa = PBXGroup;
 			children = (
 				23EE96F12B9FF6BE00475D69 /* pi_crazy_zoo.svga */,
+				237701182BD6143700D661F1 /* pi_happy_egg_smash.svga */,
 				23A03F2C2B4408CD0094227A /* pi_room_lucky_gift.svga */,
 				23FF256F2ABD456C0064E904 /* pi_home_new_play.svga */,
 				23FF25612ABAE6310064E904 /* pi_room_game_fine_love.svga */,
@@ -10655,7 +10663,7 @@
 				};
 			};
 			buildConfigurationList = 189DD52426DE255300AB55B1 /* Build configuration list for PBXProject "YuMi" */;
-			compatibilityVersion = "Xcode 9.3";
+			compatibilityVersion = "Xcode 13.0";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
@@ -10749,6 +10757,7 @@
 				E80EC84828ACD84000D133C5 /* emoji_86@2x.png in Resources */,
 				E80EC87728ACD84000D133C5 /* emoji_148@2x.png in Resources */,
 				E80EC81928ACD84000D133C5 /* emoji_80@2x.png in Resources */,
+				237701192BD6143700D661F1 /* pi_happy_egg_smash.svga in Resources */,
 				E80EC8B328ACD84100D133C5 /* emoji_115@2x.png in Resources */,
 				E80EC8A828ACD84100D133C5 /* emoji_76@2x.png in Resources */,
 				2368ECCF2BC38F9800EDF4C9 /* InfoPlist.strings in Resources */,
@@ -11418,6 +11427,7 @@
 				E8AC722426F47E5E007D6E91 /* XPMineFeedbackViewController.m in Sources */,
 				E8664ED627E434D5000171BA /* XPRoomPKRecordViewController.m in Sources */,
 				E87E914E2796678D00A7B3F2 /* XPMineDressEmptyTableViewCell.m in Sources */,
+				232EBBFF2BD7A25500E8CEAD /* MSParamsDecode.m in Sources */,
 				9B7D804D27537950003DAC0C /* MessageCell.m in Sources */,
 				23E9EAA62A84C97C00B792F2 /* XPMineUserInfoTagVC.m in Sources */,
 				9B044D9D282D2A6400DE4859 /* XPRoomAnchorRankEnterView.m in Sources */,
@@ -12378,7 +12388,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 20.20.16;
+				MARKETING_VERSION = 20.20.17;
 				PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -12416,7 +12426,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 20.20.16;
+				MARKETING_VERSION = 20.20.17;
 				PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

YuMi/Appdelegate/AppDelegate.m

@@ -58,7 +58,7 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
 	// 只有同意过了隐私协议 才初始化
 	if ([[NSUserDefaults standardUserDefaults] objectForKey:@"kYouMinumbernnagna"]) {
 		///初始化友盟
-		[UMConfigure initWithAppkey:@"6434c6dfd64e686139618269" channel:@"yumi_appstore"];
+		[UMConfigure initWithAppkey:@"6434c6dfd64e686139618269" channel:@"appstore"];
 	}
     [[FBSDKApplicationDelegate sharedInstance] application:application didFinishLaunchingWithOptions:launchOptions];
     [FIRApp configure];

YuMi/Assets.xcassets/Language/ar/YearActivity_goto_ar.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "room_candy_tree_confirm_buy_title_en.png",
+      "filename" : "YearActivity_goto_ar.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

YuMi/Assets.xcassets/Language/ar/anchor_hour_rank_icon_ar.imageset/Contents.json

@@ -1,16 +1,15 @@
 {
   "images" : [
     {
+      "filename" : "anchor_hour_rank_icon_ar.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "room_candy_tree_confirm_buy_title@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "room_candy_tree_confirm_buy_title@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

YuMi/Assets.xcassets/Language/ar/common_new_user_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/gift_tag_latest_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/gift_twelve_star_Banner_naming_bg_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/gift_twelve_star_Banner_rich_bg_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/mine_info_recharge_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/mine_noble_center_rank_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/mine_noble_center_tag_title_bg_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/noble_myLevel_head_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/pi_webView_code_top_text_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/room_gift_super_gift_icon_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/en/mine_noble_center_rank_en.imageset/Contents.json

@@ -1,15 +1,16 @@
 {
   "images" : [
     {
-      "filename" : "mine_noble_center_rank_en.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "mine_noble_center_rank_en@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "mine_noble_center_rank_en@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

YuMi/Assets.xcassets/Language/en/mine_noble_center_tag_title_bg_en.imageset/Contents.json

@@ -1,15 +1,16 @@
 {
   "images" : [
     {
-      "filename" : "mine_noble_center_tag_title_bg_en.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "mine_noble_center_tag_title_bg_en@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "mine_noble_center_tag_title_bg_en@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

YuMi/Assets.xcassets/Language/en/pi_webView_code_top_text_en.imageset/Contents.json

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

YuMi/Assets.xcassets/webView/pi_webView_code_top_text.imageset/Contents.json

@@ -1,16 +1,15 @@
 {
   "images" : [
     {
+      "filename" : "pi_webView_code_top_text.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "pi_webView_code_top_text@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "pi_webView_code_top_text@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_bg.imageset/Contents.json

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

YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_btn_bg.imageset/Contents.json

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

YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_btn_today.imageset/Contents.json

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

YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_btn_yesterday.imageset/Contents.json

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

YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love__bg.imageset/Contents.json

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

YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love_icon_bg.imageset/Contents.json

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

YuMi/Assets.xcassets/yna/CandyTree/room_candytree_large_big_gift_bg.imageset/Contents.json

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

YuMi/CustomUI/MSRTL/UILabel+MSRTL.m

@@ -7,6 +7,29 @@
 
 #import "UILabel+MSRTL.h"
 #import "NSMutableAttributedString+MSRTL.h"
+
+
+
+BOOL isMSRTLString(NSString *string) {
+    if ([string hasPrefix:@"\u202B"] || [string hasPrefix:@"\u202A"]) {
+        return YES;
+    }
+    return NO;
+}
+
+NSString * MSRTLString(NSString *string) {
+    if (string.length == 0 || isMSRTLString(string)) {
+        return string;
+    }
+    if (isMSRTL()) {
+        string = [@"\u202B" stringByAppendingString:string];
+    } else {
+        string = [@"\u202A" stringByAppendingString:string];
+    }
+    return string;
+}
+
+
 @implementation UILabel (MSRTL)
 
 + (void)load {
@@ -15,14 +38,19 @@
     Method newInitMethod = class_getInstanceMethod(self, @selector(msrtl_initWithFrame:));
     method_exchangeImplementations(oldInitMethod, newInitMethod);  //交换成功
 
-    Method oldTextMethod = class_getInstanceMethod(self,@selector(setTextAlignment:));
-    Method newTextMethod = class_getInstanceMethod(self, @selector(msrtl_setTextAlignment:));
-    method_exchangeImplementations(oldTextMethod, newTextMethod);  //交换成功
+    Method oldTextAlignmentMethod = class_getInstanceMethod(self,@selector(setTextAlignment:));
+    Method newTextAlignmentMethod = class_getInstanceMethod(self, @selector(msrtl_setTextAlignment:));
+    method_exchangeImplementations(oldTextAlignmentMethod, newTextAlignmentMethod);  //交换成功
     
     Method oldTextMethod1 = class_getInstanceMethod(self,@selector(setAttributedText:));
     Method newTextMethod1 = class_getInstanceMethod(self, @selector(msrtl_setAttributedText:));
     method_exchangeImplementations(oldTextMethod1, newTextMethod1);
+    
+    
+    
+     
 }
+
 -(void)msrtl_setAttributedText:(NSAttributedString *)attributedText{
     if(attributedText == nil)return;
     NSMutableAttributedString * attributedString = [[NSMutableAttributedString alloc]init];

YuMi/CustomUI/UIImageView/NetImageView.m

@@ -46,6 +46,7 @@
 - (void)initImageUrl:(NSString *)imageUrl {
     _imageUrl = imageUrl;
     _innerConfigedUrl = [UIImageConstant configUrl:_imageUrl type:self.config.imageType radius:self.config.radius];
+
 }
 
 - (void)setImageUrl:(NSString *)imageUrl {

YuMi/Global/YUMIConstant.h

@@ -20,7 +20,6 @@ UIKIT_EXTERN NSString * const kRoomQuickMessageCloseCount;
 UIKIT_EXTERN NSString * const kLoginMethod;
 typedef NS_ENUM(NSUInteger, Pi_KeyType) {
 	KeyType_PasswordEncode,///密码 des 加密的
-	KeyType_NTESQuickLoginBusinessId,///网易易盾 快捷登录 id
     KeyType_Agora,///声网 key
     KeyType_TRTC,///TRTC key
 	KeyType_NetEase,///云信的key
@@ -34,6 +33,8 @@ typedef NS_ENUM(NSUInteger, Pi_KeyType) {
 	KeyType_SystemNotifiUidKey,
 	///小秘书
 	KeyType_SecretaryUidKey,
+    ///参数加密
+    KeyType_Sign,
 };
 
 /// 获取当前项目中所用到的 type 所对应的 value 的值 type 类型