Steven 1 år sedan
förälder
incheckning
c992b27e67
19 ändrade filer med 1 tillägg och 531 borttagningar
  1. 0 18
      KulexiuForTeacher/KulexiuForTeacher.xcodeproj/project.pbxproj
  2. 0 2
      KulexiuForTeacher/KulexiuForTeacher/Common/Base/KSBaseWKWebViewController.m
  3. 0 1
      KulexiuForTeacher/KulexiuForTeacher/Common/Base/KSNetworkingManager.m
  4. 0 26
      KulexiuForTeacher/KulexiuForTeacher/Common/Base/KSRCIMDataSource.h
  5. 0 144
      KulexiuForTeacher/KulexiuForTeacher/Common/Base/KSRCIMDataSource.m
  6. 0 28
      KulexiuForTeacher/KulexiuForTeacher/Common/Base/RCConnectionManager.h
  7. 0 81
      KulexiuForTeacher/KulexiuForTeacher/Common/Base/RCConnectionManager.m
  8. 0 12
      KulexiuForTeacher/KulexiuForTeacher/Module/Chat/Group/Controller/GroupMemberViewController.m
  9. 0 1
      KulexiuForTeacher/KulexiuForTeacher/Module/Chat/GroupNotice/Controller/GroupNoticeEditController.m
  10. 0 1
      KulexiuForTeacher/KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m
  11. 1 2
      KulexiuForTeacher/KulexiuForTeacher/Module/Live/View/SeatContentView.m
  12. 0 3
      KulexiuForTeacher/KulexiuForTeacher/Module/MidiPlayer/ShareInChat/Controller/KSShareChooseViewController.h
  13. 0 27
      KulexiuForTeacher/KulexiuForTeacher/Module/MidiPlayer/ShareInChat/Controller/KSShareGroupViewController.h
  14. 0 180
      KulexiuForTeacher/KulexiuForTeacher/Module/MidiPlayer/ShareInChat/Controller/KSShareGroupViewController.m
  15. 0 1
      KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/Controller/ModifyPhoneChangeController.m
  16. 0 1
      KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/Controller/ModifyViewController.m
  17. 0 1
      KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/Controller/SettingViewController.m
  18. 0 1
      KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/Controller/UserSettingViewController.m
  19. 0 1
      KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/DeleteAccount/Controller/AccountDeleteViewController.m

+ 0 - 18
KulexiuForTeacher/KulexiuForTeacher.xcodeproj/project.pbxproj

@@ -86,9 +86,7 @@
 		275E8A8E27E18F2900DD3F6E /* KulexiuForTeacherUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = 275E8A8D27E18F2900DD3F6E /* KulexiuForTeacherUITests.m */; };
 		275E8A9027E18F2900DD3F6E /* KulexiuForTeacherUITestsLaunchTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 275E8A8F27E18F2900DD3F6E /* KulexiuForTeacherUITestsLaunchTests.m */; };
 		275FA19727E723D700CFEA2E /* KSLocalWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 275FA19627E723D700CFEA2E /* KSLocalWebViewController.m */; };
-		275FA19D27E7246F00CFEA2E /* RCConnectionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 275FA19B27E7246F00CFEA2E /* RCConnectionManager.m */; };
 		275FA1A027E7250700CFEA2E /* KSAccompanyWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 275FA19F27E7250700CFEA2E /* KSAccompanyWebViewController.m */; };
-		275FA1A327E7311700CFEA2E /* KSRCIMDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 275FA1A227E7311600CFEA2E /* KSRCIMDataSource.m */; };
 		275FA1A827E7327500CFEA2E /* KSWebSocketManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 275FA1A527E7327300CFEA2E /* KSWebSocketManager.m */; };
 		275FA1A927E7327500CFEA2E /* KSAQRecordManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 275FA1A727E7327500CFEA2E /* KSAQRecordManager.m */; };
 		275FA55827F30AE300EB6240 /* VideoCourseModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 275FA55627F30AE200EB6240 /* VideoCourseModel.m */; };
@@ -1009,7 +1007,6 @@
 		BCB908FD2850C9CB00F5FF69 /* MusicChooseSearchView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BCB908FC2850C9CB00F5FF69 /* MusicChooseSearchView.xib */; };
 		BCB909042851E25D00F5FF69 /* KSShareChooseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BCB909032851E25D00F5FF69 /* KSShareChooseViewController.m */; };
 		BCB909072851E32C00F5FF69 /* ShareChooseMainView.m in Sources */ = {isa = PBXBuildFile; fileRef = BCB909062851E32C00F5FF69 /* ShareChooseMainView.m */; };
