Merge branch 'TX_IM' into develop

# Conflicts:
#	KulexiuForTeacher/KulexiuForTeacher.xcodeproj/project.pbxproj
#	KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/DeleteAccount/Controller/AccountDeleteViewController.m
#	KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/DeleteAccount/View/DeleteAccountBodyView.xib
#	KulexiuForTeacher/Podfile.lock
#	KulexiuForTeacher/Pods/Manifest.lock
#	KulexiuForTeacher/Pods/Pods.xcodeproj/project.pbxproj

KulexiuForTeacher/KulexiuForTeacher.xcodeproj/xcshareddata/xcschemes/KulexiuForTeacher.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1330"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

KulexiuForTeacher/KulexiuForTeacher.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>KulexiuForTeacher.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>26</integer>
+			<integer>0</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>

KulexiuForTeacher/KulexiuForTeacher/AppDelegate+AppService.h

@@ -0,0 +1,19 @@
+//
+//  AppDelegate+AppService.h
+//  KulexiuForTeacher
+//
+//  Created by 王智 on 2023/8/7.
+//
+
+#import "AppDelegate.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface AppDelegate (AppService)
+
+//单例
++ (AppDelegate *)shareAppDelegate;
+
+@end
+
+NS_ASSUME_NONNULL_END

KulexiuForTeacher/KulexiuForTeacher/AppDelegate+AppService.m

@@ -0,0 +1,16 @@
+//
+//  AppDelegate+AppService.m
+//  KulexiuForTeacher
+//
+//  Created by 王智 on 2023/8/7.
+//
+
+#import "AppDelegate+AppService.h"
+
+@implementation AppDelegate (AppService)
+
++ (AppDelegate *)shareAppDelegate{
+    return (AppDelegate *)[[UIApplication sharedApplication] delegate];
+}
+
+@end

KulexiuForTeacher/KulexiuForTeacher/AppDelegate.h

@@ -12,6 +12,8 @@
 
 @interface AppDelegate : UIResponder <UIApplicationDelegate>
 
+@property (nonatomic, strong) NSData *deviceToken;
+
 @property (strong, nonatomic) UIWindow *window;
 @property (nonatomic, strong) KSTabBarViewController *tabBarController;
 

KulexiuForTeacher/KulexiuForTeacher/AppDelegate.m

@@ -11,8 +11,6 @@
 #import "KSUpdateAlert.h"
 #import "KSNetworkAccessibleManager.h"
 #import <Bugly/Bugly.h>
-#import <RongIMLib/RongIMLib.h>
-#import <RongIMKit/RongIMKit.h>
 #import <UMCommon/UMCommon.h>
 #import <UMShare/UMShare.h>
 #import <UShareUI/UShareUI.h>
@@ -27,9 +25,6 @@
 #import "KSTouchCapturingWindow.h"
 #import "KSBaseWKWebViewController.h"
 #import "UserInfoManager.h"
-#import "KSIMService.h"
-#import "RCConnectionManager.h"
-#import "KSRCIMDataSource.h"
 
 #import "KSBaseWKWebViewController.h"
 #import "CustomNavViewController.h"
@@ -42,21 +37,12 @@
 #import "MyMusicViewController.h"
 #import "LaunchAnimationViewController.h"
 
-@interface RCNaviDataInfo : NSObject
+#import "TXIMLinsenter.h"
+#import <TUICore/TUIConfig.h>
+#import <TUIChat/TUIChat.h>
 
-@property (nonatomic, assign) NSTimeInterval uploadVideoDurationLimit;
 
-@end
-
-@interface RCNaviDataManager : NSObject
-
-@property (nonatomic, strong) RCNaviDataInfo *naviData;
-
-+ (instancetype)sharedInstance;
-
-@end
-
-@interface AppDelegate ()<RCIMReceiveMessageDelegate,JPUSHRegisterDelegate>
+@interface AppDelegate ()<JPUSHRegisterDelegate>
 
 @property (nonatomic, assign) BOOL isNeedUpdate;
 
