Steven преди 6 месеца
родител
ревизия
06dafa374e

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher.xcodeproj/xcshareddata/xcschemes/KulexiuForTeacher.xcscheme

@@ -93,7 +93,7 @@
       buildConfiguration = "Debug">
    </AnalyzeAction>
    <ArchiveAction
-      buildConfiguration = "DEV"
+      buildConfiguration = "TEST"
       revealArchiveInOrganizer = "YES">
    </ArchiveAction>
 </Scheme>

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher/Common/Base/BaseViewContolller/KSBaseViewController.m

@@ -30,7 +30,7 @@
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     self.view.backgroundColor = HexRGB(0xf6f8f9);
-    [self modifyNavigationBarColor:HexRGB(0xf6f8f9)];
+//    [self modifyNavigationBarColor:HexRGB(0xf6f8f9)];
     [[self.navigationController navigationBar] setTranslucent:NO];
     [self defaultMessage]; // 设置默认刷新数据
     _scrollView = [[UIScrollView alloc] init];

+ 31 - 5
KulexiuForTeacher/KulexiuForTeacher/Common/Base/KSNetworkingManager.m

@@ -488,7 +488,7 @@
 /// @param success 成功
 /// @param faliure 失败
 + (void)checkUserRequest:(NSString *)get phone:(NSString *)phone password:(NSString *)password success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
-    
+    [self configRequestHeader];
     NSString *url = [NSString stringWithFormat:@"%@%@",hostURL, @"/api-auth/user/checkUser"];
     NSMutableDictionary *parm = [NSMutableDictionary dictionary];
     [parm setValue:phone forKey:@"phone"];
@@ -553,7 +553,7 @@
 /// @param success 成功
 /// @param faliure 失败
 + (void)logoffRequest:(NSString *)get smsCode:(NSString *)smsCode success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
-    
+    [self configRequestHeader];
     NSString *url = [NSString stringWithFormat:@"%@%@%@", hostURL, @"/api-auth/user/logoff/",smsCode];
     [self request:get andWithUrl:url and:nil success:success faliure:faliure];
 }
@@ -613,6 +613,7 @@
  @param faliure 失败
  */
 + (void)queryUserInfo:(NSString *)get success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
+    [self configRequestHeader];
     NSString *url = [NSString stringWithFormat:@"%@%@",hostURL, @"/api-auth/api/queryUserInfo"];
     [self request:get andWithUrl:url and:nil success:success faliure:faliure];
 }
@@ -624,6 +625,7 @@
 /// @param success 成功
 /// @param faliure 失败
 + (void)queryTeacherInfoRequest:(NSString *)get success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
+    [self configRequestHeader];
     NSString *url = [NSString stringWithFormat:@"%@%@",hostURL, @"/api-teacher/teacher/queryUserInfo"];
     NSMutableDictionary *parm = [NSMutableDictionary dictionary];
     [self request:get andWithUrl:url and:parm success:success faliure:faliure];
@@ -654,6 +656,7 @@
 /// @param success 成功
 /// @param faliure 失败
 + (void)queryTeacherStyleRequest:(NSString *)get success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
+    [self configRequestHeader];
     NSString *url = [NSString stringWithFormat:@"%@%@",hostURL, @"/api-teacher/teacher/queryTeacherStyle"];
     NSMutableDictionary *parm = [NSMutableDictionary dictionary];
     [self request:get andWithUrl:url and:parm success:success faliure:faliure];
@@ -686,6 +689,7 @@
 /// @param success 成功
 /// @param faliure 失败
 + (void)querySubjectAllRequest:(NSString *)get success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
+    [self configRequestHeader];
     NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-teacher/subject/subjectSelect"];
     [self request:get andWithUrl:url and:nil success:success faliure:faliure];
 }
@@ -715,6 +719,7 @@
 /// @param success 成功
 /// @param faliure 失败
 + (void)homeCountMessage:(NSString *)get success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
