Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/CNLiveMateCode

# Conflicts: # metaCode.xcodeproj/project.pbxproj

Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/CNLiveMateCode
# Conflicts: # metaCode.xcodeproj/project.pbxproj
niudaojian
2 parents 786288f5 6a18d430
Showing 16 changed files with 185 additions and 163 deletions
Podfile
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Common/Util/CNLiveCommonQiniuTool.swift
metaCode/Classes/Constant/CNLiveConstant.swift → metaCode/Classes/Config/CNLiveConfigstant.swift
metaCode/Classes/Extensions/UIView+CNLiveCurrentVC.swift → metaCode/Classes/Extensions/NSObject+CNLiveExtensions.swift
metaCode/Classes/Extensions/NSObject+CNLiveJSONTool.swift
metaCode/Classes/Extensions/UIButton+CNLiveExtension.swift → metaCode/Classes/Extensions/UIButton+CNLiveExtensions.swift
metaCode/Classes/Extensions/UIColor+CNHexColor.swift → metaCode/Classes/Extensions/UIColor+CNLiveExtensions.swift
metaCode/Classes/Extensions/UIImage+CNLiveColorImage.swift → metaCode/Classes/Extensions/UIImage+CNLiveExtensions.swift
metaCode/Classes/Extensions/UITabBar+CNBadge.swift → metaCode/Classes/Extensions/UITabBar+CNLiveExtensions.swift
metaCode/Classes/Extensions/UIView+CNGradient.swift → metaCode/Classes/Extensions/UIView+CNLiveExtensions.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineAddInfoViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineEarnViewController.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineHeaderView.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineBaseModel.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineViewModel.swift
@@ -26,7 +26,7 @@ target &#39;metaCode&#39; do
   #加载框
   pod 'MBProgressHUD'
   #空白占位
-  pod 'DZNEmptyDataSet'
+  pod 'EmptyDataSet-Swift'
   #模型转换工具
   pod 'HandyJSON'
   #图片视频选择器
@@ -10,14 +10,14 @@
 		0D39E93D7229931C86EB1161 /* Pods_metaCode_metaCodeUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D879B49B1E42F1584DD75E /* Pods_metaCode_metaCodeUITests.framework */; };
 		1DD2808DF02C120276F99F4D /* Pods_metaCode.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F1C55A719CFEE073C06D37CE /* Pods_metaCode.framework */; };
 		790B1FB42A4153E90074CF00 /* CNLiveMineBaseModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 790B1FB32A4153E90074CF00 /* CNLiveMineBaseModel.swift */; };
-		790B1FB62A41938F0074CF00 /* UIImage+CNLiveColorImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 790B1FB52A41938F0074CF00 /* UIImage+CNLiveColorImage.swift */; };
+		790B1FB62A41938F0074CF00 /* UIImage+CNLiveExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 790B1FB52A41938F0074CF00 /* UIImage+CNLiveExtensions.swift */; };
 		790B1FB82A41B6A60074CF00 /* CNLiveMineMessageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 790B1FB72A41B6A60074CF00 /* CNLiveMineMessageViewController.swift */; };
 		790D01822A2D88FC00C5978D /* CNLiveConfigMacro.swift in Sources */ = {isa = PBXBuildFile; fileRef = 790D01812A2D88FC00C5978D /* CNLiveConfigMacro.swift */; };
-		790D01852A2D89E100C5978D /* UIColor+CNHexColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 790D01842A2D89E100C5978D /* UIColor+CNHexColor.swift */; };
+		790D01852A2D89E100C5978D /* UIColor+CNLiveExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 790D01842A2D89E100C5978D /* UIColor+CNLiveExtensions.swift */; };
 		790D018B2A2D8B3300C5978D /* CNLiveLoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 790D018A2A2D8B3300C5978D /* CNLiveLoginViewController.swift */; };
 		790D01912A2DAC5E00C5978D /* CNLiveConfigFontMacro.swift in Sources */ = {isa = PBXBuildFile; fileRef = 790D01902A2DAC5E00C5978D /* CNLiveConfigFontMacro.swift */; };
 		790D019A2A2DCAE400C5978D /* CNLiveViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 790D01992A2DCAE400C5978D /* CNLiveViewController.swift */; };
-		790D019D2A2DCBD000C5978D /* UIView+CNGradient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 790D019C2A2DCBD000C5978D /* UIView+CNGradient.swift */; };
+		790D019D2A2DCBD000C5978D /* UIView+CNLiveExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 790D019C2A2DCBD000C5978D /* UIView+CNLiveExtensions.swift */; };
 		790D019F2A2DD66E00C5978D /* CNLiveLoginViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 790D019E2A2DD66E00C5978D /* CNLiveLoginViewModel.swift */; };
 		790D01A32A2DDBA300C5978D /* CNLiveConfigManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 790D01A22A2DDBA300C5978D /* CNLiveConfigManager.swift */; };
 		790D01A52A2DF65E00C5978D /* CNLiveLoginPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 790D01A42A2DF65E00C5978D /* CNLiveLoginPickerView.swift */; };
@@ -28,7 +28,7 @@
 		79282A462A2F457D00B5F8CF /* CNLiveMineViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79282A452A2F457D00B5F8CF /* CNLiveMineViewController.swift */; };
 		792E57D92A3AA2F2005834DB /* CNLiveCommonBaseModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 792E57D82A3AA2F2005834DB /* CNLiveCommonBaseModel.swift */; };
 		792E57DB2A3AE9F4005834DB /* CNLiveCommonQiniuTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 792E57DA2A3AE9F4005834DB /* CNLiveCommonQiniuTool.swift */; };