@@ -103,7 +89,7 @@
     }
     self.window = [[KSTouchCapturingWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
     
-    [[UITabBar appearance] setTranslucent:NO];
+//    [[UITabBar appearance] setTranslucent:NO];
     // 全局配置光标颜色
     [[UITextField appearance] setTintColor:THEMECOLOR];
     [[UITextView appearance] setTintColor:THEMECOLOR];
@@ -111,7 +97,11 @@
     // 配置极光推送
     [self configJPUSHWithLaunchOptions:launchOptions];
     // 融云相关配置
-    [self configIM];
+//    [self configIM];
+    
+     // 腾讯群相关
+    [self configTXIM];
+    
     LaunchAnimationViewController *animationVC = [[LaunchAnimationViewController alloc] init];
     MJWeakSelf;
     [animationVC launchAnimationFinish:^{
@@ -179,13 +169,7 @@
 }
 
 - (void)displayUnreadMessageCount {
-    int unreadMsgCount = [[RCIMClient sharedRCIMClient] getUnreadCount:@[ @(ConversationType_PRIVATE),@(ConversationType_APPSERVICE), @(ConversationType_GROUP),@(ConversationType_SYSTEM)
-    ]];
-    if (unreadMsgCount >= 1) {
-        [self.tabBarController noteNewsWithIndex:2 count:unreadMsgCount];
-    } else {
-        [self.tabBarController clearNewsWithIndex:2];
-    }
+    [self countUnreadMessage];
 }
 
 - (void)registerSDK {
@@ -230,7 +214,6 @@
     
     // 自定义分享类型
     [UMSocialUIManager addCustomPlatformWithoutFilted:UMSocialPlatformType_UserDefine_Begin+1 withPlatformIcon:[UIImage imageNamed:@"share_group"] withPlatformName:@"群聊"];
-//    [UMSocialUIManager addCustomPlatformWithoutFilted:UMSocialPlatformType_UserDefine_Begin+2 withPlatformIcon:[UIImage imageNamed:@"share_savePic"] withPlatformName:@"保存图片"];
 }
 
 - (void)versionCheck {
@@ -290,67 +273,87 @@
 }
 
 - (void)configIM {
-    [RCNaviDataManager sharedInstance].naviData.uploadVideoDurationLimit = 480.0f;
-    // 6tnym1br6pv07 正式环境key   c9kqb3rdc451j test
-    [[RCIM sharedRCIM] initWithAppKey:RCIM_KEY];
-    
-    //IMKit连接状态的监听器
-    [[RCIM sharedRCIM] setConnectionStatusDelegate:KSRMLINK];
-    //IMKit消息接收的监听器
-    [[RCIM sharedRCIM] setReceiveMessageDelegate:self];
-    // 信息提供者
-    [RCIM sharedRCIM].userInfoDataSource = KSRMDataSource;
-    [[RCIM sharedRCIM] setGroupInfoDataSource:KSRMDataSource];
-    // 群名片信息提供者
-    [[RCIM sharedRCIM] setGroupUserInfoDataSource:KSRMDataSource];
-    // 群成员数据源
-    [RCIM sharedRCIM].groupMemberDataSource = KSRMDataSource;
-    
-    //开启消息@功能（只支持群聊和讨论组, App需要实现群成员数据源groupMemberDataSource）
-    RCKitConfigCenter.message.enableMessageMentioned = YES;
-    //是否关闭本地通知，默认是打开的
-    RCKitConfigCenter.message.disableMessageNotificaiton = NO;
-    // 会话界面设置
-    RCKitConfigCenter.ui.globalMessageAvatarStyle = RC_USER_AVATAR_RECTANGLE;
-    RCKitConfigCenter.ui.globalMessagePortraitSize = CGSizeMake(40, 40);
-    // 会话列表头像设置
-    RCKitConfigCenter.ui.globalConversationAvatarStyle = RC_USER_AVATAR_RECTANGLE;
-    RCKitConfigCenter.ui.globalConversationPortraitSize = CGSizeMake(44, 44);
-    
-    //开启消息撤回功能
-    RCKitConfigCenter.message.enableMessageRecall = YES;
-    // 开启消息合并转发
-    RCKitConfigCenter.message.enableSendCombineMessage = YES;
-    //选择媒体资源时，包含视频文件
-    RCKitConfigCenter.message.isMediaSelectorContainVideo = YES;
-    //设置显示未注册的消息
-    RCKitConfigCenter.message.showUnkownMessage = YES;
-    
-    //开启发送已读回执
-    RCKitConfigCenter.message.enabledReadReceiptConversationTypeList = @[ @(ConversationType_PRIVATE), @(ConversationType_GROUP)];
-    
-    //开启输入状态监听
-    RCKitConfigCenter.message.enableTypingStatus = YES;
-    
-    //开启用户信息和群组信息的持久化
-    [RCIM sharedRCIM].enablePersistentUserInfoCache = YES;
-    // 在发送的所有消息中携带当前登录的用户信息
-    [RCIM sharedRCIM].enableMessageAttachUserInfo = YES;
-    // 关闭所有提示音
-    RCKitConfigCenter.message.disableMessageAlertSound = YES;
-    
-    // 设置断线重连时是否踢出重连设备
-        [[RCIMClient sharedRCIMClient] setReconnectKickEnable:YES];
-    
-    // 左右上角按钮颜色
-    RCKitConfigCenter.ui.globalNavigationBarTintColor = HexRGB(0x000000);
-    // 注册消息
-    [[RCIM sharedRCIM] registerMessageType:NSClassFromString(@"KSChatLiveMessage")];
-    [[RCIM sharedRCIM] registerMessageType:NSClassFromString(@"KSChatMusicMessage")];
+//    [RCNaviDataManager sharedInstance].naviData.uploadVideoDurationLimit = 480.0f;
+//    // 6tnym1br6pv07 正式环境key   c9kqb3rdc451j test
+//    [[RCIM sharedRCIM] initWithAppKey:RCIM_KEY];
+//
+//    //IMKit连接状态的监听器
+//    [[RCIM sharedRCIM] setConnectionStatusDelegate:KSRMLINK];
+//    //IMKit消息接收的监听器
+//    [[RCIM sharedRCIM] setReceiveMessageDelegate:self];
+//    // 信息提供者
+//    [RCIM sharedRCIM].userInfoDataSource = KSRMDataSource;
+//    [[RCIM sharedRCIM] setGroupInfoDataSource:KSRMDataSource];
+//    // 群名片信息提供者
+//    [[RCIM sharedRCIM] setGroupUserInfoDataSource:KSRMDataSource];
+//    // 群成员数据源
+//    [RCIM sharedRCIM].groupMemberDataSource = KSRMDataSource;
+//
+//    //开启消息@功能（只支持群聊和讨论组, App需要实现群成员数据源groupMemberDataSource）
+//    RCKitConfigCenter.message.enableMessageMentioned = YES;
+//    //是否关闭本地通知，默认是打开的
+//    RCKitConfigCenter.message.disableMessageNotificaiton = NO;
+//    // 会话界面设置
+//    RCKitConfigCenter.ui.globalMessageAvatarStyle = RC_USER_AVATAR_RECTANGLE;
+//    RCKitConfigCenter.ui.globalMessagePortraitSize = CGSizeMake(40, 40);
+//    // 会话列表头像设置
+//    RCKitConfigCenter.ui.globalConversationAvatarStyle = RC_USER_AVATAR_RECTANGLE;
+//    RCKitConfigCenter.ui.globalConversationPortraitSize = CGSizeMake(44, 44);
+//
+//    //开启消息撤回功能
+//    RCKitConfigCenter.message.enableMessageRecall = YES;
+//    // 开启消息合并转发
+//    RCKitConfigCenter.message.enableSendCombineMessage = YES;
+//    //选择媒体资源时，包含视频文件
+//    RCKitConfigCenter.message.isMediaSelectorContainVideo = YES;
+//    //设置显示未注册的消息
+//    RCKitConfigCenter.message.showUnkownMessage = YES;
+//
+//    //开启发送已读回执
+//    RCKitConfigCenter.message.enabledReadReceiptConversationTypeList = @[ @(ConversationType_PRIVATE), @(ConversationType_GROUP)];
+//
+//    //开启输入状态监听
+//    RCKitConfigCenter.message.enableTypingStatus = YES;
+//
+//    //开启用户信息和群组信息的持久化
+//    [RCIM sharedRCIM].enablePersistentUserInfoCache = YES;
+//    // 在发送的所有消息中携带当前登录的用户信息
+//    [RCIM sharedRCIM].enableMessageAttachUserInfo = YES;
+//    // 关闭所有提示音
+//    RCKitConfigCenter.message.disableMessageAlertSound = YES;
+//
+//    // 设置断线重连时是否踢出重连设备
+//        [[RCIMClient sharedRCIMClient] setReconnectKickEnable:YES];
+//
+//    // 左右上角按钮颜色
+//    RCKitConfigCenter.ui.globalNavigationBarTintColor = HexRGB(0x000000);
+//    // 注册消息
+//    [[RCIM sharedRCIM] registerMessageType:NSClassFromString(@"KSChatLiveMessage")];
+//    [[RCIM sharedRCIM] registerMessageType:NSClassFromString(@"KSChatMusicMessage")];
+//
+//    //    [[RCIMClient sharedRCIMClient] setLogLevel:RC_Log_Level_Verbose];
+//    //    [self redirectNSlogToDocumentFolder];
     
-    //    [[RCIMClient sharedRCIMClient] setLogLevel:RC_Log_Level_Verbose];
-    //    [self redirectNSlogToDocumentFolder];
+}
+
+- (void)configTXIM {
+    TUIConfig *config = [TUIConfig defaultConfig];
+    // 修改默认头像
+    config.defaultAvatarImage = [UIImage imageNamed:USERDEFAULT_LOGO];
+    // 修改默认群组头像
+    config.defaultGroupAvatarImage = [UIImage imageNamed:GROUP_DEFAULT_LOGO];
+    // 禁用群组九宫格头像
+    config.avatarType = TAvatarTypeRadiusCorner;
+    config.enableGroupGridAvatar = NO;
+    config.avatarCornerRadius = 4.0f;
+    // 关闭toaset
+    config.enableToast = NO;
     
+    TUIChatConfig *chatConfig = [TUIChatConfig defaultConfig];
+    chatConfig.backgroudColor = HexRGB(0xF8F8F8);
+    chatConfig.enableWelcomeCustomMessage = NO;
+    chatConfig.enableTypingStatus = YES;
+
 }
 
 #pragma mark - private method
@@ -407,8 +410,27 @@ didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
     
     // 融云
     [[RCIMClient sharedRCIMClient] setDeviceTokenData:deviceToken];
+    
+    if ([TXIM_LINSENTER isCurrentUserLoginIM]) {
+        [self registerTXIMDeviceToken:deviceToken];
+    }
+    else {
+        self.deviceToken = deviceToken;
+    }
 }
 
+- (void)registerTXIMDeviceToken:(NSData *)deviceToken {
+    if (deviceToken) {
+        V2TIMAPNSConfig *config = [[V2TIMAPNSConfig alloc] init];
+        config.businessID = TXOfflinePushCertificateIDForAPNS;
+        config.token = deviceToken;
+        [[V2TIMManager sharedInstance] setAPNS:config succ:^{
+            NSLog(@"%s, succ", __func__);
+        } fail:^(int code, NSString *desc) {
+            NSLog(@"%s, fail, %d, %@", __func__, code, desc);
+        }];
+    }
+}
 
 
 
@@ -492,7 +514,7 @@ didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
     if (status == ConnectionStatus_Unconnected) {  // 连接失败或未连接 需要重新连接
         NSString *token = UserDefault(TokenKey);
         if (![NSString isEmptyString:token]) {
-            [USER_MANAGER checkTokenEnableConnectRongCloud];
+            [USER_MANAGER checkTokenEnableConnectIM];
         }
     }
     
@@ -510,42 +532,6 @@ didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
     // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
 }
 
-- (void)onRCIMReceiveMessage:(RCMessage *)message left:(int)left {
-    
-    NSLog(@"conversationType----%lu",(unsigned long)message.conversationType);
-    // 此处根据消息类型处理对应信息
-    if (message.conversationType == ConversationType_CHATROOM) { // 聊天室类型为直播
-        [[KSIMService sharedService] ksOnReceivedChatroom:message left:left object:@""];
-    }
-    if (message.conversationType == ConversationType_GROUP && ![message.targetId containsString:@"COURSE"] && ![message.targetId containsString:@"FAN"]) { // 网络教室视频聊天
-        [[RCIMClient sharedRCIMClient] clearMessagesUnreadStatus:ConversationType_GROUP targetId:message.targetId];
-        [[KSIMService sharedService] ksOnReceived:message left:left object:@""];
-    }
-    else {
-        // 此处对单聊、群聊消息处理
-        dispatch_async(dispatch_get_main_queue(), ^{
-        
-            if ([message.content isMemberOfClass:[RCGroupNotificationMessage class]]) {
-                RCGroupNotificationMessage *msg = (RCGroupNotificationMessage *)message.content;
-                if ([msg.operation isEqualToString:GroupNotificationMessage_GroupOperationKicked]) {
-                    //                    [[RCIMClient sharedRCIMClient] removeConversation:ConversationType_GROUP targetId:message.targetId];
-                }
-            }
-            else {
-                int unreadMsgCount = [[RCIMClient sharedRCIMClient] getUnreadCount:@[
-                @(ConversationType_PRIVATE), @(ConversationType_APPSERVICE), @(ConversationType_GROUP),@(ConversationType_SYSTEM)
-                ]];
-                [UIApplication sharedApplication].applicationIconBadgeNumber = unreadMsgCount;
-                if (unreadMsgCount >= 1) {
-                    [self.tabBarController noteNewsWithIndex:2 count:unreadMsgCount];
-                } else {
-                    [self.tabBarController clearNewsWithIndex:2];
-                }
-            }
-        });
-    }
-    
-}
 
 
 #pragma mark- JPUSHRegisterDelegate
@@ -776,9 +762,9 @@ didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             NSString *newToken = [dic ks_stringValueForKey:@"data"];
             if (![NSString isEmptyString:newToken]) {
-                UserDefaultSet(newToken, RongTokenKey);
+                UserDefaultSet(newToken, IM_TOKEN);
                 [[NSUserDefaults standardUserDefaults] synchronize];
-                [USER_MANAGER checkTokenEnableConnectRongCloud];
+                [USER_MANAGER checkTokenEnableConnectIM];
             }
         }
         else {
@@ -796,16 +782,10 @@ didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
 
     self.tabBarController = [[KSTabBarViewController alloc] init];
     self.window.rootViewController = self.tabBarController;
-    int unreadMsgCount = [[RCIMClient sharedRCIMClient] getUnreadCount:@[ @(ConversationType_PRIVATE),@(ConversationType_APPSERVICE), @(ConversationType_GROUP),@(ConversationType_SYSTEM)
-    ]];
-    if (unreadMsgCount >= 1) {
-        [self.tabBarController noteNewsWithIndex:2 count:unreadMsgCount];
-    } else {
-        [self.tabBarController clearNewsWithIndex:2];
-    }
     
     [[UITabBar appearance] setBackgroundImage:[[UIImage alloc] init]];
     [[UITabBar appearance] setShadowImage:[[UIImage alloc] init]];
+    [self countUnreadMessage];
 }
 
 - (void)initLoginView {
@@ -814,36 +794,8 @@ didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
     self.window.rootViewController = navCtrl;
 }
 