-		BCB9FA13286C7C6C005D766B /* KSShareGroupViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BCB9FA12286C7C6C005D766B /* KSShareGroupViewController.m */; };
 		BCB9FA1C286D537E005D766B /* KSScanViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BCB9FA1B286D537E005D766B /* KSScanViewController.m */; };
 		BCB9FA1F286D539A005D766B /* ScanNavView.m in Sources */ = {isa = PBXBuildFile; fileRef = BCB9FA1E286D539A005D766B /* ScanNavView.m */; };
 		BCB9FA21286D53A1005D766B /* ScanNavView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BCB9FA20286D53A1005D766B /* ScanNavView.xib */; };
@@ -1368,12 +1365,8 @@
 		275E8ADD27E1B25200DD3F6E /* KulexiuForTeacher.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = KulexiuForTeacher.entitlements; sourceTree = "<group>"; };
 		275FA19527E723D600CFEA2E /* KSLocalWebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KSLocalWebViewController.h; sourceTree = "<group>"; };
 		275FA19627E723D700CFEA2E /* KSLocalWebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KSLocalWebViewController.m; sourceTree = "<group>"; };
-		275FA19827E7246D00CFEA2E /* RCConnectionManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCConnectionManager.h; sourceTree = "<group>"; };
-		275FA19B27E7246F00CFEA2E /* RCConnectionManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCConnectionManager.m; sourceTree = "<group>"; };
 		275FA19E27E7250700CFEA2E /* KSAccompanyWebViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KSAccompanyWebViewController.h; sourceTree = "<group>"; };
 		275FA19F27E7250700CFEA2E /* KSAccompanyWebViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KSAccompanyWebViewController.m; sourceTree = "<group>"; };
-		275FA1A127E7311600CFEA2E /* KSRCIMDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KSRCIMDataSource.h; sourceTree = "<group>"; };
-		275FA1A227E7311600CFEA2E /* KSRCIMDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KSRCIMDataSource.m; sourceTree = "<group>"; };
 		275FA1A427E7327200CFEA2E /* KSAQRecordManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KSAQRecordManager.h; sourceTree = "<group>"; };
 		275FA1A527E7327300CFEA2E /* KSWebSocketManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KSWebSocketManager.m; sourceTree = "<group>"; };
 		275FA1A627E7327400CFEA2E /* KSWebSocketManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KSWebSocketManager.h; sourceTree = "<group>"; };
@@ -2944,8 +2937,6 @@
 		BCB909032851E25D00F5FF69 /* KSShareChooseViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KSShareChooseViewController.m; sourceTree = "<group>"; };
 		BCB909052851E32C00F5FF69 /* ShareChooseMainView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShareChooseMainView.h; sourceTree = "<group>"; };
 		BCB909062851E32C00F5FF69 /* ShareChooseMainView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShareChooseMainView.m; sourceTree = "<group>"; };
-		BCB9FA11286C7C6C005D766B /* KSShareGroupViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KSShareGroupViewController.h; sourceTree = "<group>"; };
-		BCB9FA12286C7C6C005D766B /* KSShareGroupViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KSShareGroupViewController.m; sourceTree = "<group>"; };
 		BCB9FA1A286D537E005D766B /* KSScanViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KSScanViewController.h; sourceTree = "<group>"; };
 		BCB9FA1B286D537E005D766B /* KSScanViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KSScanViewController.m; sourceTree = "<group>"; };
 		BCB9FA1D286D539A005D766B /* ScanNavView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ScanNavView.h; sourceTree = "<group>"; };
@@ -3663,10 +3654,6 @@
 				BCB635B827F722E800ACFDCF /* KSDocumentViewController.m */,
 				27BC3B1627F2B0D200D81E30 /* kSJXCollectionView.h */,
 				27BC3B1727F2B0D200D81E30 /* kSJXCollectionView.m */,
-				275FA1A127E7311600CFEA2E /* KSRCIMDataSource.h */,
-				275FA1A227E7311600CFEA2E /* KSRCIMDataSource.m */,
-				275FA19827E7246D00CFEA2E /* RCConnectionManager.h */,
-				275FA19B27E7246F00CFEA2E /* RCConnectionManager.m */,
 				2779361C27E3338D0010E277 /* KSUpdateManager.h */,
 				2779361D27E3338E0010E277 /* KSUpdateManager.m */,
 				2779362027E334450010E277 /* KSUpdateAlert.h */,
