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

王军波
2 parents fabe44c5 8abb67e5
Showing 10 changed files with 21 additions and 866 deletions
LiveVideoCloud.xcodeproj/project.pbxproj
LiveVideoCloud/Classes/Sections/Mine/Controllers/MineLiveController.m
LiveVideoCloud/Classes/Sections/Mine/Login/Controller/LoginViewController.m
LiveVideoCloud/PrefixHeader.pch
LiveVideoCloud/UtilKits/CNLiveWebView.m
LiveVideoCloud/UtilKits/Category/DESUtility.h
LiveVideoCloud/UtilKits/Category/DESUtility.m
LiveVideoCloud/UtilKits/Common.h
LiveVideoCloud/UtilKits/UserTools/UserTools.h
LiveVideoCloud/UtilKits/UserTools/UserTools.m
@@ -42,7 +42,6 @@
 		4B45CEAB1EB86BFA0079AFB7 /* NSString+ZXExtension.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B45CEAA1EB86BFA0079AFB7 /* NSString+ZXExtension.m */; };
 		4B45CEAE1EB873630079AFB7 /* UserInformationModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B45CEAD1EB873630079AFB7 /* UserInformationModel.m */; };
 		4BD855CD1EBAC4B70082061D /* CNLiveKeychainWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BD855CC1EBAC4B70082061D /* CNLiveKeychainWrapper.m */; };
-		4BD855D11EBAC7220082061D /* DESUtility.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BD855D01EBAC7220082061D /* DESUtility.m */; };
 		4BD855FA1EBACD530082061D /* AFHTTPRequestOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BD855D61EBACD530082061D /* AFHTTPRequestOperation.m */; };
 		4BD855FB1EBACD530082061D /* AFHTTPRequestOperationManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BD855D81EBACD530082061D /* AFHTTPRequestOperationManager.m */; };
 		4BD855FC1EBACD530082061D /* AFHTTPSessionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BD855DA1EBACD530082061D /* AFHTTPSessionManager.m */; };
@@ -370,8 +369,6 @@
 		4BD855CB1EBAC4B70082061D /* CNLiveKeychainWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveKeychainWrapper.h; sourceTree = "<group>"; };
 		4BD855CC1EBAC4B70082061D /* CNLiveKeychainWrapper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveKeychainWrapper.m; sourceTree = "<group>"; };
 		4BD855CE1EBAC57A0082061D /* Common.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Common.h; sourceTree = "<group>"; };
-		4BD855CF1EBAC7220082061D /* DESUtility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DESUtility.h; sourceTree = "<group>"; };
-		4BD855D01EBAC7220082061D /* DESUtility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DESUtility.m; sourceTree = "<group>"; };
 		4BD855D51EBACD530082061D /* AFHTTPRequestOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AFHTTPRequestOperation.h; sourceTree = "<group>"; };
 		4BD855D61EBACD530082061D /* AFHTTPRequestOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AFHTTPRequestOperation.m; sourceTree = "<group>"; };
 		4BD855D71EBACD530082061D /* AFHTTPRequestOperationManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AFHTTPRequestOperationManager.h; sourceTree = "<group>"; };
@@ -1605,8 +1602,6 @@
 				4BD856171EBAD35C0082061D /* NSDictionary+Safety.m */,
 				4BD856131EBAD31A0082061D /* NSString+UrlEncode.h */,
 				4BD856141EBAD31A0082061D /* NSString+UrlEncode.m */,
-				4BD855CF1EBAC7220082061D /* DESUtility.h */,
-				4BD855D01EBAC7220082061D /* DESUtility.m */,
 				4BD855CB1EBAC4B70082061D /* CNLiveKeychainWrapper.h */,
 				4BD855CC1EBAC4B70082061D /* CNLiveKeychainWrapper.m */,
 				4B45CEA91EB86BFA0079AFB7 /* NSString+ZXExtension.h */,
@@ -2397,7 +2392,6 @@
 				D2CBC13B1ECC157A00E00279 /* LVCVerifyLiveAuthService.m in Sources */,
 				D2029D041E6EAE2E0027CD92 /* UILabel+ContentSize.m in Sources */,
 				4B45CE7C1EB86A590079AFB7 /* MineSettingViewController.m in Sources */,
-				4BD855D11EBAC7220082061D /* DESUtility.m in Sources */,
 				D25530031E79115100DF38A5 /* AnimQueueManager.m in Sources */,
 				D2029B861E6EAAA50027CD92 /* main.m in Sources */,
 				4B45CEA71EB86B9F0079AFB7 /* NSObject+UserModel.m in Sources */,
@@ -55,7 +55,6 @@
     pageNo += 1;
     NSDictionary *param = @{@"pageNo": [NSString stringWithFormat:@"%d", pageNo], @"pageSize": @"20"};