-- (void)applicationWillResignActive:(UIApplication *)application {
-    // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
-    // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
-    
-    RCConnectionStatus status = [[RCIMClient sharedRCIMClient] getConnectionStatus];
-    if (status != ConnectionStatus_SignOut) {
-        int unreadMsgCount = [[RCIMClient sharedRCIMClient] getUnreadCount:@[@(ConversationType_PRIVATE), @(ConversationType_APPSERVICE), @(ConversationType_GROUP),@(ConversationType_SYSTEM)]];
-        application.applicationIconBadgeNumber = unreadMsgCount;
-        if (unreadMsgCount >= 1) {
-            [self.tabBarController noteNewsWithIndex:2 count:unreadMsgCount];
-        } else {
-            [self.tabBarController clearNewsWithIndex:2];
-        }
-    }
-}
 
-- (void)didReceiveMessageNotification:(NSNotification *)notification {
-    NSNumber *left = [notification.userInfo objectForKey:@"left"];
-    if ([RCIMClient sharedRCIMClient].sdkRunningMode == RCSDKRunningMode_Background && 0 == left.integerValue) {
-        int unreadMsgCount = [[RCIMClient sharedRCIMClient] getUnreadCount:@[@(ConversationType_PRIVATE), @(ConversationType_APPSERVICE), @(ConversationType_GROUP),@(ConversationType_SYSTEM)]];
-        dispatch_async(dispatch_get_main_queue(),^{
-            [UIApplication sharedApplication].applicationIconBadgeNumber = unreadMsgCount;
-            if (unreadMsgCount >= 1) {
-                [self.tabBarController noteNewsWithIndex:2 count:unreadMsgCount];
-            } else {
-                [self.tabBarController clearNewsWithIndex:2];
-            }
-        });
-    }
-}
+
 - (BOOL)handleOutLink:(NSURL *)url {
     NSString *detailUrl = [url absoluteString];
     if ([detailUrl containsString:@"linkUrl="]) {
@@ -1048,6 +1000,27 @@ didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
         }
         self.outLinkParm = nil;
     }