@@ -7278,8 +7265,6 @@
 			children = (
 				BCB909022851E25D00F5FF69 /* KSShareChooseViewController.h */,
 				BCB909032851E25D00F5FF69 /* KSShareChooseViewController.m */,
-				BCB9FA11286C7C6C005D766B /* KSShareGroupViewController.h */,
-				BCB9FA12286C7C6C005D766B /* KSShareGroupViewController.m */,
 				BC3744D228DB156E004EDFCF /* KSImageShareViewController.h */,
 				BC3744D328DB156F004EDFCF /* KSImageShareViewController.m */,
 			);
@@ -8570,7 +8555,6 @@
 				BCF61BE128041FC90000ACFE /* UIView+ExtensionForDotLine.m in Sources */,
 				BC71DE9B2A89F450003F165E /* TXClassroomViewController.m in Sources */,
 				BCC9F42F27F69BD200647449 /* HTTPUtility.m in Sources */,
-				275FA1A327E7311700CFEA2E /* KSRCIMDataSource.m in Sources */,
 				BC56C97C2923A3FD00AF301F /* CoursewareAlertCell.m in Sources */,
 				275E3DE227F467410010EC30 /* KSChatEmojiCollectionCell.m in Sources */,
 				BC14E4952AB31059000C4983 /* TenantCreateGroupBodyView.m in Sources */,
@@ -8676,7 +8660,6 @@
 				BC2456F3286BEFDA00D1F7C0 /* MineEmptyVideoCell.m in Sources */,
 				2779320127E30FC30010E277 /* KSStatusView.m in Sources */,
 				2779323027E30FC30010E277 /* ALCalendarPicker.m in Sources */,
-				BCB9FA13286C7C6C005D766B /* KSShareGroupViewController.m in Sources */,
 				BC106BA72A8F45AA000759A9 /* TXLiveSeatActionView.m in Sources */,
 				BC106B722A8F4586000759A9 /* TXLiveMessageShopRush.m in Sources */,
 				2779323E27E30FC30010E277 /* VoCacheManager.m in Sources */,
@@ -8742,7 +8725,6 @@
 				27F9CB0E27EC5DF5003E0FE4 /* KSRCloudMediaManager.m in Sources */,
 				BC221FB928C8687300F99802 /* MusicSortView.m in Sources */,
 				BC4BCE7D2823B66000522C8B /* AddressDetailBodyView.m in Sources */,
-				275FA19D27E7246F00CFEA2E /* RCConnectionManager.m in Sources */,
 				BCF425ED2AB975D200BCD942 /* TenantMineHeadView.m in Sources */,
 				27FC2F6D27F1BE4800FCC239 /* VideoCourseViewController.m in Sources */,
 				277931DC27E30FC20010E277 /* MBProgressHUD+KSShow.m in Sources */,

+ 0 - 2
KulexiuForTeacher/KulexiuForTeacher/Common/Base/KSBaseWKWebViewController.m

@@ -10,12 +10,10 @@
 #import "LoginViewController.h"
 #import "AppDelegate.h"
 #import "CustomNavViewController.h"
-#import <RongIMKit/RongIMKit.h>
 #import "UIDevice+TFDevice.h"
 #import "KSPremissionAlert.h"
 #import "RecordCheckManager.h"
 #import "KSLocalWebViewController.h"
-#import "RCConnectionManager.h"
 #import "KSAccompanyWebViewController.h"
 #import "KSChatConversationViewController.h"
 #import "KSGroupConversationController.h"

+ 0 - 1
KulexiuForTeacher/KulexiuForTeacher/Common/Base/KSNetworkingManager.m

@@ -10,7 +10,6 @@
 #import "LoginViewController.h"
 #import "AppDelegate.h"
 #import "JPUSHService.h"
-#import "RCConnectionManager.h"
 #import "CustomNavViewController.h"
 
 @implementation KSNetworkingManager

+ 0 - 26
KulexiuForTeacher/KulexiuForTeacher/Common/Base/KSRCIMDataSource.h

@@ -1,26 +0,0 @@
-//
-//  KSRCIMDataSource.h
-//  StudentDaya
-//
-//  Created by Kyle on 2019/8/12.
-//  Copyright © 2019 DayaMusic. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <RongIMKit/RongIMKit.h>
-#define KSRMDataSource [KSRCIMDataSource shareInstance]
-
-NS_ASSUME_NONNULL_BEGIN
-
-
-@interface KSRCIMDataSource : NSObject <RCIMUserInfoDataSource,RCIMGroupInfoDataSource,RCIMGroupMemberDataSource,RCIMGroupUserInfoDataSource>
-
-+ (KSRCIMDataSource *)shareInstance;
-
-- (void)getUserInfoWithUserId:(NSString *)userId completion:(void (^)(RCUserInfo *))completion;
-
-- (void)getUserInfoWithUserId:(NSString *)userId inGroup:(NSString *)groupId completion:(void (^)(RCUserInfo *))completion;
-- (void)getAllMembersOfGroup:(NSString *)groupId result:(void (^)(NSArray<NSString *> *))resultBlock;
-@end
-
-NS_ASSUME_NONNULL_END