-		79396EED2A319F220053E1AF /* UIView+CNLiveCurrentVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79396EEC2A319F220053E1AF /* UIView+CNLiveCurrentVC.swift */; };
+		79396EED2A319F220053E1AF /* NSObject+CNLiveExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79396EEC2A319F220053E1AF /* NSObject+CNLiveExtensions.swift */; };
 		79396EF12A31C21B0053E1AF /* CNLiveInfoShowViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79396EF02A31C21B0053E1AF /* CNLiveInfoShowViewController.swift */; };
 		796398942A260C0100D045EB /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7963988D2A260C0100D045EB /* AppDelegate.swift */; };
 		7963989D2A260E6200D045EB /* CNLiveBaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7963989C2A260E6200D045EB /* CNLiveBaseViewController.swift */; };
@@ -40,7 +40,7 @@
 		798A44EA2A30135D00815935 /* CNLiveMineBodyListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 798A44E92A30135D00815935 /* CNLiveMineBodyListView.swift */; };
 		798A44EC2A302DBE00815935 /* CNLiveMineAddInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 798A44EB2A302DBE00815935 /* CNLiveMineAddInfoViewController.swift */; };
 		798A44EE2A305AAC00815935 /* CNLiveBaseNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 798A44ED2A305AAC00815935 /* CNLiveBaseNavigationController.swift */; };
-		798A44F02A305BC200815935 /* UIButton+CNLiveExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 798A44EF2A305BC200815935 /* UIButton+CNLiveExtension.swift */; };
+		798A44F02A305BC200815935 /* UIButton+CNLiveExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 798A44EF2A305BC200815935 /* UIButton+CNLiveExtensions.swift */; };
 		798A44F22A30674200815935 /* CNLiveMineSubBodyListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 798A44F12A30674200815935 /* CNLiveMineSubBodyListView.swift */; };
 		798A44F72A3077ED00815935 /* CNLiveHotButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 798A44F52A3077ED00815935 /* CNLiveHotButton.swift */; };
 		798A44F92A30835400815935 /* CNLiveHelpFeedBackViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 798A44F82A30835400815935 /* CNLiveHelpFeedBackViewController.swift */; };
@@ -49,7 +49,6 @@
 		798A44FF2A30A0A800815935 /* CNLiveInputFeedBackViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 798A44FE2A30A0A800815935 /* CNLiveInputFeedBackViewController.swift */; };
 		79A68C4A2A26E6CE00DC3B43 /* (null) in Sources */ = {isa = PBXBuildFile; };
 		79A68C4C2A26EA6000DC3B43 /* (null) in Sources */ = {isa = PBXBuildFile; };
-		79BDDCBE2A3C3FC8008560FC /* NSObject+CNLiveJSONTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79BDDCBD2A3C3FC8008560FC /* NSObject+CNLiveJSONTool.swift */; };
 		79F4B1162A32B96B00993C03 /* CNLiveMineInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79F4B1152A32B96B00993C03 /* CNLiveMineInfoViewController.swift */; };
 		79F4B11A2A32F21400993C03 /* CNLiveMineNickViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79F4B1192A32F21400993C03 /* CNLiveMineNickViewController.swift */; };
 		79F4B11C2A33036E00993C03 /* CNLiveMineInfoAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79F4B11B2A33036E00993C03 /* CNLiveMineInfoAlertView.swift */; };
@@ -57,7 +56,7 @@
 		7C2703332A36CC660061EC50 /* CNLiveGlobalBlock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C2703322A36CC660061EC50 /* CNLiveGlobalBlock.swift */; };
 		7C2703362A3AFD3A0061EC50 /* CNLiveEnvironment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C2703352A3AFD3A0061EC50 /* CNLiveEnvironment.swift */; };
 		7C4931292A2D8BA8000E44B4 /* CNLiveBaseTabBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C4931282A2D8BA8000E44B4 /* CNLiveBaseTabBarViewController.swift */; };
-		7C49312D2A2DB9FA000E44B4 /* UITabBar+CNBadge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C49312C2A2DB9FA000E44B4 /* UITabBar+CNBadge.swift */; };
+		7C49312D2A2DB9FA000E44B4 /* UITabBar+CNLiveExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C49312C2A2DB9FA000E44B4 /* UITabBar+CNLiveExtensions.swift */; };
 		7C4931312A2F142F000E44B4 /* CNHomePageBackgroupView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C4931302A2F142F000E44B4 /* CNHomePageBackgroupView.swift */; };
 		7C4931342A307B58000E44B4 /* slide_down.gif in Resources */ = {isa = PBXBuildFile; fileRef = 7C4931332A307B58000E44B4 /* slide_down.gif */; };
 		7C4931362A307B60000E44B4 /* slide_up.gif in Resources */ = {isa = PBXBuildFile; fileRef = 7C4931352A307B60000E44B4 /* slide_up.gif */; };