+    [self configRequestHeader];
     NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-teacher/home/count"];
     [self request:get andWithUrl:url and:nil success:success faliure:faliure];
 }
@@ -762,6 +767,7 @@
 /// @param success 成功
 /// @param faliure 失败
 + (void)queryRecentLiveAndVideo:(NSString *)get success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
+    [self configRequestHeader];
     NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-teacher/courseSchedule/queryLiveAndVideo"];
     [self request:get andWithUrl:url and:nil success:success faliure:faliure];
 }
@@ -786,6 +792,7 @@
 /// @param success 成功
 /// @param faliure 失败
 + (void)selectRoomConfigRequest:(NSString *)get success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
+    [self configRequestHeader];
     NSString *url = [NSString stringWithFormat:@"%@%@",hostURL, @"/api-teacher/courseSchedule/selectRoomConfig"];
     [self request:get andWithUrl:url and:nil success:success faliure:faliure];
 }
@@ -1330,6 +1337,7 @@
 // 分享老师曲谱数据查询
 // /api-teacher/music/sheet/share
 + (void)queryMusicShareMessageRequest:(NSString *)get success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
+    [self configRequestHeader];
     NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-teacher/music/sheet/share"];
     [self request:get andWithUrl:url and:nil success:success faliure:faliure];
 }
@@ -1378,6 +1386,7 @@
 /// @param success 成功
 /// @param faliure 失败
 + (void)queryVideoRequest:(NSString *)get roomUid:(NSString *)roomUid success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
+    [self configRequestHeader];
     NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-teacher/liveRoomVideo/queryVideo"];
     NSMutableDictionary *parm = [NSMutableDictionary dictionary];
     [parm setValue:roomUid forKey:@"roomUid"];
@@ -1413,6 +1422,7 @@
 /// @param success 成功
 /// @param faliure 失败
 + (void)speakerCheckRoomInfoRequest:(NSString *)get roomUid:(NSString *)roomUid success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
+    [self configRequestHeader];
     NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-teacher/liveRoom/speakerCheckRoomInfo"];
     NSMutableDictionary *parm = [NSMutableDictionary dictionary];
     [parm setValue:roomUid forKey:@"roomUid"];
@@ -1426,6 +1436,7 @@
 /// @param success 成功
 /// @param faliure 失败
 + (void)liveRoomSetMicApplyEnable:(NSString *)get roomUid:(NSString *)roomUid whetherMic:(NSInteger)whetherMic success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
+    [self configRequestHeader];
     NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-teacher/liveRoom/whetherMic"];
     NSMutableDictionary *parm = [NSMutableDictionary dictionary];
     [parm setValue:roomUid forKey:@"roomUid"];
@@ -1442,6 +1453,7 @@
 /// @param success 成功
 /// @param faliure 失败
 + (void)liveRoomJoinRoomRequest:(NSString *)get roomUid:(NSString *)roomUid success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
+    [self configRequestHeader];
     NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-teacher/liveRoom/speakerJoinRoom"];
     NSMutableDictionary *parm = [NSMutableDictionary dictionary];
     [parm setValue:roomUid forKey:@"roomUid"];
@@ -1457,6 +1469,7 @@
 /// @param success 成功
 /// @param faliure 失败
 + (void)syncLikeRequest:(NSString *)get likeNum:(NSInteger)likeNum roomUid:(NSString *)roomUid success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
+    [self configRequestHeader];
     NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-teacher/liveRoom/syncLike"];
     NSMutableDictionary *parm = [NSMutableDictionary dictionary];
     [parm setValue:@(likeNum) forKey:@"likeNum"];
@@ -1490,6 +1503,7 @@
 /// @param success 成功
 /// @param faliure 失败
 + (void)destroyLiveRoomRequest:(NSString *)get roomUid:(NSString *)roomUid success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
+    [self configRequestHeader];
     NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-teacher/liveRoom/destroyLiveRoom"];
     NSMutableDictionary *parm = [NSMutableDictionary dictionary];
     [parm setValue:roomUid forKey:@"roomUid"];