+ 0 - 144
KulexiuForTeacher/KulexiuForTeacher/Common/Base/KSRCIMDataSource.m

@@ -1,144 +0,0 @@
-//
-//  KSRCIMDataSource.m
-//  StudentDaya
-//
-//  Created by Kyle on 2019/8/12.
-//  Copyright © 2019 DayaMusic. All rights reserved.
-//
-
-#import "KSRCIMDataSource.h"
-
-
-
-@implementation KSRCIMDataSource
-
-+ (KSRCIMDataSource *)shareInstance {
-    static KSRCIMDataSource *manager = nil;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        manager = [[[self class] alloc] init];
-    });
-    return manager;
-}
-
-#pragma mark --- groupInfo
-
-- (void)getGroupInfoWithGroupId:(NSString *)groupId completion:(void (^)(RCGroup *))completion {
-    if ([NSString isEmptyString:groupId]) {
-        completion(nil);
-    }
-    [KSNetworkingManager queryGroupDetail:KS_POST groupId:groupId success:^(NSDictionary * _Nonnull dic) {
-        if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
-            NSDictionary *result = [dic ks_dictionaryValueForKey:@"data"];
-            RCGroup *groupInfo = [[RCGroup alloc] initWithGroupId:groupId groupName:[result ks_stringValueForKey:@"name"] portraitUri:[result ks_stringValueForKey:@"img"]];
-            completion(groupInfo);
-        }
-        else {
-            RCGroup *groupInfo = [[RCGroup alloc] initWithGroupId:groupId groupName:@"" portraitUri:@""];
-            completion(groupInfo);
-        }
-    } faliure:^(NSError * _Nonnull error) {
-        RCGroup *groupInfo = [[RCGroup alloc] initWithGroupId:groupId groupName:@"" portraitUri:@""];
-        completion(groupInfo);
-    }];
-}
-
-// 获取群组中所有的用户uid
-- (void)getAllMembersOfGroup:(NSString *)groupId result:(void (^)(NSArray<NSString *> *))resultBlock {
-    if ([NSString isEmptyString:groupId]) {
-        resultBlock(nil);
-        return;
-    }
-    [KSNetworkingManager imGroupMemberAllRequest:KS_POST groupId:groupId success:^(NSDictionary * _Nonnull dic) {
-        if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
-            NSArray *sourceArray = [dic ks_arrayValueForKey:@"data"];
-            NSMutableArray *ret = [[NSMutableArray alloc] init];
-            for (NSDictionary *parm in sourceArray) {
-                [ret addObject:[parm ks_stringValueForKey:@"userId"]];
-            }
-            resultBlock(ret);
-        }
-        else {
-            resultBlock(nil);
-        }
-    } faliure:^(NSError * _Nonnull error) {
-        resultBlock(nil);
-    }];
-}
-
-#pragma mark -- userInfo
-- (void)getUserInfoWithUserId:(NSString *)userId completion:(void (^)(RCUserInfo *))completion {
-    RCUserInfo *user = [RCUserInfo new];
-    if (userId == nil || [userId length] == 0) {
-        user.userId = userId;
-        user.portraitUri = @"";
-        user.name = @"";
-        completion(user);
-        return;
-    }
-    if (![userId isEqualToString:[RCIM sharedRCIM].currentUserInfo.userId]) {
-        [KSNetworkingManager imUserFriendQueryDetail:KS_POST userId:userId success:^(NSDictionary * _Nonnull dic) {
-            if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
-                
-                NSDictionary *userDic = [dic ks_dictionaryValueForKey:@"data"];
-                RCUserInfo *user = [[RCUserInfo alloc] initWithUserId:userId name:[userDic ks_stringValueForKey:@"friendNickname"] portrait:[userDic ks_stringValueForKey:@"friendAvatar"]];
-                // 附加字段
-                NSMutableDictionary *extraDic = [NSMutableDictionary dictionary];
-                [extraDic setValue:[userDic ks_stringValueForKey:@"roleType"] forKey:@"role"];
-                user.extra = [extraDic mj_JSONString];
-                completion(user);
-            }
-            else {
-                RCUserInfo *user = [RCUserInfo new];
-                completion(user);
-            }
-        } faliure:^(NSError * _Nonnull error) {
-            RCUserInfo *user = [RCUserInfo new];
-            completion(user);
-        }];
-    }
-    else {
-        RCUserInfo *user = [[RCUserInfo alloc] initWithUserId:UserDefault(UIDKey) name:UserDefault(NicknameKey) portrait:UserDefault(AvatarUrlKey)];
-        // 附加字段
-        NSMutableDictionary *extraDic = [NSMutableDictionary dictionary];
-        [extraDic setValue:@"TEACHER" forKey:@"role"];
-        user.extra = [extraDic mj_JSONString];
-        return completion(user);
-    }
-}
-
-#pragma mark --- group userInfo
-- (void)getUserInfoWithUserId:(NSString *)userId inGroup:(NSString *)groupId completion:(void (^)(RCUserInfo *))completion {
-    RCUserInfo *user = [RCUserInfo new];
-    if (userId == nil || [userId length] == 0) {
-        user.userId = userId;
-        user.portraitUri = @"";
-        user.name = @"";
-        completion(user);
-        return;
-    }
-    [KSNetworkingManager imGroupMemberQueryUser:KS_POST groupId:groupId userId:userId success:^(NSDictionary * _Nonnull dic) {
-        if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
-            NSDictionary *result = [dic ks_dictionaryValueForKey:@"data"];
-            NSString *name = [result ks_stringValueForKey:@"nickname"];
-            RCUserInfo *user = [[RCUserInfo alloc] initWithUserId:userId name:name portrait:[result ks_stringValueForKey:@"avatar"]];
-            // 附加字段
-            NSMutableDictionary *extraDic = [NSMutableDictionary dictionary];
-            if ([result ks_boolValueForKey:@"isAdmin"]) {
-                [extraDic setValue:@"owner" forKey:@"groupOwner"];
-            }
-            [extraDic setValue:[result ks_stringValueForKey:@"roleType"] forKey:@"role"];
-            user.extra = [extraDic mj_JSONString];
-            completion(user);
-        }
-        else {
-            RCUserInfo *user = [RCUserInfo new];
-            completion(user);
-        }
-    } faliure:^(NSError * _Nonnull error) {
-        RCUserInfo *user = [RCUserInfo new];
-        completion(user);
-    }];
-}
-
-@end