-    weakself
     [UserTools getPlayRecord:param success:^(AFHTTPRequestOperation * _Nonnull operation, id  _Nonnull responseObject) {
         [SVProgressHUD dismiss];
         [self.table.header endRefreshing];
@@ -88,21 +88,14 @@
             if ([[result allKeys] containsObject:@"errorCode"] && [result[@"errorCode"] isEqualToString:@"0"]) {
                 [UserTools saveUserinfoDic:result[@"data"]];
+                [SVProgressHUD dismiss];
+
+                if(self.isModalButton) {
+                    [self dismissViewControllerAnimated:YES completion:NULL];
+                } else {
+                    [self.navigationController popViewControllerAnimated:YES];
+                }
-                [UserTools getChinaCoinCount:^(BOOL success, NSError * _Nullable error, NSString * _Nullable count) {
-                    if (!success) {
-                        [SVProgressHUD dismiss];
-                        [Tools showHUDInView:self.view withString:error.description autoHide:YES];
-                        return;
-                    }
-                    [SVProgressHUD dismiss];
-                    [UserTools setLocalUserInfo:chinaCoin withKey:count];
-                    if(self.isModalButton) {
-                        [self dismissViewControllerAnimated:YES completion:NULL];
-                    } else {
-                        [self.navigationController popViewControllerAnimated:YES];
-                    }
-                }];
             } else {
                 [SVProgressHUD dismiss];
@@ -29,8 +29,8 @@
     #import <CNLivePlayerSDK/CNLiveWebcastManager.h>
     #import <CNLiveMsgTools/CNLiveMsgManager.h>
     #import <CNLiveChatManager/CNLiveChatManager.h>
+#import <CNLiveUserSystemSDK/CNLiveUserSystemCenter.h>
     #import "LVCCommentModel.h"
-    #import <CNLiveUserSystemSDK/CNLiveUserSystemCenter.h>
     #import "Common.h"
     #import "MJExtension.h"
@@ -44,7 +44,6 @@
     #import "UIImage+ScaleImageSize.h"
     #import "UIView+ViewController.h"
     #import "SevenSwitch.h"
-    #import "DESUtility.h"
     #import "UserInformationModel.h"
     #import "NSString+UrlEncode.h"
     #import "NSDictionary+Safety.h"
@@ -83,15 +82,6 @@
 #define JBAppId @"hdtv"
 #define JBAppVersion [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"]            ///debug用 "CFBundleVersion"
-//#define UserAppId                       @"60_itax25eq82"
-//#define UserAppKey                      @"55a25a7f7e1124937fba06c82999d9a7c18379e2d24784"
-//#define UserAppSceret                   @"29798eea30388f71d4a33b75d308c3cbb47077d56ce680"
-
-
-//com.cnlive.shixunyun
-//#define UserAppId                       @"60_j0uqrv0u11"
-//#define UserAppKey                      @"876c5efece0fc9c98c51ff2180ee1bcfa5c5b5af202c78"
-//#define UserAppSceret                   @"ee844ea67b6be7303b6f5d9365af10ac09933c0828aba7"
 #define PlaceholderImage @"placehodler"
 #define appDelegate ((AppDelegate *)[UIApplication sharedApplication].delegate)
@@ -207,30 +207,7 @@
     }
     return [keyValueDic copy];
 }
-/*
-- (NSString *)encryptTokenWithUrlStr:(NSString *)urlStr sid:(NSString *)sid
-{
-    NSURL *callbackUrl = [NSURL URLWithString:urlStr];
-//    NSMutableString *token = [[NSMutableString alloc] initWithString:[NSString stringWithFormat:@"plat=i&appid=%@&uuid=%@&sid=%@",AppId,[Tools uidForStat],sid]];
-    if (callbackUrl.query) {
-//        [token appendFormat:@"&%@",callbackUrl.query];
-    }
-    NSString *encryptToken = [[EncryptAndDecrypt base64StringFromText:token encryptKey:HuDongDianShiKey] urlEncode];
-    
-    NSMutableString *newCallbackStr = [[NSMutableString alloc] initWithCapacity:0];
-    NSString *queryStr = [NSString stringWithFormat:@"spId=%@&token=%@",SpId,encryptToken];
-    if ([urlStr containsString:@"?"]) {
-//        NSArray *urlArray = [urlStr componentsSeparatedByString:@"?"];
-//        [newCallbackStr appendFormat:@"%@?%@",[urlArray safetyObjectAtIndex:0],queryStr];
-        [newCallbackStr appendFormat:@"%@&%@", urlStr, queryStr];
-    }
-    else {
-//        [newCallbackStr appendFormat:@"%@?%@",urlStr,queryStr];
-        [newCallbackStr appendFormat:@"%@?%@", urlStr, queryStr];
-    }
-    return [newCallbackStr copy];
-}
-*/
+
 #pragma mark <LoginViewControllerDelegate>
 - (void)isLogin
 {
-//
-//  DESUtility.h
-//  DES
-//
-//  Created by Deli on 14-10-15.
-//  Copyright (c) 2014年 ___Deli___. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@interface DESUtility : NSObject
-
-/************************************************************
- 函数名称 : + (NSString *)base64StringFromText:(NSString *)text
- 函数描述 : 将文本转换为base64格式字符串
- 输入参数 : (NSString *)text    文本
- 输出参数 : N/A
- 返回参数 : (NSString *)    base64格式字符串
- 备注信息 :
- **********************************************************/
-
-+ (NSString *)base64StringFromPayText:(NSString *)text;
-
-/************************************************************
- 函数名称 : + (NSString *)textFromBase64String:(NSString *)base64
- 函数描述 : 将base64格式字符串转换为文本
- 输入参数 : (NSString *)base64  base64格式字符串
- 输出参数 : N/A
- 返回参数 : (NSString *)    文本
- 备注信息 :
- **********************************************************/
-+ (NSString *)textFromBase64String:(NSString *)base64;
-
-+ (NSString *)base64StringFromText:(NSString *)text;
-
-
-@end
-//
-//  DESUtility.m
-//  DES
-//
-//  Created by Deli on 14-10-15.
-//  Copyright (c) 2014年 ___Deli___. All rights reserved.
-//
-
-#import "DESUtility.h"
-#import <CommonCrypto/CommonCrypto.h>
-
-//空字符串
-#define     LocalStr_None           @""
-
-static const char encodingTable[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-@implementation DESUtility
-
-
-+ (NSString *)base64StringFromPayText:(NSString *)text
-{
-    if (text && ![text isEqualToString:LocalStr_None]) {
-        
-        NSString *key = SxyAppKey;
-        NSData *data = [text dataUsingEncoding:NSUTF8StringEncoding];
-        //IOS 自带DES加密 Begin
-        data = [self DESEncrypt:data WithKey:key];
-        //IOS 自带DES加密 End
-        return [self base64EncodedStringFrom:data];
-    }
-    else {
-        return LocalStr_None;
-    }
-}
-
-+ (NSString *)textFromBase64String:(NSString *)base64
-{
-    if (base64 && ![base64 isEqualToString:LocalStr_None]) {
-        
-        NSString *key = @"wang!@#$%";
-        NSData *data = [self dataWithBase64EncodedString:base64];
-        //IOS 自带DES解密 Begin
-        data = [self DESDecrypt:data WithKey:key];
-        //IOS 自带DES加密 End
-        return [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
-    }
-    else {
-        return LocalStr_None;
-    }
-}
-
-+ (NSString *)base64StringFromText:(NSString *)text
-{
-    if (text && ![text isEqualToString:LocalStr_None]) {
-        
-        NSString *key = @"wang!@#$%";
-        NSData *data = [text dataUsingEncoding:NSUTF8StringEncoding];
-        //IOS 自带DES加密 Begin
-        data = [self DESEncrypt:data WithKey:key];
-        //IOS 自带DES加密 End
-        return [self base64EncodedStringFrom:data];
-    }
-    else {
-        return LocalStr_None;
-    }
-}
-
-
-/************************************************************
- 函数名称 : + (NSData *)DESEncrypt:(NSData *)data WithKey:(NSString *)key
- 函数描述 : 文本数据进行DES加密
- 输入参数 : (NSData *)data
- (NSString *)key
- 输出参数 : N/A
- 返回参数 : (NSData *)
- 备注信息 : 此函数不可用于过长文本
- **********************************************************/
-+ (NSData *)DESEncrypt:(NSData *)data WithKey:(NSString *)key
-{
-    char keyPtr[kCCKeySizeAES256*2];
-    bzero(keyPtr, sizeof(keyPtr));
-    
-    [key getCString:keyPtr maxLength:sizeof(keyPtr) encoding:NSUTF8StringEncoding];
-    
-    NSUInteger dataLength = [data length];
-    
-    size_t bufferSize = dataLength + kCCBlockSizeAES128;
-    void *buffer = malloc(bufferSize);
-    
-    size_t numBytesEncrypted = 0;
-    CCCryptorStatus cryptStatus = CCCrypt(kCCEncrypt, kCCAlgorithmDES,
-                                          kCCOptionPKCS7Padding | kCCOptionECBMode,
-                                          keyPtr, kCCBlockSizeDES,
-                                          NULL,
-                                          [data bytes], dataLength,
-                                          buffer, bufferSize,
-                                          &numBytesEncrypted);
-    if (cryptStatus == kCCSuccess) {
-        return [NSData dataWithBytesNoCopy:buffer length:numBytesEncrypted];
-    }
-    
-    free(buffer);
-    return nil;
-}
-
-/************************************************************
- 函数名称 : + (NSData *)DESEncrypt:(NSData *)data WithKey:(NSString *)key
- 函数描述 : 文本数据进行DES解密
- 输入参数 : (NSData *)data
- (NSString *)key
- 输出参数 : N/A
- 返回参数 : (NSData *)
- 备注信息 : 此函数不可用于过长文本
- **********************************************************/
-+ (NSData *)DESDecrypt:(NSData *)data WithKey:(NSString *)key
-{
-    char keyPtr[kCCKeySizeAES256+1];
-    bzero(keyPtr, sizeof(keyPtr));
-    
-    [key getCString:keyPtr maxLength:sizeof(keyPtr) encoding:NSUTF8StringEncoding];
-    
-    NSUInteger dataLength = [data length];
-    
-    size_t bufferSize = dataLength + kCCBlockSizeAES128;
-    void *buffer = malloc(bufferSize);
-    
-    size_t numBytesDecrypted = 0;
-    CCCryptorStatus cryptStatus = CCCrypt(kCCDecrypt, kCCAlgorithmDES,
-                                          kCCOptionPKCS7Padding | kCCOptionECBMode,
-                                          keyPtr, kCCBlockSizeDES,
-                                          NULL,
-                                          [data bytes], dataLength,
-                                          buffer, bufferSize,
-                                          &numBytesDecrypted);
-    
-    if (cryptStatus == kCCSuccess) {
-        return [NSData dataWithBytesNoCopy:buffer length:numBytesDecrypted];
-    }
-    
-    free(buffer);
-    return nil;
-}
-
-/************************************************************
- 函数名称 : + (NSData *)dataWithBase64EncodedString:(NSString *)string
- 函数描述 : base64格式字符串转换为文本数据
- 输入参数 : (NSString *)string
- 输出参数 : N/A
- 返回参数 : (NSData *)
- 备注信息 :
- **********************************************************/
-+ (NSData *)dataWithBase64EncodedString:(NSString *)string
-{
-    if (string == nil)
-        [NSException raise:NSInvalidArgumentException format:nil];
-    if ([string length] == 0)
-        return [NSData data];
-    
-    static char *decodingTable = NULL;
-    if (decodingTable == NULL)
-    {
-        decodingTable = malloc(256);
-        if (decodingTable == NULL)
-            return nil;
-        memset(decodingTable, CHAR_MAX, 256);
-        NSUInteger i;
-        for (i = 0; i < 64; i++)
-            decodingTable[(short)encodingTable[i]] = i;
-    }
-    
-    const char *characters = [string cStringUsingEncoding:NSASCIIStringEncoding];
-    if (characters == NULL)     //  Not an ASCII string!
-        return nil;
-    char *bytes = malloc((([string length] + 3) / 4) * 3);
-    if (bytes == NULL)
-        return nil;
-    NSUInteger length = 0;
-    
-    NSUInteger i = 0;
-    while (YES)
-    {
-        char buffer[4];
-        short bufferLength;
-        for (bufferLength = 0; bufferLength < 4; i++)
-        {
-            if (characters[i] == '\0')
-                break;
-            if (isspace(characters[i]) || characters[i] == '=')
-                continue;
-            buffer[bufferLength] = decodingTable[(short)characters[i]];
-            if (buffer[bufferLength++] == CHAR_MAX)      //  Illegal character!
-            {
-                free(bytes);
-                return nil;
-            }
-        }
-        
-        if (bufferLength == 0)
-            break;
-        if (bufferLength == 1)      //  At least two characters are needed to produce one byte!
-        {
-            free(bytes);
-            return nil;
-        }
-        
-        //  Decode the characters in the buffer to bytes.
-        bytes[length++] = (buffer[0] << 2) | (buffer[1] >> 4);
-        if (bufferLength > 2)
-            bytes[length++] = (buffer[1] << 4) | (buffer[2] >> 2);
-        if (bufferLength > 3)
-            bytes[length++] = (buffer[2] << 6) | buffer[3];
-    }
-    
-    bytes = realloc(bytes, length);
-    return [NSData dataWithBytesNoCopy:bytes length:length];
-}
-
-/************************************************************
- 函数名称 : + (NSString *)base64EncodedStringFrom:(NSData *)data
- 函数描述 : 文本数据转换为base64格式字符串
- 输入参数 : (NSData *)data
- 输出参数 : N/A
- 返回参数 : (NSString *)
- 备注信息 :
- **********************************************************/
-+ (NSString *)base64EncodedStringFrom:(NSData *)data
-{
-    if ([data length] == 0)
-        return @"";
-    
-    char *characters = malloc((([data length] + 2) / 3) * 4);
-    if (characters == NULL)
-        return nil;
-    NSUInteger length = 0;
-    
-    NSUInteger i = 0;
-    while (i < [data length])
-    {
-        char buffer[3] = {0,0,0};
-        short bufferLength = 0;
-        while (bufferLength < 3 && i < [data length])
-            buffer[bufferLength++] = ((char *)[data bytes])[i++];
-        
-        //  Encode the bytes in the buffer to four characters, including padding "=" characters if necessary.
-        characters[length++] = encodingTable[(buffer[0] & 0xFC) >> 2];
-        characters[length++] = encodingTable[((buffer[0] & 0x03) << 4) | ((buffer[1] & 0xF0) >> 4)];
-        if (bufferLength > 1)
-            characters[length++] = encodingTable[((buffer[1] & 0x0F) << 2) | ((buffer[2] & 0xC0) >> 6)];
-        else characters[length++] = '=';
-        if (bufferLength > 2)
-            characters[length++] = encodingTable[buffer[2] & 0x3F];
-        else characters[length++] = '=';
-    }
-    
-    return [[NSString alloc] initWithBytesNoCopy:characters length:length encoding:NSASCIIStringEncoding freeWhenDone:YES];
-}
-
-
-@end
-//
+ //
 //  Common.h
 //  CNLive
 //
@@ -13,17 +13,11 @@
 #ifdef DEBUG
     #define D_NSLog(format, ...) NSLog(format, ## __VA_ARGS__);
     #define AppVersion [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"]            ///debug用 "CFBundleVersion"
-    #define kGeXinAppId         @"QbA9InqDcX6Bf7kL5bkYC7"
-    #define kGeXinAppKey        @"rvylmRHnkU7fPPDE0VA5v1"
-    #define kGeXinAppSecret     @"HX4ZHUiVRA7gAhU0VBa202"
-//https://sandbox.itunes.apple.com/verifyReceipt
 #define IAP_URL             @"https://sandbox.itunes.apple.com/verifyReceipt"
 #else
     #define D_NSLog(format, ...);
     #define AppVersion ([[[NSBundle mainBundle] infoDictionary] objectForKey: @"CFBundleShortVersionString"])
-    #define kGeXinAppId           @"eRHpnUvvHO7U7x75Qd1eR9"
-    #define kGeXinAppKey          @"vqYuunXZJY97GnnKiJ9v94"
-    #define kGeXinAppSecret       @"fKybhWTRai6bkbxGZ9VwD5"
+
     #define IAP_URL               @"https://buy.itunes.apple.com/verifyReceipt"
 #endif
@@ -31,435 +25,33 @@
 #define KScreenHeight ([UIScreen mainScreen].bounds.size.width > [UIScreen mainScreen].bounds.size.height ? [UIScreen mainScreen].bounds.size.width : [UIScreen mainScreen].bounds.size.height)
 #define KVideoHeight (KScreenWidth*9/16)
-//#define kTimeoutInterval    10.0
-
-#define kUploading  @"uploading"            //上传视频的状态
-#define kWait       @"wait"
-#define kFailed     @"failed"
-
-//#define AppId @"spzg"
-#define SpId @"82_iunnscwp07"
-#define SpId1 @"003_003"
-
-#define APPSTOREID      @"385242275"
-
 //视讯云
-#define SxyAppId  @"82_iunnscwp07"
 #define SxyAppKey @"13c6f0ad6f459cd479834b0b39cff99c6cf20c970815bb"
-//互动电视
-//#define HuDongDianShiKey           @"DNGR001L"
-
-#define GuideAppVersion @"guideAppVersion"  //记录版本号判断是否显示引导页
-
-#define HistoryTime @"HistoryTime"  //播放记录时间
-
-#define AdImageInfo @"adImageInfo"  //开机广告信息
-#define AdImageUrl @"adImageUrl"  //开机广告图片地址
-#define AdImageData @"adImageData"   //开机广告图片data
-
-
-#define iBeaconAppKey  @"60b056a30d1f4c98aa158cc91469ad7b" //ibecon的key
-#define kUUID @"E2C56DB5DFFB48D2B060D0F5A71096E0"
-
-// 首页横版cell比例
-#define H_Cell_Ratio    (196.0/300)
-
-// app版本号  debug用 "CFBundleVersion"  release用"CFBundleShortVersionString"
-//#define AppVersion [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"]                ///debug用 "CFBundleVersion"
-//#define AppVersion ([[[NSBundle mainBundle] infoDictionary] objectForKey: @"CFBundleShortVersionString"])    //release用"CFBundleShortVersionString"
-
-#define NoMoreData @"没有更多数据"
-//gift
-#define GiftCellHeight 80.0
-#define KreadGiftImgById  @"http://pom.cnlive.com/gf/getGiftImg.action"
-#define Kfacelength    60
-#define Ktextlength    120
-#define KheadIconUrl    @"http://open.cnlive.com/TVPLive/readHDUserAvatarByNick.action?plat=x&dev=i&uid="
-
-#define KLiveReserve            @"KLiveReserve"        //本地通知  直播订阅播放通知
 #define kUserDefaultsUIDKey     (@"uid_stat")          //用时间戳和uuid在首次启动app是创建的uid
-#define kLotteryURLKey          (@"lottery_url")         //试试手气url
-#define OldChannelVersion       @"OldChannelVersion"        //首页频道列表版本号
-#define NewChannelVersion       @"NewChannelVersion"
-#define NormalChannelArray      @"NormalChannelArray"   //常用频道
-#define OtherChannelArray       @"OtherChannelArray"     //其他频道
-
-/* --------------------------------------- 上传视频 key ----------------------------------------------------*/
-#define app_access_key       @"7338ebf9cab441c0843e437a18d85549"    //应用id
-#define user_access_key       @"cf34f28db21b46678237bfa849e239ea"   //用户id
-/* --------------------------------------- 视频清晰度对应json文件的key -----------------------------------------*/
-#define Definition1 @"mamVideoLUrl"        //流畅
-#define Definition2 @"mamVideoUrl"         //标清
-#define Definition3 @"mamVideoHUrl"        //高清
-#define Definition4 @"mamVideoUHUrl"       //超清
-/* --------------------------------------- 通知 NotificationName -----------------------------------------*/
-// 个推
-#warning 正式版
-//#define kGeXinAppId           @"eRHpnUvvHO7U7x75Qd1eR9"
-//#define kGeXinAppKey          @"vqYuunXZJY97GnnKiJ9v94"
-//#define kGeXinAppSecret       @"fKybhWTRai6bkbxGZ9VwD5"
-
-#warning 测试版
-//#define kGeXinAppId         @"QbA9InqDcX6Bf7kL5bkYC7"
-//#define kGeXinAppKey        @"rvylmRHnkU7fPPDE0VA5v1"
-//#define kGeXinAppSecret     @"HX4ZHUiVRA7gAhU0VBa202"
-
-#define GeTuiRegesterUrl    @"https://mobile.cnlive.com/CnliveMobile/json/appClientuid.action"
-#define GeTuiPushKey        @"GeTuiPushKey"
-
-//点击推荐页的栏目 跳转到对应栏目详细页
-#define ChangeHomeChannel @"changeHomeChannel"
-
-//首页pagingView News类型的页面从屏幕上消失 news页面上的播放器同时消失
-#define NewsPagingViewDisappear @"NewsPagingViewDisappear"
-
-//活动竖屏消失时将 主持人互动详情页隐藏
-#define LiveVideoPlayerDisapper @"LiveVideoPlayerDisapper"
-
-#define JoinInteract @"JoinInteract"
-
-//收到通知 先退出当前播放页 然后打开新播放页
-#define ReceivePushInfoNotification @"ReceivePushInfoNotification"
-
-#define BuySuccessNotify                 @"BuySuccessNotify"
-#define HidHud                           @"HidHud"
-#define KUNIQIDURL     @"http://ips.cnlive.com/IPS/getUniqId.action"
-#define KUNIQID        @"KUNIQID"
-
-//用户红包支付信息
-#define UserPaymentInformation @"UserPaymentInformation"
-#define TemporaryUserPaymentInformation @"TemporaryUserPaymentInformation"
-
-//红包支付通知
-#define PayNotification @"PayNotification"
-#define PaySuccess      @"PaySucess"
-#define PayFailure      @"PayFailure"
-#define UserCancel      @"UserCancel"
-
-//wechat
-#define WeChatAppKey    @"wxeeb61dff43ecc2fe"
+////wechat
+//#define WeChatAppKey    @"wxeeb61dff43ecc2fe"
 #define WeChatAppSecret @"29460b53af8ebc4798e85a06c936c80e"
-//qq
-#define QQAppKey        @"100757437"
-#define QQAppSecret     @"4d8f9a54a50269ba97d5ba92b95a54d4"
-//Sina
-#define SinaAppKey      @"1523705845"
-#define SinaAppSecret   @"101788682a6ce4d19e4add30d15211f5"
-//Alipay
-#define AlipayScheme    @"CNLiveAlipay"
-
-//弹幕中国币默认值
-#define BarrageChinaCoin @"100"
+////qq
+//#define QQAppKey        @"100757437"
+//#define QQAppSecret     @"4d8f9a54a50269ba97d5ba92b95a54d4"
+////Sina
+//#define SinaAppKey      @"1523705845"
+//#define SinaAppSecret   @"101788682a6ce4d19e4add30d15211f5"
-/* --------------------------------------- H5打开APP -----------------------------------------*/
-
-#define KUrlOpenApp @"KUrlOpenApp"      //通过url打开app
 #ifdef __OBJC__
-
-/* --------------------------------------- 接口地址 -----------------------------------------*/
-//App配置信息
-static NSString *const AppStart                  = @"http://app.jczb.cnlive.com/api/appstart";
-
-//抽奖信息
-static NSString *const Market                    = @"http://data.cnlive.com/export/hd/market.json";
-
-//首页频道列表
-//static NSString *const AllChannellist            = @"http://app.jczb.cnlive.com/api/channellist";
-static NSString *const AllChannellist            = @"http://intertv.cnlive.com/zgw/api/channellist";
-
-//首页信息
-//static NSString *const Appindex                  = @"http://app.jczb.cnlive.com/api/appindex";
-static NSString *const Appindex                  = @"http://intertv.cnlive.com/zgw_sp/api/appindex";
-
-//推荐
-static NSString *const Appindexpage              = @"http://intertv.cnlive.com/zgw/api/appindexpage";
-
-//直播更多
-static NSString *const Catprogramlist            = @"http://app.jczb.cnlive.com/api/catprogramlist";
-
-//直播中
-static NSString *const LiveingList               = @"http://app.jczb.cnlive.com/api/ugcLive";
-
-//直播关注
-static NSString *const livingFocus               = @"http://app.jczb.cnlive.com/api/ugcCare";
-
-//创建聊天室
-static NSString *const createRoom                = @"https://api.cnlive.com/open/api2/interacitve_chat/createRoom";
-
-//新闻信息
 //static NSString *const Newslist                  = @"http://app.jczb.cnlive.com/api/newslist";
 static NSString *const Newslist                  = @"http://intertv.cnlive.com/zgw_sp/api/newslist";
-//明星底页信息
-static NSString *const StarAtTheBottomOfPage     = @"http://app.jczb.cnlive.com/api/star?";
-
-//互动插件列表
-static NSString *const GetLivePlugins            = @"https://mobile.cnlive.com/CnliveMobile/hd/getLivePlugins.action";
-
-//活动状态
-static NSString *const Albumdetail               = @"http://app.jczb.cnlive.com/api/albumdetail";
-
-//主播详情
-static NSString *const zhuboDetail               = @"http://app.jczb.cnlive.com/api/zhuboDetail";
-
-//视频前贴片广告 和 切西瓜广告
-static NSString *const AdInfoDetail              = @"http://data.cnlive.com/export/ad/ads_new.json";
-
-//直播底页
-static NSString *const Metainfo                  = @"http://data.cnlive.com/epg/live/*/metainfo.json";
-
-//播放底页信息
-static NSString *const PlayingAtTheBottomOfPage  = @"http://data.cnlive.com/epg/";
-
-//电视剧集
-static NSString *const Series                    = @"http://data.cnlive.com/epg/";
-
-//本期看点
-static NSString *const BqFocus                   = @"http://app.jczb.cnlive.com/api/bqfocus?";
-
-//往期回顾
-static NSString *const BackPlay                  = @"http://app.jczb.cnlive.com/api/backplay?";
-
-//相关推荐
-static NSString *const Xiangguan                 = @"http://so.cnlive.com/so/programrelative?";
-
-//搜索热词
-static NSString *const Readkeywords              = @"http://app.jczb.cnlive.com/api/readkeywords";
-
-//搜索频道列表
-static NSString *const Getchannels               = @"http://so.cnlive.com/so/getchannels";
-
-//搜索详细列表
-static NSString *const Programlist               = @"http://so.cnlive.com/so/programlist";
-
-//分类
-static NSString *const ProgramSort               = @"http://app.jczb.cnlive.com/api/catitem";
-
-//分类节目列表
-static NSString *const ProgramListSort           = @"http://app.jczb.cnlive.com/api/catprogramlist";
-
-//评论列表
-static NSString *const ReadAllComment            = @"http://comment.cnlive.com/services/commentForHd/readAllComment";
-
-//发表评论
-static NSString *const InsertComment             = @"http://comment.cnlive.com/services/commentForHd/insertComment";
-
-//点赞评论
-static NSString *const PraiseComment             = @"http://comment.cnlive.com/services/commentForHd/praiseComment";
-
-//礼物详情
-static NSString *const readAllGiftsInter         = @"https://mobile.cnlive.com/CnliveMobile/hd/getGiftDetail.action";
-
-//赠送礼物
-//static NSString *const presentGiftInter          = @"http://pom.cnlive.com/gf/sendGift.action";
-static NSString *const presentGiftInter          = @"http://vote.cnlive.com/services/gift/presentGift";
-
-//发红包前参数检测
-static NSString *const checkRedPackage           = @"http://account.cnlive.com/my/preSendRedPackage.action";
-
-//发红包
-static NSString *const sendRedPackage            = @"http://account.cnlive.com/my/sendRedPackage.action";
-
-static NSString *const readGiftImgById           = @"http://pom.cnlive.com/gf/getGiftImg.action";
-
-//投票接口
-static NSString *const vote                      = @"http://vote.cnlive.com/services/voteForHd/vote";
-
-//竞猜接口
-static NSString *const guess                     = @"http://quiz.cnlive.com/services/guessForHd/guess";
-
-//问答接口
-static NSString *const qa                        = @"http://quiz.cnlive.com/services/qaForHd/qa";
-
-//消息列表接口
-//static NSString *const getMessage                = @"http://123.59.61.116:8888/CnliveUser/my/getMyMessages.action";
-static NSString *const getMessage                = @"http://uc.cnlive.com/my/getMyMessages.action";
-
-//未读消息
-static NSString *const unreadMessage             = @"http://uc.cnlive.com/my/getMyNewMessage.action";
-
-//消息标记已读
-static NSString *const tagReadMessage            = @"http://uc.cnlive.com/my/readMyMessage.action";
-
-//抽奖消息页面
-static NSString *const lotteryMessage            = @"http://uc.cnlive.com/my/readAward.action";
-
-//互动消息接口
-static NSString *const getMyHDMessage            = @"http://uc.cnlive.com/my/getMyHDMessage";
-
-//更新历史记录
-static NSString *const updateMyPlayRecord        = @"http://uc.cnlive.com/my/updateMyPlayRecord.action";
-
-//中奖消息接口
-static NSString *const getMyWinningMessage       = @"http://uc.cnlive.com/my/getMyWinningMessage";
-
-//申请提取奖品接口
-static NSString *const applyForMyGif             = @"http://uc.cnlive.com/my/applyForMyGift.action";
-
-//读取历史记录
-static NSString *const getMyPlayRecord           = @"http://uc.cnlive.com/my/getMyPlayRecord.action";
-
-//更新收藏
-static NSString *const updateMyCollection        = @"http://uc.cnlive.com/my/updateMyCollection.action";
-
-//读取收藏
-static NSString *const getMyCollection           = @"http://uc.cnlive.com/my/getMyCollection.action";
-
-//判断收藏状态
-static NSString *const inMyCollection            = @"http://uc.cnlive.com/my/inMyCollection.action";
-
-//打赏详情接口
-static NSString *const getAwardDetail            = @"https://mobile.cnlive.com/CnliveMobile/hd/getRewardDetail.action";
-
-//打赏
-static NSString *const Award                     = @"http://vote.cnlive.com/services/awardForHd/award";
-
-//下注详情接口
-static NSString *const getBetDetail              = @"https://mobile.cnlive.com/CnliveMobile/hd/getBetDetail.action";
-
-//下注
-static NSString *const Bet                       = @"http://vote.cnlive.com/services/betForHd/bet";
-
-//我的钱包列表
-static NSString *const myWallet                  = @"http://uc.cnlive.com/my/getMyWallet.action";
-
-//我的钱包中国币
-static NSString *const chinaCoin                 = @"http://uc.cnlive.com/my/getMyCnCoinDetail.action";
-
-//我的钱包红包
-static NSString *const redWallet                 = @"http://uc.cnlive.com/my/getMyBonusDetail.action";
-
-//红包提现
-static NSString *const drawal                    = @"http://uc.cnlive.com/my/drawRedPackage.action";
-
-//反馈
-static NSString *const feedback                  = @"https://mobile.cnlive.com/CnliveMobile/json/report.action";
-//充值
-static NSString *const rechargePageInter         = @"https://mobile.cnlive.com/CnliveMobile/json/readRechargeStandard.action";
-
-// 中国币订单提交
-static NSString *const orderVideoByCnCoin        = @"http://pom.cnlive.com/bz/orderVideoByCnCoin.action";
-
-//static NSString *const prepay                    = @"http://unifypay.cnlive.com/prepay";
-static NSString *const prepay                    = @"https://api.cnlive.com/open/api2/unifypay/prepay";
-
-//static NSString *const payed                     = @"http://unifypay.cnlive.com/payed";
-static NSString *const payed                     = @"https://api.cnlive.com/open/api2/unifypay/payed";
-
-//购买会员
-static NSString *const orderPackageByCnCoin      = @"http://pom.cnlive.com/bz/orderPackageByCnCoin.action";
-
-//会员免费券、兑换码使用记录
-static NSString *const getOrderByType            = @"http://pom.cnlive.com/getOrderByType.action";
-
-//活动中心
-static NSString *const activityDetail            = @"http://app.jczb.cnlive.com/api/activity";
-
-//获取回看弹幕
-static NSString *const playbackBarrage           = @"https://mobile.cnlive.com/CnliveMobile/hd/getBarrage.action";
-
-//积分商城
-static NSString *const integralShop              = @"http://jf.uc.cnlive.com/pointStore/index.action?";
-
-//明星支持
-static NSString *const starSupport               = @"http://vote.cnlive.com/services/voteForCommonV2/vote";
-
-//分享成功后增加中国币
-static NSString *const shareSuccess              = @"http://uc.cnlive.com/share.action?";
-
-//我的互动电视
-static NSString *const staffrelative             = @"http://app.jczb.cnlive.com/intertv/api_v1/staffrelative.do";
-
-//切西瓜增加中国币
-static NSString *const updateCnCoin              = @"http://account.cnlive.com/updateCnCoin.action";
-
-//读取顶/踩数据
-static NSString *const readSupport               = @"http://ct.cnlive.com/services/supportForHd/readSupport?";
-
-//顶踩(节目ID)
-static NSString *const supportProgram            = @"http://ct.cnlive.com/services/supportForHd/support";
-
-//红包退款
-static NSString *const refund                    = @"http://unifypay.cnlive.com/refund";
-
-//查看红包支付结果
-static NSString *const payResult                 = @"http://apps.pay.cnlive.com/upappnotify/notify/sendRedPackage/result";
-
-//摇一摇结果
-static NSString *const shakeResults              = @"http://uc.cnlive.com/my/shake.action";
-
-//赠送主播礼物接口
-static NSString *const PresentGift               = @"http://vote.cnlive.com/services/giftForHost/presentGift";
-
-//弹幕接口
-static NSString *const Barrage                   = @"http://vote.cnlive.com/services/barrageForHost/barrage";
-
-//内容状态接口
-static NSString *const ContentStatus             = @"http://app.jczb.cnlive.com/api/getContentStatus";
-
-//进入聊天室
-static NSString *const Enterchatroom             = @"https://mobile.cnlive.com/CnliveMobile/hd/enterChatroom.action";
-
-/* --------------------------------------- 视频付费 -----------------------------------------*/
-// 获取商品详细信息
-static NSString *const getProduct                = @"http://pom.cnlive.com/getProduct.action";
-
-// 兑码观看
-static NSString *const orderForPromCode          = @"http://pom.cnlive.com/orderForPromCode.action";
-
-/* --------------------------------------- 上传视频 -----------------------------------------*/
-
-//上传前服务器定向
-static NSString *const redirect                  = @"http://upload02.vlog.cnlive.com/api/video/redirect";
-
-//录入元数据（上传描述信息）
-static NSString *const descriptionUpload         = @"http://upload02.vlog.cnlive.com/api/video/supload";
-
 //视频上传服务协议
 static NSString *const uploadServiceProtocol     = @"http://data.cnlive.com/term/hdtv/upload.html";
-//视频结束通知
-static NSString *const finishNotify              = @"http://upload02.vlog.cnlive.com/api/video/uploadNotify";
-
-//查询所有源码转码情况
-static NSString *const videoList                 = @"http://upload02.vlog.cnlive.com/api/video/all";
-
-/* --------------------------------------- UGC Live -----------------------------------------*/
-
-//直播状态
-static NSString *const getContentStatus          = @"http://app.jczb.cnlive.com/api/getContentStatus";
-
-//是否关注
-static NSString *const checkCareV2               = @"http://uc.cnlive.com/host/checkCareV2.action";
-
-//关注和取消关注
-static NSString *const careV2                    = @"http://uc.cnlive.com/host/careV2";
-
-//举报类型
-static NSString *const reportType                = @"http://uc.cnlive.com/host/reportType.action";
-
-//举报主播
-static NSString *const report                    = @"http://uc.cnlive.com/host/report.action";
-
-//直播结束获取信息
-static NSString *const streamEnd                 = @"http://uc.cnlive.com/host/liveResult.action";
-
 //申请主播
 static NSString *const applyAnchor               = @"https://mobile.cnlive.com/CnliveMobile/host/apply.action";
-//心跳通知
-static NSString *const heartBeat                 = @"http://uc.cnlive.com/heartBeat/hb.action";
-
-//中国网红
-static NSString *const chinaWX                  = @"http://app.jczb.cnlive.com/api/chinaWebCelebrity"; 
-
-//网红主播标签查询
-static NSString *const WHbiaoqian               = @"http://app.jczb.cnlive.com/api/zhuboSearch" ;
-
 #endif
@@ -10,7 +10,9 @@
 #import "AFNetworking.h"
 typedef   void (^ _Nonnull AFHttpSuccessBlock)(AFHTTPRequestOperation *__nonnull operation, id __nonnull responseObject);
 typedef void (^ _Nonnull AFHttpFailureBlock)(AFHTTPRequestOperation *__nonnull operation,  NSString *__nonnull error);
+
 @interface UserTools : NSObject
+
 + (BOOL)isLogin;
 + (void)setUserLogin:(BOOL)isLogin;
@@ -26,27 +28,8 @@ typedef void (^ _Nonnull AFHttpFailureBlock)(AFHTTPRequestOperation *__nonnull o
 + (void)toast:( NSString * _Nullable )message;
-// 获取我的消息列表用于红点显示
-//+ (void)getMessageListSuccess:(void (^__nullable)(AFHTTPRequestOperation *__nonnull operation, id __nonnull responseObject))success failure:(void (^__nullable)(AFHTTPRequestOperation *__nonnull operation, NSError *__nonnull error))failure;
-+ (void)getMessageListSuccess:(AFHttpSuccessBlock)success failure:(AFHttpFailureBlock)failure;
-
 + (NSString * _Nullable)uidForStat;
-/**
- 获取用户所有信息  老接口
- 
- @param success 成功回调
- @param failure 失败回调
- */
-+ (void)getChinaCoinSuccess:(AFHttpSuccessBlock)success failure:(AFHttpFailureBlock)failure;
-
-/**
- 异步获得中国币数量
-
- @param block count为中国币数量
- */
-+ (void)getChinaCoinCount:(void (^_Nullable )(BOOL success, NSError *_Nullable error, NSString * _Nullable count))block;
-
 /**
  成为主播查询
@@ -114,40 +114,6 @@
 }
-+ (void)getMessageListSuccess:(AFHttpSuccessBlock)success failure:(AFHttpFailureBlock)failure
-{
-    
-    NSDictionary *dic = @{@"sid":[UserInformationModel manager].uid,
-                          @"plat":@"i",
-                          @"uuid":[UserTools uidForStat],
-                          @"pageSize":@"20",
-                          @"page":@"1"};
-    NSString *token = [DESUtility base64StringFromPayText:[Tools stringByDictionary:dic]];
-    NSDictionary *params = @{@"spId":SpId,@"token":token};
-    [[AFHTTPRequestOperationManager manager] GET:getMessage parameters:params success:success failure:^(AFHTTPRequestOperation *operation, NSError *error) {
-        NSLog(@"%@",error);
-        failure(operation,error.description);
-    }];
-
-    
-//    [[AFHTTPRequestOperationManager manager] GET:getMessage parameters:params success:success failure:failure];
-    /*
-     Printing description of dic:
-     {
-     page = 1;
-     pageSize = 20;
-     plat = i;
-     sid = 0;
-     uuid = "1478048910583_B5BD9AEB2C254D23862877F6B276F30D";
-     }
-     Printing description of params:
-     {
-     spId = "82_iunnscwp07";
-     token = "S8k8kpcFB8+HhC4r9w9hj/d9s+IExOEoLjFpKVWXyj0IAUY0iExUdLbE+jxBrIB69PCFcLSkdgZ0OmqPznWBzSdpk/Bo5ehK0pdi/HfSwxM9qozVEv1Scg==";
-     }
-     */
-}
-
 + (nullable NSString *)uidForStat {
     NSString *uid = @"";
@@ -197,49 +163,6 @@
     return stamp;
 }
-/**
- 获取用户所有信息  老接口
- 
- @param success 成功回调
- @param failure 失败回调
- */
-+ (void)getChinaCoinSuccess:(AFHttpSuccessBlock)success failure:(AFHttpFailureBlock)failure
-{
-    NSMutableDictionary *parms = [NSMutableDictionary dictionary];
-    parms[@"plat"] = @"a";
-    parms[@"uid"] = [UserInformationModel manager].uid;
-    [[AFHTTPRequestOperationManager manager] POST:@"https://mobile.cnlive.com/CnliveMobile/json/readUserById.action" parameters:parms success:^(AFHTTPRequestOperation *operation, id responseObject) {
-
-        NSString *chinaCoin = (NSString *)responseObject[@"china_coin"];
-        [UserTools setLocalUserInfo:chinaCoin withKey:@"chinaCoin"];
-        success(operation,responseObject);
-        
-    } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
-        NSLog(@"%@",error);
-        failure(operation,error.description);
-    }];
-}
-
-/**
- 异步获得中国币数量
- 
- @param block count为中国币数量
- */
-+ (void)getChinaCoinCount:(void (^_Nullable )(BOOL success, NSError *_Nullable error, NSString * _Nullable count))block
-{
-    __block NSString *chinaCoinCount = 0;
-    __block NSError *err = nil;
-    [self getChinaCoinSuccess:^(AFHTTPRequestOperation * _Nonnull operation, id  _Nonnull responseObject) {
-        chinaCoinCount = (NSString *)responseObject[@"china_coin"];
-        block(YES,err,chinaCoinCount);
-    } failure:^(AFHTTPRequestOperation * _Nonnull operation, NSString * _Nonnull error) {
-        chinaCoinCount = nil;
-        block(NO, nil,chinaCoinCount);
-    }];
-}
-
-
-
 + (void)getAnchor:(NSDictionary *)param success:(AFHttpSuccessBlock)success failure:(AFHttpFailureBlock)failure
 {
     NSInteger time = [[NSDate date] timeIntervalSince1970];