@@ -1717,7 +1731,7 @@
 /// @param success 成功
 /// @param faliure 失败
 + (void)homeworkDetailRequest:(NSString *)get courseId:(NSString *)courseId studentId:(nonnull NSString *)studentId success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
-    
+    [self configRequestHeader];
     NSString *url = [NSString stringWithFormat:@"%@%@/%@/%@",hostURL, @"/api-teacher/homework/detail",courseId,studentId];
     [self request:get andWithUrl:url and:nil success:success faliure:faliure];
 }
@@ -1929,6 +1943,7 @@
 /// @param success 成功
 /// @param faliure 失败
 + (void)teacherAccountDetail:(NSString *)get success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
+    [self configRequestHeader];
     NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-teacher/userAccount/detail"];
     [self request:get andWithUrl:url and:nil success:success faliure:faliure];
 }
@@ -1941,6 +1956,7 @@
 /// @param success 成功
 /// @param faliure 失败
 + (void)checkContractSignRequest:(NSString *)get contractType:(NSString *)contractType success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
+    [self configRequestHeader];
     NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-teacher/sysUserContractRecord/checkContractSignV2"];
     NSMutableDictionary *parm = [NSMutableDictionary dictionary];
     [parm setValue:contractType forKey:@"contractType"];
@@ -2005,6 +2021,7 @@
 /// @param success 成功
 /// @param faliure 失败
 + (void)companyAddressListRequest:(NSString *)get success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
+    [self configRequestHeader];
     NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-mall-portal/member/address/list"];
     [self request:get andWithUrl:url and:nil success:success faliure:faliure];
 }
@@ -2045,7 +2062,8 @@
 /// @param addressId 地址id
 /// @param success 成功
 /// @param faliure 失败
-+ (void)queryAddressDetailRequst:(NSString *)get addressId:(NSString *)addressId success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure; {
++ (void)queryAddressDetailRequst:(NSString *)get addressId:(NSString *)addressId success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
+    [self configRequestHeader];
     NSString *url = [NSString stringWithFormat:@"%@%@%@", hostURL, @"/api-mall-portal/member/address/",addressId];
     [self request:get andWithUrl:url and:nil success:success faliure:faliure];
 }
@@ -2122,6 +2140,7 @@
 /// @param success 成功
 /// @param faliure 失败
 + (void)queryCountOfUnreadRequest:(NSString *)get success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
+    [self configRequestHeader];
     NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-teacher/sysMessage/queryCountOfUnread"];
     [self request:get andWithUrl:url and:nil success:success faliure:faliure];
 }
@@ -2384,6 +2403,7 @@
 /// @param success 成功
 /// @param faliure 失败
 + (void)queryCourseAdjustTimeLimit:(NSString *)get success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
+    [self configRequestHeader];
     NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-teacher/sysConfig/queryByParamNameList"];
     NSMutableDictionary *parm = [NSMutableDictionary dictionary];
     [parm setValue:@"course_start_setting,course_end_setting" forKey:@"paramNames"];
@@ -2398,6 +2418,7 @@
 /// @param success 成功
 /// @param faliure 失败
 + (void)queryByParamName:(NSString *)get paramName:(NSString *)paramName success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
+    [self configRequestHeader];
     NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-teacher/sysConfig/queryByParamName"];
     NSMutableDictionary *parm = [NSMutableDictionary dictionary];
     [parm setValue:paramName forKey:@"paramName"];
@@ -2411,6 +2432,7 @@
 /// @param success 成功
 /// @param faliure 失败
 + (void)checkReceiveRewardRequest:(NSString *)get success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
+    [self configRequestHeader];
     NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-teacher/activity/checkReceiveReward"];
     [self request:get andWithUrl:url and:nil success:success faliure:faliure];
 }