+ 0 - 28
KulexiuForTeacher/KulexiuForTeacher/Common/Base/RCConnectionManager.h

@@ -1,28 +0,0 @@
-//
-//  RCConnectionManager.h
-//  StudentDaya
-//
-//  Created by Kyle on 2019/9/10.
-//  Copyright © 2019 DayaMusic. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <RongIMKit/RongIMKit.h>
-NS_ASSUME_NONNULL_BEGIN
-
-#define KSRMLINK [RCConnectionManager shareManager]
-
-
-@interface RCConnectionManager : NSObject <RCIMConnectionStatusDelegate>
-
-@property (nonatomic, assign) BOOL isConnected; // 是否连接上融云
-
-@property (nonatomic, assign) BOOL isNeedJoin;  // 是否需要加入房间
-
-@property (nonatomic, assign) BOOL isNeedShowMessage; // 是否提示信息
-
-+ (instancetype)shareManager;
-
-@end
-
-NS_ASSUME_NONNULL_END

+ 0 - 81
KulexiuForTeacher/KulexiuForTeacher/Common/Base/RCConnectionManager.m

@@ -1,81 +0,0 @@
-//
-//  RCConnectionManager.m
-//  StudentDaya
-//
-//  Created by Kyle on 2019/9/10.
-//  Copyright © 2019 DayaMusic. All rights reserved.
-//
-
-#import "RCConnectionManager.h"
-#import "LoginHelper.h"
-#import "ClassroomService.h"
-
-@interface RCConnectionManager ()
-
-
-
-@end
-
-@implementation RCConnectionManager
-
-+ (instancetype)shareManager {
-    static RCConnectionManager *manager = nil;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        manager = [[RCConnectionManager alloc] init];
-    });
-    return manager;
-}
-
-- (void)setIsNeedJoin:(BOOL)isNeedJoin {
-    _isNeedJoin = isNeedJoin;
-    if (self.isConnected && isNeedJoin) {
-        dispatch_main_async_safe(^{
-        });
-    }
-    else if (isNeedJoin && !self.isConnected) {
-        dispatch_main_async_safe(^{
-//            NSString *tipsMessage = [NSString isEmptyString:UserDefault(IM_TOKEN)] ? @"无IM token,请重新登录获取" : @"IM未能连接上,请检查您的网络";
-//            [LOADING_MANAGER MBShowAUTOHidingInWindow:tipsMessage];
-            // 失败回调
-//            [[ClassroomService sharedService] joinRoomFailerNotify];
-        });
-    }
-}
-
-
-// 极端情况 IM稍后连上的 还没有进入房间
-- (void)setIsConnected:(BOOL)isConnected {
-    _isConnected = isConnected;
-    if (self.isNeedJoin && isConnected) {
-        dispatch_main_async_safe(^{
-        });
-    }
-}
-
-
-- (void)onRCIMConnectionStatusChanged:(RCConnectionStatus)status {
-    if (status == ConnectionStatus_Connected) { // RTC会自动断线重连 此处多余
-        self.isConnected = YES;
-        NSLog(@"connect im success");
-        [[NSNotificationCenter defaultCenter] postNotificationName:@"RongIMConnected" object:nil];
-    }
-    else if (status == ConnectionStatus_KICKED_OFFLINE_BY_OTHER_CLIENT) { // 账号被挤掉
-        
-        self.isNeedJoin = NO;
-        self.isNeedShowMessage = NO;
-        [[RCIM sharedRCIM] logout];
-        [[NSNotificationCenter defaultCenter] postNotificationName:@"otherLogin" object:nil];
-    }
-    else if (status == ConnectionStatus_Unconnected) {
-        if (_isNeedShowMessage) {
-            dispatch_main_async_safe(^{
-                [LOADING_MANAGER MBShowAUTOHidingInWindow:@"连接断开,请检查您的网络"];
-            });
-        }
-    }
-}
-
-
-
-@end