-    
 }
+
+// 统计消息数量
+- (void)countUnreadMessage {
+    if ([TXIM_LINSENTER isCurrentUserLoginIM]) {
+        [TXIM_LINSENTER getUnReadCountCallback:^(NSInteger count) {
+            dispatch_async(dispatch_get_main_queue(),^{
+                NSLog(@"----- %zd",count);
+                [UIApplication sharedApplication].applicationIconBadgeNumber = count;
+                if (count >= 1) {
+                    [self.tabBarController noteNewsWithIndex:2 count:count];
+                } else {
+                    [self.tabBarController clearNewsWithIndex:2];
+                }
+                
+                NSDictionary *receiveMsg = @{@"unreadCount":@(count)};
+
+                [[NSNotificationCenter defaultCenter] postNotificationName:CHATVIEW_REFRESHSTATUS object:receiveMsg];
+            });
+        }];
+    }
+}
+
 @end

KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Classroom/coursewarePlayer/classroomPlayer_play.imageset/Contents.json → KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Chat/group_default_avatal.imageset/Contents.json

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

KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Classroom/nomal_spot.imageset/Contents.json → KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Classroom/Titlenetwork/tx_net_bad.imageset/Contents.json

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

KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Classroom/Titlenetwork/tx_net_full.imageset/Contents.json

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

KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Classroom/Titlenetwork/tx_net_good.imageset/Contents.json

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

KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Classroom/metronome_bg.imageset/Contents.json → KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Classroom/Titlenetwork/tx_net_nomal.imageset/Contents.json

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

KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Classroom/Titlenetwork/tx_net_none.imageset/Contents.json

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

KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Classroom/accompany/song_playStatus.imageset/Contents.json

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

KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Classroom/cancle_black.imageset/Contents.json

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

KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Classroom/highlight_spot.imageset/Contents.json → KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Classroom/classroom_quit.imageset/Contents.json

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

KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Classroom/coursewarePlayer/classroomPlayer_close.imageset/Contents.json → KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Classroom/classroom_slider_image.imageset/Contents.json

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

KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Classroom/coursewarePlayer/classroomPlayer_refresh.imageset/Contents.json

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

KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Classroom/coursewarePlayer/classroomPlayer_volume.imageset/Contents.json

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

KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Classroom/coursewarePlayer/coursewarePlayer_packUp.imageset/Contents.json

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

KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Classroom/hand_up_selected.imageset/Contents.json

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

KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Classroom/metronome_close.imageset/Contents.json

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

KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Classroom/metronome_open.imageset/Contents.json

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