@@ -2423,6 +2445,7 @@
 /// @param success 成功
 /// @param faliure 失败
 + (void)queryUserById:(NSString *)get rongCloudUserId:(NSString *)rongCloudUserId success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
+    [self configRequestHeader];
     NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-teacher/student/queryUserById"];
     NSMutableDictionary *parm = [NSMutableDictionary dictionary];
     [parm setValue:rongCloudUserId forKey:@"rongCloudUserId"];
@@ -2436,6 +2459,7 @@
 /// @param success 成功
 /// @param faliure 失败
 + (void)queryUserRecentRequest:(NSString *)get userId:(NSString *)userId success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
+    [self configRequestHeader];
     NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-teacher/music/sheet/user/practice"];
     NSMutableDictionary *parm = [NSMutableDictionary dictionary];
     [parm setValue:userId forKey:@"userId"];
@@ -2551,6 +2575,7 @@
 /// @param success 成功
 /// @param faliure 失败
 + (void)unbindTenantDetailRequest:(NSString *)get success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
+    [self configRequestHeader];
     NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-teacher/teacher/unbindTenantDetail"];
     NSMutableDictionary *parm = [NSMutableDictionary dictionary];
     [self request:get andWithUrl:url and:parm success:success faliure:faliure];
@@ -2624,7 +2649,7 @@
 /// @param success 成功
 /// @param faliure 失败
 + (void)subjectQueryPageRequest:(NSString *)get success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
-    
+    [self configRequestHeader];
     NSString *url = [NSString stringWithFormat:@"%@%@",hostURL, @"/api-teacher/open/subject/queryPage"];
     NSMutableDictionary *parm = [NSMutableDictionary dictionary];
     [parm setValue:@"list" forKey:@"queryType"];
@@ -2813,6 +2838,7 @@
 /// @param success 成功
 /// @param faliure 失败
 + (void)updateUserCustomerServiceRequest:(NSString *)get success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
+    [self configRequestHeader];
     NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-teacher/teacher/updateUserCustomerService"];
     NSMutableDictionary *parm = [NSMutableDictionary dictionary];
     [self request:get andWithUrl:url and:parm success:success faliure:faliure];

+ 2 - 2
KulexiuForTeacher/KulexiuForTeacher/Common/Base/NavigationController/CustomNavViewController.m

@@ -29,7 +29,7 @@
             appearance.backgroundEffect = nil;
             // 去除导航栏阴影(如果不设置clear,导航栏底下会有一条阴影线)
             appearance.shadowImage = [UIImage imageWithColor:[UIColor clearColor]];
-            appearance.backgroundColor = HexRGB(0xf6f8f9);
+            appearance.backgroundColor = [UIColor whiteColor];
             [appearance setTitleTextAttributes:@{NSForegroundColorAttributeName:[UIColor blackColor],NSFontAttributeName : [UIFont boldSystemFontOfSize:18]}];
             self.navigationBar.standardAppearance = appearance;
             self.navigationBar.scrollEdgeAppearance = appearance;
@@ -38,7 +38,7 @@
             [[UINavigationBar appearance] setShadowImage:[[UIImage alloc] init]];
             UINavigationBar *navBar = [UINavigationBar appearance];
             [navBar setTitleTextAttributes:@{NSForegroundColorAttributeName:[UIColor blackColor],NSFontAttributeName : [UIFont boldSystemFontOfSize:18]}];
-            [navBar setBarTintColor:HexRGB(0xf6f8f9)];
+            [navBar setBarTintColor:[UIColor whiteColor]];
         }
         self.view.backgroundColor = HexRGB(0xf6f8f9);
     }

+ 0 - 1
KulexiuForTeacher/KulexiuForTeacher/Common/Base/WebView/KSBaseWKWebViewController.h

@@ -16,7 +16,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, strong) NSString *url; // webView的连接地址
 
-
 @property (nonatomic, strong) NSDictionary *parmDic; // 需要回传的参数
 
 @property (nonatomic, strong) NSString *headTitle;  // 顶部显示的title