+ 0 - 12
KulexiuForTeacher/KulexiuForTeacher/Module/Chat/Group/Controller/GroupMemberViewController.m

@@ -10,7 +10,6 @@
 #import "UITableView+SCIndexView.h"
 #import "GroupMemberListCell.h"
 #import "GroupMemberModel.h"
-#import <RongIMKit/RongIMKit.h>
 #import "KSChatConversationViewController.h"
 
 @interface GroupMemberViewController ()<UITableViewDelegate,UITableViewDataSource>
@@ -53,17 +52,6 @@
                 }
                 GroupMemberModel *model = [[GroupMemberModel alloc] initWithDictionary:parm];
                 [self.sourceArray addObject:model];
-                
-                // 刷新缓存
-                RCUserInfo *user = [[RCUserInfo alloc] initWithUserId:model.imUserId name:model.nickname portrait:model.avatar];
-                // 附加字段
-                NSMutableDictionary *extraDic = [NSMutableDictionary dictionary];
-                if (model.isAdmin) {
-                    [extraDic setValue:@"owner" forKey:@"groupOwner"];
-                }
-                [extraDic setValue:model.roleType forKey:@"role"];
-                user.extra = [extraDic mj_JSONString];
-                [[RCIM sharedRCIM] refreshGroupUserInfoCache:user withUserId:model.imUserId withGroupId:self.groupId];
             }
             [self evaluateMessge];
         }

+ 0 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Chat/GroupNotice/Controller/GroupNoticeEditController.m

@@ -7,7 +7,6 @@
 
 #import "GroupNoticeEditController.h"
 #import "NoticeEditBodyView.h"
-#import <RongIMKit/RongIMKit.h>
 
 @interface GroupNoticeEditController ()
 

+ 0 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Live/Controller/LiveRoomViewController.m

@@ -15,7 +15,6 @@
 #import "LiveroomTimeManager.h"
 
 #import "UserInfoManager.h"
-#import <RongIMKit/RongIMKit.h>
 #import "KSChatInputBarControl.h"
 #import "LiveRoomHeadView.h"
 #import "LiveRoomBottomView.h"

+ 1 - 2
KulexiuForTeacher/KulexiuForTeacher/Module/Live/View/SeatContentView.m

@@ -7,7 +7,6 @@
 //
 
 #import "SeatContentView.h"
-#import <RongIMKit/RongIMKit.h>
 
 @interface SeatMemberView : UIView
 
@@ -67,7 +66,7 @@
         
         
         self.nameLabel.font = [UIFont systemFontOfSize:9.0f weight:UIFontWeightMedium];