@@ -75,7 +74,7 @@
 		7CD675472A274167008354C1 /* NewPagedFlowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7CD675442A274167008354C1 /* NewPagedFlowView.m */; };
 		7CD675482A274167008354C1 /* PGIndexBannerSubiew.m in Sources */ = {isa = PBXBuildFile; fileRef = 7CD675462A274167008354C1 /* PGIndexBannerSubiew.m */; };
 		7CD6754F2A2840B9008354C1 /* CNMetaCodeHomePageController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CD6754E2A2840B9008354C1 /* CNMetaCodeHomePageController.swift */; };
-		7CD675522A29C04B008354C1 /* CNLiveConstant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CD675512A29C04B008354C1 /* CNLiveConstant.swift */; };
+		7CD675522A29C04B008354C1 /* CNLiveConfigstant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CD675512A29C04B008354C1 /* CNLiveConfigstant.swift */; };
 		818163C32A25CFCC00579C86 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 818163C12A25CFCC00579C86 /* Main.storyboard */; };
 		818163C52A25CFCF00579C86 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 818163C42A25CFCF00579C86 /* Assets.xcassets */; };
 		818163C82A25CFCF00579C86 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 818163C62A25CFCF00579C86 /* LaunchScreen.storyboard */; };
@@ -110,14 +109,14 @@
 		67F8190701D1AB7F7724E8BA /* Pods-metaCodeTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-metaCodeTests.release.xcconfig"; path = "Target Support Files/Pods-metaCodeTests/Pods-metaCodeTests.release.xcconfig"; sourceTree = "<group>"; };
 		721865F548C997EFAE525B6F /* Pods-metaCode-metaCodeUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-metaCode-metaCodeUITests.release.xcconfig"; path = "Target Support Files/Pods-metaCode-metaCodeUITests/Pods-metaCode-metaCodeUITests.release.xcconfig"; sourceTree = "<group>"; };
 		790B1FB32A4153E90074CF00 /* CNLiveMineBaseModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineBaseModel.swift; sourceTree = "<group>"; };
-		790B1FB52A41938F0074CF00 /* UIImage+CNLiveColorImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIImage+CNLiveColorImage.swift"; sourceTree = "<group>"; };
+		790B1FB52A41938F0074CF00 /* UIImage+CNLiveExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIImage+CNLiveExtensions.swift"; sourceTree = "<group>"; };
 		790B1FB72A41B6A60074CF00 /* CNLiveMineMessageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineMessageViewController.swift; sourceTree = "<group>"; };
 		790D01812A2D88FC00C5978D /* CNLiveConfigMacro.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CNLiveConfigMacro.swift; sourceTree = "<group>"; };
-		790D01842A2D89E100C5978D /* UIColor+CNHexColor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIColor+CNHexColor.swift"; sourceTree = "<group>"; };
+		790D01842A2D89E100C5978D /* UIColor+CNLiveExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIColor+CNLiveExtensions.swift"; sourceTree = "<group>"; };
 		790D018A2A2D8B3300C5978D /* CNLiveLoginViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveLoginViewController.swift; sourceTree = "<group>"; };
 		790D01902A2DAC5E00C5978D /* CNLiveConfigFontMacro.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveConfigFontMacro.swift; sourceTree = "<group>"; };
 		790D01992A2DCAE400C5978D /* CNLiveViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CNLiveViewController.swift; sourceTree = "<group>"; };
-		790D019C2A2DCBD000C5978D /* UIView+CNGradient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+CNGradient.swift"; sourceTree = "<group>"; };
+		790D019C2A2DCBD000C5978D /* UIView+CNLiveExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+CNLiveExtensions.swift"; sourceTree = "<group>"; };
 		790D019E2A2DD66E00C5978D /* CNLiveLoginViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveLoginViewModel.swift; sourceTree = "<group>"; };
 		790D01A22A2DDBA300C5978D /* CNLiveConfigManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveConfigManager.swift; sourceTree = "<group>"; };
 		790D01A42A2DF65E00C5978D /* CNLiveLoginPickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveLoginPickerView.swift; sourceTree = "<group>"; };
@@ -128,7 +127,7 @@
 		79282A452A2F457D00B5F8CF /* CNLiveMineViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineViewController.swift; sourceTree = "<group>"; };
 		792E57D82A3AA2F2005834DB /* CNLiveCommonBaseModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveCommonBaseModel.swift; sourceTree = "<group>"; };
 		792E57DA2A3AE9F4005834DB /* CNLiveCommonQiniuTool.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveCommonQiniuTool.swift; sourceTree = "<group>"; };
-		79396EEC2A319F220053E1AF /* UIView+CNLiveCurrentVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+CNLiveCurrentVC.swift"; sourceTree = "<group>"; };
+		79396EEC2A319F220053E1AF /* NSObject+CNLiveExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSObject+CNLiveExtensions.swift"; sourceTree = "<group>"; };
 		79396EF02A31C21B0053E1AF /* CNLiveInfoShowViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveInfoShowViewController.swift; sourceTree = "<group>"; };
 		7963988D2A260C0100D045EB /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7963989C2A260E6200D045EB /* CNLiveBaseViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CNLiveBaseViewController.swift; sourceTree = "<group>"; };
@@ -140,7 +139,7 @@
 		798A44E92A30135D00815935 /* CNLiveMineBodyListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineBodyListView.swift; sourceTree = "<group>"; };
 		798A44EB2A302DBE00815935 /* CNLiveMineAddInfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineAddInfoViewController.swift; sourceTree = "<group>"; };
 		798A44ED2A305AAC00815935 /* CNLiveBaseNavigationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveBaseNavigationController.swift; sourceTree = "<group>"; };
-		798A44EF2A305BC200815935 /* UIButton+CNLiveExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIButton+CNLiveExtension.swift"; sourceTree = "<group>"; };
+		798A44EF2A305BC200815935 /* UIButton+CNLiveExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIButton+CNLiveExtensions.swift"; sourceTree = "<group>"; };
 		798A44F12A30674200815935 /* CNLiveMineSubBodyListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineSubBodyListView.swift; sourceTree = "<group>"; };
 		798A44F52A3077ED00815935 /* CNLiveHotButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CNLiveHotButton.swift; sourceTree = "<group>"; };
 		798A44F82A30835400815935 /* CNLiveHelpFeedBackViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveHelpFeedBackViewController.swift; sourceTree = "<group>"; };
@@ -148,7 +147,6 @@
 		798A44FC2A309EBA00815935 /* CNLiveTypeFeedBackViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveTypeFeedBackViewController.swift; sourceTree = "<group>"; };
 		798A44FE2A30A0A800815935 /* CNLiveInputFeedBackViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveInputFeedBackViewController.swift; sourceTree = "<group>"; };
 		79A68C512A26F59C00DC3B43 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = metaCode/Info.plist; sourceTree = "<group>"; };
-		79BDDCBD2A3C3FC8008560FC /* NSObject+CNLiveJSONTool.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSObject+CNLiveJSONTool.swift"; sourceTree = "<group>"; };
 		79F4B1152A32B96B00993C03 /* CNLiveMineInfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineInfoViewController.swift; sourceTree = "<group>"; };
 		79F4B1192A32F21400993C03 /* CNLiveMineNickViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineNickViewController.swift; sourceTree = "<group>"; };
 		79F4B11B2A33036E00993C03 /* CNLiveMineInfoAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineInfoAlertView.swift; sourceTree = "<group>"; };
@@ -156,7 +154,7 @@
 		7C2703322A36CC660061EC50 /* CNLiveGlobalBlock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveGlobalBlock.swift; sourceTree = "<group>"; };
 		7C2703352A3AFD3A0061EC50 /* CNLiveEnvironment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveEnvironment.swift; sourceTree = "<group>"; };
 		7C4931282A2D8BA8000E44B4 /* CNLiveBaseTabBarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveBaseTabBarViewController.swift; sourceTree = "<group>"; };
-		7C49312C2A2DB9FA000E44B4 /* UITabBar+CNBadge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITabBar+CNBadge.swift"; sourceTree = "<group>"; };
+		7C49312C2A2DB9FA000E44B4 /* UITabBar+CNLiveExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITabBar+CNLiveExtensions.swift"; sourceTree = "<group>"; };
 		7C4931302A2F142F000E44B4 /* CNHomePageBackgroupView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNHomePageBackgroupView.swift; sourceTree = "<group>"; };
 		7C4931332A307B58000E44B4 /* slide_down.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = slide_down.gif; sourceTree = "<group>"; };
 		7C4931352A307B60000E44B4 /* slide_up.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = slide_up.gif; sourceTree = "<group>"; };
@@ -178,7 +176,7 @@
 		7CD675452A274167008354C1 /* NewPagedFlowView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NewPagedFlowView.h; sourceTree = "<group>"; };
 		7CD675462A274167008354C1 /* PGIndexBannerSubiew.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PGIndexBannerSubiew.m; sourceTree = "<group>"; };
 		7CD6754E2A2840B9008354C1 /* CNMetaCodeHomePageController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CNMetaCodeHomePageController.swift; sourceTree = "<group>"; };
-		7CD675512A29C04B008354C1 /* CNLiveConstant.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveConstant.swift; sourceTree = "<group>"; };
+		7CD675512A29C04B008354C1 /* CNLiveConfigstant.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveConfigstant.swift; sourceTree = "<group>"; };
 		818163B82A25CFCC00579C86 /* metaCode.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = metaCode.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		818163C22A25CFCC00579C86 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		818163C42A25CFCF00579C86 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -237,14 +235,13 @@
 		790D01832A2D89E100C5978D /* Extensions */ = {
 			isa = PBXGroup;
 			children = (
-				790D01842A2D89E100C5978D /* UIColor+CNHexColor.swift */,
-				7C49312C2A2DB9FA000E44B4 /* UITabBar+CNBadge.swift */,
-				790D019C2A2DCBD000C5978D /* UIView+CNGradient.swift */,
+				790D01842A2D89E100C5978D /* UIColor+CNLiveExtensions.swift */,
+				7C49312C2A2DB9FA000E44B4 /* UITabBar+CNLiveExtensions.swift */,
+				790D019C2A2DCBD000C5978D /* UIView+CNLiveExtensions.swift */,
 				79282A3B2A2EDC2500B5F8CF /* NSString+CNLiveExtensions.swift */,
-				798A44EF2A305BC200815935 /* UIButton+CNLiveExtension.swift */,
-				79396EEC2A319F220053E1AF /* UIView+CNLiveCurrentVC.swift */,
-				79BDDCBD2A3C3FC8008560FC /* NSObject+CNLiveJSONTool.swift */,
-				790B1FB52A41938F0074CF00 /* UIImage+CNLiveColorImage.swift */,
+				798A44EF2A305BC200815935 /* UIButton+CNLiveExtensions.swift */,
+				79396EEC2A319F220053E1AF /* NSObject+CNLiveExtensions.swift */,
+				790B1FB52A41938F0074CF00 /* UIImage+CNLiveExtensions.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -337,7 +334,6 @@
 				7C2703312A36CC430061EC50 /* Global */,
 				798A44F32A3077ED00815935 /* CustomView */,
 				790D01832A2D89E100C5978D /* Extensions */,
-				7CD675502A29C036008354C1 /* Constant */,
 				796398912A260C0100D045EB /* Common */,
 				796398922A260C0100D045EB /* Config */,
 				796398902A260C0100D045EB /* Main */,
@@ -403,6 +399,7 @@
 		796398922A260C0100D045EB /* Config */ = {
 			isa = PBXGroup;
 			children = (
+				7CD675512A29C04B008354C1 /* CNLiveConfigstant.swift */,
 				790D01812A2D88FC00C5978D /* CNLiveConfigMacro.swift */,
 				790D01902A2DAC5E00C5978D /* CNLiveConfigFontMacro.swift */,
 				790D01A22A2DDBA300C5978D /* CNLiveConfigManager.swift */,
@@ -531,14 +528,6 @@
 			path = HomePage/Controller;
 			sourceTree = "<group>";
 		};
-		7CD675502A29C036008354C1 /* Constant */ = {
-			isa = PBXGroup;
-			children = (
-				7CD675512A29C04B008354C1 /* CNLiveConstant.swift */,
-			);
-			path = Constant;
-			sourceTree = "<group>";
-		};
 		818163AF2A25CFCC00579C86 = {
 			isa = PBXGroup;
 			children = (
@@ -857,11 +846,13 @@
 				7CD675482A274167008354C1 /* PGIndexBannerSubiew.m in Sources */,
 				790D019F2A2DD66E00C5978D /* CNLiveLoginViewModel.swift in Sources */,
 				7C7C62F62A4D72E9007A912E /* CNIdentityDB.swift in Sources */,
+				790B1FB62A41938F0074CF00 /* UIImage+CNLiveExtensions.swift in Sources */,
+				790D019D2A2DCBD000C5978D /* UIView+CNLiveExtensions.swift in Sources */,
 				790B1FB62A41938F0074CF00 /* UIImage+CNLiveColorImage.swift in Sources */,
 				790D019D2A2DCBD000C5978D /* UIView+CNGradient.swift in Sources */,
 				798A44F72A3077ED00815935 /* CNLiveHotButton.swift in Sources */,
 				7CD6753D2A2740B0008354C1 /* CNMainView.swift in Sources */,
-				7CD675522A29C04B008354C1 /* CNLiveConstant.swift in Sources */,
+				7CD675522A29C04B008354C1 /* CNLiveConfigstant.swift in Sources */,
 				79282A402A2F055100B5F8CF /* CNLiveConfigUserInfo.swift in Sources */,
 				7C83B43E2A52B8BA004BF4A4 /* CNHomePageViewModel.swift in Sources */,
 				7C4931382A307BDB000E44B4 /* CNHomePageGuideView.swift in Sources */,
@@ -880,21 +871,20 @@
 				798A44FF2A30A0A800815935 /* CNLiveInputFeedBackViewController.swift in Sources */,
 				79282A442A2F1C1E00B5F8CF /* CNLiveLoginAuthView.swift in Sources */,
 				7C2703302A36CBE30061EC50 /* CNCertificationView.swift in Sources */,
-				79BDDCBE2A3C3FC8008560FC /* NSObject+CNLiveJSONTool.swift in Sources */,
 				790D01A32A2DDBA300C5978D /* CNLiveConfigManager.swift in Sources */,
 				7C2703332A36CC660061EC50 /* CNLiveGlobalBlock.swift in Sources */,
 				7987BF3D2A497644000A1ABC /* CNLiveMineQuestViewController.swift in Sources */,
 				798A44EA2A30135D00815935 /* CNLiveMineBodyListView.swift in Sources */,
 				798A44F92A30835400815935 /* CNLiveHelpFeedBackViewController.swift in Sources */,
 				79A68C4A2A26E6CE00DC3B43 /* (null) in Sources */,
-				790D01852A2D89E100C5978D /* UIColor+CNHexColor.swift in Sources */,
-				79396EED2A319F220053E1AF /* UIView+CNLiveCurrentVC.swift in Sources */,
+				790D01852A2D89E100C5978D /* UIColor+CNLiveExtensions.swift in Sources */,
+				79396EED2A319F220053E1AF /* NSObject+CNLiveExtensions.swift in Sources */,
 				7C4931312A2F142F000E44B4 /* CNHomePageBackgroupView.swift in Sources */,
 				790D018B2A2D8B3300C5978D /* CNLiveLoginViewController.swift in Sources */,
 				798A44EC2A302DBE00815935 /* CNLiveMineAddInfoViewController.swift in Sources */,
 				7CD675422A2740F8008354C1 /* CNCustomIndexView.swift in Sources */,
 				790D01912A2DAC5E00C5978D /* CNLiveConfigFontMacro.swift in Sources */,
-				790D01852A2D89E100C5978D /* UIColor+CNHexColor.swift in Sources */,
+				790D01852A2D89E100C5978D /* UIColor+CNLiveExtensions.swift in Sources */,
 				790B1FB42A4153E90074CF00 /* CNLiveMineBaseModel.swift in Sources */,
 				7978A8432A396632007C86B8 /* CNLiveMineViewModel.swift in Sources */,
 				798A44EE2A305AAC00815935 /* CNLiveBaseNavigationController.swift in Sources */,
@@ -904,11 +894,11 @@
 				7CD6753F2A2740B0008354C1 /* CNDownSlideViewRemindView.swift in Sources */,
 				7CD6753C2A2740B0008354C1 /* CNUpSlideViewRemindView.swift in Sources */,
 				798A44E82A30134400815935 /* CNLiveMineHeaderView.swift in Sources */,
-				7C49312D2A2DB9FA000E44B4 /* UITabBar+CNBadge.swift in Sources */,
+				7C49312D2A2DB9FA000E44B4 /* UITabBar+CNLiveExtensions.swift in Sources */,
 				790D019A2A2DCAE400C5978D /* CNLiveViewController.swift in Sources */,
 				79A68C4C2A26EA6000DC3B43 /* (null) in Sources */,
 				79282A462A2F457D00B5F8CF /* CNLiveMineViewController.swift in Sources */,
-				798A44F02A305BC200815935 /* UIButton+CNLiveExtension.swift in Sources */,
+				798A44F02A305BC200815935 /* UIButton+CNLiveExtensions.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -55,6 +55,7 @@ class UploadManager: NSObject {
         param.setValue("2", forKey: "storageType")
         param.setValue(kBucketName_QN, forKey: "bucket")
         showLoading(message: "上传处理中...")
+        CNLiveNetworking.setupShowResult(true)
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.requestNetwork(with: .POST, urlString: "\(CNLiveEnvironmentManager.shared.img_token_url)/vod_epg/getUploadAuthForApp", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
@@ -98,7 +99,7 @@ class UploadManager: NSObject {
                         }, option: uploadOption)
                     }
                 } else {
-                    showMessage(message: resp["message"] as! String)
+                    showMessage(message: resp["errorMessage"] as! String)
                 }
             } else {
                 showMessage(message: error!.localizedDescription)
@@ -109,7 +110,7 @@ class UploadManager: NSObject {
     /// 设置图片名称
     /// - Returns: 图片名
     static private func createImageFileName() -> String {
-        let imageName = "802/mateCode/img/\(NSDate().string(withFormat: "yyyyMMdd") ?? "0000")/\(arc4random()).jpg"
+        let imageName = "802/mateCode/img/\(NSDate().string(withFormat: "yyyy/MM/dd") ?? "0000")/\(arc4random()).jpg"
         return imageName
     }
 }
@@ -7,6 +7,7 @@
 import Foundation
 import MBProgressHUD
+import HandyJSON
 func currentViewController() -> (UIViewController?) {
    var window = UIApplication.shared.keyWindow
@@ -118,3 +119,76 @@ func hiddenLoading() {
     let delegate = UIApplication.shared.delegate as! AppDelegate
     MBProgressHUD.hide(for: delegate.window!, animated: true)
 }
+
+
+///####模型转换#########
+/**
+ *  Json转对象
+ */
+func jsonToModel(_ jsonStr:String,_ modelType:HandyJSON.Type) -> BaseModel {
+    if jsonStr == "" || jsonStr.count == 0 {
+        #if DEBUG
+            print("jsonoModel:字符串为空")
+        #endif
+        return BaseModel()
+    }
+    return modelType.deserialize(from: jsonStr)  as! BaseModel
+}
+
+/**
+ *  Json转数组对象
+ */
+func jsonArrayToModel(_ jsonArrayStr:String, _ modelType:HandyJSON.Type) ->[BaseModel] {
+    if jsonArrayStr == "" || jsonArrayStr.count == 0 {
+        #if DEBUG
+            print("jsonToModelArray:字符串为空")
+        #endif
+        return []
+    }
+    var modelArray:[BaseModel] = []
+    let data = jsonArrayStr.data(using: String.Encoding.utf8)
+    let peoplesArray = try! JSONSerialization.jsonObject(with:data!, options: JSONSerialization.ReadingOptions()) as? [AnyObject]
+    for people in peoplesArray! {
+        modelArray.append(dictionaryToModel(people as! [String : Any], modelType,""))
+    }
+    return modelArray
+
+}
+/**
+ *  字典转对象
+ */
+func dictionaryToModel(_ dictionStr:[String:Any],_ modelType:HandyJSON.Type,_ path: String) -> BaseModel {
+    if dictionStr.count == 0 {
+        #if DEBUG
+            print("dictionaryToModel:字符串为空")
+        #endif
+        return BaseModel()
+    }
+    return modelType.deserialize(from: dictionStr, designatedPath: path) as! BaseModel
+}
+
+/**
+ *  对象转JSON
+ */
+func modelToJson(_ model:BaseModel?) -> String {
+    if model == nil {
+        #if DEBUG
+            print("modelToJson:model为空")
+        #endif
+         return ""
+    }
+    return (model?.toJSONString())!
+}
+
+/**
+ *  对象转字典
+ */
+func modelToDictionary(_ model:BaseModel?) -> [String:Any] {
+    if model == nil {
+        #if DEBUG
+            print("modelToJson:model为空")
+        #endif
+        return [:]
+    }
+    return (model?.toJSON())!
+}
-//
-//  NSObject+CNLiveJSONTool.swift
-//  metaCode
-//
-//  Created by open on 2023/6/16.
-//
-
-import Foundation
-import HandyJSON
-
-/**
- *  Json转对象
- */
-func jsonToModel(_ jsonStr:String,_ modelType:HandyJSON.Type) -> BaseModel {
-    if jsonStr == "" || jsonStr.count == 0 {
-        #if DEBUG
-            print("jsonoModel:字符串为空")
-        #endif
-        return BaseModel()
-    }
-    return modelType.deserialize(from: jsonStr)  as! BaseModel
-}
-
-/**
- *  Json转数组对象
- */
-func jsonArrayToModel(_ jsonArrayStr:String, _ modelType:HandyJSON.Type) ->[BaseModel] {
-    if jsonArrayStr == "" || jsonArrayStr.count == 0 {
-        #if DEBUG
-            print("jsonToModelArray:字符串为空")
-        #endif
-        return []
-    }
-    var modelArray:[BaseModel] = []
-    let data = jsonArrayStr.data(using: String.Encoding.utf8)
-    let peoplesArray = try! JSONSerialization.jsonObject(with:data!, options: JSONSerialization.ReadingOptions()) as? [AnyObject]
-    for people in peoplesArray! {
-        modelArray.append(dictionaryToModel(people as! [String : Any], modelType,""))
-    }
-    return modelArray
-
-}
-/**
- *  字典转对象
- */
-func dictionaryToModel(_ dictionStr:[String:Any],_ modelType:HandyJSON.Type,_ path: String) -> BaseModel {
-    if dictionStr.count == 0 {
-        #if DEBUG
-            print("dictionaryToModel:字符串为空")
-        #endif
-        return BaseModel()
-    }
-    return modelType.deserialize(from: dictionStr, designatedPath: path) as! BaseModel
-}
-
-/**
- *  对象转JSON
- */
-func modelToJson(_ model:BaseModel?) -> String {
-    if model == nil {
-        #if DEBUG
-            print("modelToJson:model为空")
-        #endif
-         return ""
-    }
-    return (model?.toJSONString())!
-}
-
-/**
- *  对象转字典
- */
-func modelToDictionary(_ model:BaseModel?) -> [String:Any] {
-    if model == nil {
-        #if DEBUG
-            print("modelToJson:model为空")
-        #endif
-        return [:]
-    }
-    return (model?.toJSON())!
-}
@@ -6,7 +6,7 @@
 //
 import Foundation
-import DZNEmptyDataSet
+import EmptyDataSet_Swift
 enum CNLiveMineInfoShowType {
     case add//添加身份
@@ -15,7 +15,7 @@ enum CNLiveMineInfoShowType {
 }
-class CNLiveMineAddInfoViewController : CNLiveBaseViewController, UITableViewDelegate, UITableViewDataSource, UITableViewDragDelegate, UITableViewDropDelegate, DZNEmptyDataSetSource, DZNEmptyDataSetDelegate{
+class CNLiveMineAddInfoViewController : CNLiveBaseViewController, UITableViewDelegate, UITableViewDataSource, UITableViewDragDelegate, UITableViewDropDelegate, EmptyDataSetSource, EmptyDataSetDelegate{
     let kCNLiveMineInfoLListTableViewIdentifier = "kCNLiveMineInfoLListTableViewIdentifier"
     let kCNLiveMineStandInfoTableViewIdentifier = "kCNLiveMineStandInfoTableViewIdentifier"
@@ -125,16 +125,13 @@ class CNLiveMineAddInfoViewController : CNLiveBaseViewController, UITableViewDel
     }
-    @objc func noteSetAction() {
-        
-    }
-    @objc func backCopyAction() {
-        
-    }
+    @objc func noteSetAction() {}
+    @objc func backCopyAction() {}
 }
 extension CNLiveMineAddInfoViewController {
-    func image(forEmptyDataSet scrollView: UIScrollView!) -> UIImage! {
+    
+    func image(forEmptyDataSet scrollView: UIScrollView) -> UIImage? {
         if network_type == .failed  || network_type == .unkonw {
             return UIImage(named: "mine_list_source_unusual_failed")
         }
@@ -147,7 +144,7 @@ extension CNLiveMineAddInfoViewController {
         return UIImage(named: "mine_list_source_unusual_empty")
     }
-    func title(forEmptyDataSet scrollView: UIScrollView!) -> NSAttributedString! {
+    func title(forEmptyDataSet scrollView: UIScrollView) -> NSAttributedString? {
         var defult_string = ""
         if network_type == .failed  || network_type == .unkonw {
             defult_string = "接口请求错误,刷新试试～"
@@ -169,7 +166,8 @@ extension CNLiveMineAddInfoViewController {
         }
         return NSAttributedString(string: defult_string, attributes: [.font: Font_17,.foregroundColor: HexColor("#666666")!])
     }
-    func buttonTitle(forEmptyDataSet scrollView: UIScrollView!, for state: UIControl.State) -> NSAttributedString! {
+    
+    func buttonTitle(forEmptyDataSet scrollView: UIScrollView, for state: UIControl.State) -> NSAttributedString? {
         if _show_type == .message && (network_type == .failed || network_type == .noNetwork) {
             let attributes = [NSAttributedString.Key.font:Font_16_Fit,
                               NSAttributedString.Key.foregroundColor: HexColor("#609BFF")]
@@ -178,7 +176,7 @@ extension CNLiveMineAddInfoViewController {
         return nil
     }
-    func emptyDataSet(_ scrollView: UIScrollView!, didTap button: UIButton!) {
+    func emptyDataSet(_ scrollView: UIScrollView, didTapView view: UIView) {
         loadData()
     }
@@ -14,7 +14,6 @@ let kCNLiveSectionHeaderHeight = 200//头视图高度
 extension JXPagingListContainerView: JXSegmentedViewListContainer {}
-
 class CNLiveMineEarnViewController: CNLiveBaseViewController, JXPagingViewDelegate {
     func tableHeaderViewHeight(in pagingView: JXPagingView) -> Int {
@@ -429,6 +429,8 @@ class MineEarnHeaderView: UIView {
+    
+    
     override init(frame: CGRect) {
         super.init(frame: frame)
@@ -23,6 +23,14 @@ class UpdateInfoModel: BaseModel {
     var upgradePoint:String = ""
     var status:String = ""
     var createTime:String = ""
+    
+    /**
+     /api/identityApi/list
+     接口的数据 id createTime为公共参数
+     */
+    var name:String = ""
+    var icon:String = ""
+    var enable:String = ""
 }
 class NewsModel: BaseModel {
@@ -134,38 +134,34 @@ class CNLiveMineViewModel: NSObject {
     /// - Parameter resultBlock: 结果返回
     static func requestAccessTokenAction(resultBlock: @escaping resultBlock) {
         //当前时间大于最大允许时间则表明当前access_token已经过期需要重新请求
-//        if CNLiveMineViewModel.timeStamp > NSNumber(string: UserInfoManager.shared.userInfo.expires_in)?.intValue ?? 0 {
-            let param = NSMutableDictionary.init()
-            param.setValue(APPId, forKey: "appId")
-            param.setValue(APPSecret, forKey: "secret")
-            showLoading(message: "")
-            CNLiveNetworking.setAllowRequestDefaultArgument(false)
-            CNLiveNetworking.setupShowDataResult(false)
-            CNLiveNetworking.requestNetwork(with: .POST, urlString: "/open/api2/token", param: (param as! [AnyHashable : Any]), cacheType: .networkOnly) { task, result, error in
-                hiddenLoading()
-                if (error == nil) {
-                    let resp = result as! NSDictionary
-                    let errorCode = "\(resp["errorCode"] ?? 0)"
-                    if (errorCode == "0") {
-                        let data = resp["data"] as! Dictionary<String, Any>
-                        let userInfo = UserInfoManager.shared.userInfo
-                        userInfo.access_token = data["access_token"] as! String
-                        let expires_in = data["expires_in"] as! NSNumber
-                        userInfo.expires_in = "\(expires_in.intValue+CNLiveMineViewModel.timeStamp)"
-                        UserInfoManager.cacheUserInfo(userInfo: userInfo)
-                        resultBlock(.other,true)
-                    } else {
-                        showMessage(message: resp["errorMessage"] as! String)
-                        resultBlock(.other,false)
-                    }
+        let param = NSMutableDictionary.init()
+        param.setValue(APPId, forKey: "appId")
+        param.setValue(APPSecret, forKey: "secret")
+        showLoading(message: "")
+        CNLiveNetworking.setAllowRequestDefaultArgument(false)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: "/open/api2/token", param: (param as! [AnyHashable : Any]), cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let errorCode = "\(resp["errorCode"] ?? 0)"
+                if (errorCode == "0") {
+                    let data = resp["data"] as! Dictionary<String, Any>
+                    let userInfo = UserInfoManager.shared.userInfo
+                    userInfo.access_token = data["access_token"] as! String
+                    let expires_in = data["expires_in"] as! NSNumber
+                    userInfo.expires_in = "\(expires_in.intValue+CNLiveMineViewModel.timeStamp)"
+                    UserInfoManager.cacheUserInfo(userInfo: userInfo)
+                    resultBlock(.other,true)
                 } else {
-                    showMessage(message: "修改头像失败")
+                    showMessage(message: resp["errorMessage"] as! String)
                     resultBlock(.other,false)
                 }
+            } else {
+                showMessage(message: "修改头像失败")
+                resultBlock(.other,false)
             }
-//        } else {
-//            resultBlock(.other,true)
-//        }
+        }
     }
     /// 上传反馈意见接口
@@ -279,6 +275,40 @@ class CNLiveMineViewModel: NSObject {
         }
     }
+    /// 获取身份列表
+    /// - Parameters:
+    ///   - page: 页数
+    ///   - resultBlock: 返回
+    static func requestIdenList(page: Int,resultBlock: @escaping resultNewsBlock) {
+        showLoading(message: "")
+        let param = NSMutableDictionary()
+        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
+        param.setValue("\(page)", forKey: "page")
+        param.setValue("10", forKey: "pageSize")
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseMCUrl+"/identityApi/list", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let errorCode = "\(resp["errorCode"] ?? "0")"
+                if (errorCode == "0") {
+                    let userInfoModel = dictionaryToModel(resp as! [String : Any], UpdateInfoModel.self,"data") as! UpdateInfoModel
+                    resultBlock(userInfoModel,.success)
+                    
+                } else {
+                    resultBlock(NSNull(),.failed)
+                }
+            } else {
+                if CNLiveNetworking.isNetworking() {
+                    resultBlock(NSNull(),.failed)
+                } else {
+                    resultBlock(NSNull(),.noNetwork)
+                }
+            }
+        }
+    }
+    
     /// 获取十位时间戳
     static var timeStamp: Int {
         let timeInterval: TimeInterval = NSDate().timeIntervalSince1970