-        self.nameLabel.text = [NSString returnNoNullStringWithString:[RCIMClient sharedRCIMClient].currentUserInfo.name];
+        self.nameLabel.text = [NSString returnNoNullStringWithString:UserDefault(NicknameKey)];
         
     }
     else { // 其他人

+ 0 - 3
KulexiuForTeacher/KulexiuForTeacher/Module/MidiPlayer/ShareInChat/Controller/KSShareChooseViewController.h

@@ -6,7 +6,6 @@
 //
 
 #import "KSBaseViewController.h"
-#import <RongIMKit/RongIMKit.h>
 #import "JXCategoryView.h"
 #import "JXPagerView.h"
 // 选择分享到的群组或个人
@@ -15,8 +14,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface KSShareChooseViewController : KSBaseViewController <JXCategoryListContentViewDelegate>
 
-@property (nonatomic, strong) RCMessageContent *msgContent;
-
 @property (nonatomic, strong) NSData *msgData;
 
 

+ 0 - 27
KulexiuForTeacher/KulexiuForTeacher/Module/MidiPlayer/ShareInChat/Controller/KSShareGroupViewController.h

@@ -1,27 +0,0 @@
-//
-//  KSShareGroupViewController.h
-//  KulexiuForTeacher
-//
-//  Created by 王智 on 2022/6/29.
-//
-
-#import "KSBaseViewController.h"
-
-typedef NS_ENUM(NSInteger, SHAREGROUP_TYPE) {
-    SHAREGROUP_TYPE_SUCCESS,
-    SHAREGROUP_TYPE_FAIL,
-};
-
-typedef void(^ShareGroupCallback)(BOOL isSuccess, NSString * _Nonnull descMsg);
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface KSShareGroupViewController : KSBaseViewController
-
-@property (nonatomic, assign) UIImage *shareImage;
-
-- (void)shareGroupCallback:(ShareGroupCallback)callback;
-
-@end
-
-NS_ASSUME_NONNULL_END

+ 0 - 180
KulexiuForTeacher/KulexiuForTeacher/Module/MidiPlayer/ShareInChat/Controller/KSShareGroupViewController.m

@@ -1,180 +0,0 @@
-//
-//  KSShareGroupViewController.m
-//  KulexiuForTeacher
-//
-//  Created by 王智 on 2022/6/29.
-//
-
-#import "KSShareGroupViewController.h"
-#import "GroupListModel.h"
-#import "GroupListViewCell.h"
-#import <RongIMKit/RongIMKit.h>
-
-@interface KSShareGroupViewController ()<UITableViewDelegate,UITableViewDataSource>
-
-@property (nonatomic, strong) UITableView *tableView;
-
-@property (nonatomic, copy) ShareGroupCallback callback;
-
-@end
-
-@implementation KSShareGroupViewController
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    // Do any additional setup after loading the view.
-    [self allocTitle:@"分享到群聊"];
-    [self configUI];
-    [self queryGroupList];
-}
-
-- (void)backAction {
-    if (self.callback) {
-        self.callback(NO, @"已取消");
-    }
-    [self.navigationController popViewControllerAnimated:YES];
-}
-
-- (void)configUI {
-    [self.scrollView removeFromSuperview];
-
-    [self.view addSubview:self.tableView];
-    [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.right.mas_equalTo(self.view);
-        make.top.mas_equalTo(self.view);
-        make.bottom.mas_equalTo(self.view.mas_bottom).offset(-iPhoneXSafeBottomMargin);
-    }];
-    [self setPromptString:@"暂无内容" imageName:@"wd_img_zwsj" inView:self.tableView];
-}
-
-- (void)searchRequest:(NSString *)searchKey {
-    [self queryGroupList];
-}
-
-- (void)queryGroupList {
-    [LOADING_MANAGER showHUD];
-    [KSNetworkingManager imGroupQueryPage:KS_POST search:nil success:^(NSDictionary * _Nonnull dic) {
-        [LOADING_MANAGER removeHUD];
-        if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
-            NSArray *array = [dic ks_arrayValueForKey:@"data"];
-            for (NSDictionary *parm in array) {
-                GroupListModel *model = [[GroupListModel alloc] initWithDictionary:parm];
-                [self.dataArray addObject:model];
-            }
-        }
-        else {
-            [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
-        }
-        [self.tableView reloadData];
-        [self changePromptLabelState];
-    } faliure:^(NSError * _Nonnull error) {
-        [LOADING_MANAGER removeHUD];
-        if (self.networkAvaiable == NO) {
-            [self setPromptString:@"暂无网络" imageName:@"no_networking" inView:self.tableView];
-        }
-        [self.dataArray removeAllObjects];
-        [self.tableView reloadData];
-        [self changePromptLabelState];
-    }];
-
-}
-
-- (void)shareGroupCallback:(ShareGroupCallback)callback {
-    if (callback) {
-        self.callback = callback;
-    }
-}
-
-#pragma mark ----- table data source
-- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-    return self.dataArray.count;
-}
-- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-    GroupListModel *model = self.dataArray[indexPath.row];
-    GroupListViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"GroupListViewCell"];
-    [cell configWithSource:model];
-    return cell;
-}
-
-- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-    GroupListModel *model = self.dataArray[indexPath.row];
-    if (![NSString isEmptyString:model.groupId]) {
-        [self shareImageToGroup:model.groupId];
-    }
-}
-
-
-- (void)shareImageToGroup:(NSString *)groupId {
-    
-    RCImageMessage *imgMsg = [RCImageMessage messageWithImage:self.shareImage];
-    imgMsg.full = YES;
-    [[RCIMClient sharedRCIMClient] sendMediaMessage:ConversationType_GROUP targetId:groupId content:imgMsg pushContent:nil pushData:nil progress:^(int progress, long messageId) {
-        
-    } success:^(long messageId) {
-        dispatch_main_async_safe(^{
-            if (self.callback) {
-                self.callback(YES, @"发送成功");
-                [LOADING_MANAGER MBShowAUTOHidingInWindow:@"发送成功"];
-            }
-            [self shareCallback];
-        });
-        
-    } error:^(RCErrorCode errorCode, long messageId) {
-        dispatch_main_async_safe(^{
-            if (self.callback) {
-                self.callback(NO, @"发送失败");
-                [LOADING_MANAGER MBShowAUTOHidingInWindow:@"发送失败"];
-            }
-            [self shareCallback];
-        });
-        
-    } cancel:^(long messageId) {
-        dispatch_main_async_safe(^{
-            if (self.callback) {
-                self.callback(NO, @"已取消");
-            }
-            [self shareCallback];
-        });
-    }];
-}
-
-- (void)shareCallback {
-    
-    [self.navigationController popViewControllerAnimated:YES];
-}
-
-- (UITableView *)tableView {
-    if (!_tableView) {
-        _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain];
-        _tableView.backgroundColor = HexRGB(0xf3f4f8);
-        _tableView.showsVerticalScrollIndicator = NO;
-
-        _tableView.dataSource = self;
-        _tableView.delegate = self;
-        _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
-        _tableView.rowHeight = UITableViewAutomaticDimension;
-        _tableView.rowHeight = 70;
-        
-        UIView *headView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, KPortraitWidth, 10)];
-        headView.backgroundColor = HexRGB(0xf3f4f8);
-        _tableView.tableHeaderView = headView;
-        
-        UIView *bottomView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, KPortraitWidth, 10)];
-        bottomView.backgroundColor = HexRGB(0xf3f4f8);
-        _tableView.tableFooterView = bottomView;
-        
-        [_tableView registerNib:[UINib nibWithNibName:@"GroupListViewCell" bundle:[NSBundle mainBundle]] forCellReuseIdentifier:@"GroupListViewCell"];
-    }
-    return _tableView;
-}
-/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-    // Get the new view controller using [segue destinationViewController].
-    // Pass the selected object to the new view controller.
-}
-*/
-
-@end

+ 0 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/Controller/ModifyPhoneChangeController.m

@@ -12,7 +12,6 @@
 #import "AppDelegate.h"
 #import "CustomNavViewController.h"
 #import "JPUSHService.h"
-#import "RCConnectionManager.h"
 #import "NSString+phone.h"
 
 @interface ModifyPhoneChangeController ()

+ 0 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/Controller/ModifyViewController.m

@@ -12,7 +12,6 @@
 #import "AppDelegate.h"
 #import "CustomNavViewController.h"
 #import "JPUSHService.h"
-#import "RCConnectionManager.h"
 
 @interface ModifyViewController ()
 {

+ 0 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/Controller/SettingViewController.m

@@ -14,7 +14,6 @@
 #import "UserInfoManager.h"
 #import "AddressListViewController.h"
 #import "UserAuthViewController.h"
-#import "RCConnectionManager.h"
 #import "LoginViewController.h"
 #import "AppDelegate.h"
 #import "CustomNavViewController.h"

+ 0 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/Controller/UserSettingViewController.m

@@ -7,7 +7,6 @@
 
 #import "UserSettingViewController.h"
 #import "UseBodyView.h"
-#import "RCConnectionManager.h"
 #import "LoginViewController.h"
 #import "AppDelegate.h"
 #import "CustomNavViewController.h"

+ 0 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/DeleteAccount/Controller/AccountDeleteViewController.m

@@ -12,7 +12,6 @@
 #import "AppDelegate.h"
 #import "CustomNavViewController.h"
 #import "JPUSHService.h"
-#import "RCConnectionManager.h"
 #import "NSString+phone.h"
 #import "KSNewConfirmAlertView.h"