Steven hai 1 ano
pai
achega
7fe2482772

+ 15 - 15
KulexiuForTeacher/KulexiuForTeacher/Common/Define/KSDomain.h

@@ -13,27 +13,27 @@
 //#ifdef DEBUG
 
 // 开发环境
-#define hostURL (@"https://dev.colexiu.com")
-#define SEALCLASSHOST (@"https://dev.colexiu.com/api-classroom")
-#define WEBHOST (@"https://dev.colexiu.com/teacher")
-#define SOCKET_URL (@"wss://dev.colexiu.com/audioAnalysis")
-#define JSPUSH_ENVIRONMENT (NO)
-#define RCIM_KEY (@"0vnjpoad0jbdz")
-#define SUBMIT_UUID (NO)
-#define CONFIG_TXSDKAPPID (1400805079)
-#define TXOfflinePushCertificateIDForAPNS (39559)
-
-// 测试环境
-//#define hostURL (@"https://test.colexiu.com")
-//#define SEALCLASSHOST (@"https://test.colexiu.com/api-classroom")
-//#define WEBHOST (@"https://test.colexiu.com/teacher")
-//#define SOCKET_URL (@"wss://test.colexiu.com/audioAnalysis")
+//#define hostURL (@"https://dev.colexiu.com")
+//#define SEALCLASSHOST (@"https://dev.colexiu.com/api-classroom")
+//#define WEBHOST (@"https://dev.colexiu.com/teacher")
+//#define SOCKET_URL (@"wss://dev.colexiu.com/audioAnalysis")
 //#define JSPUSH_ENVIRONMENT (NO)
 //#define RCIM_KEY (@"0vnjpoad0jbdz")
 //#define SUBMIT_UUID (NO)
 //#define CONFIG_TXSDKAPPID (1400805079)
 //#define TXOfflinePushCertificateIDForAPNS (39559)
 
+// 测试环境
+#define hostURL (@"https://test.colexiu.com")
+#define SEALCLASSHOST (@"https://test.colexiu.com/api-classroom")
+#define WEBHOST (@"https://test.colexiu.com/teacher")
+#define SOCKET_URL (@"wss://test.colexiu.com/audioAnalysis")
+#define JSPUSH_ENVIRONMENT (NO)
+#define RCIM_KEY (@"0vnjpoad0jbdz")
+#define SUBMIT_UUID (NO)
+#define CONFIG_TXSDKAPPID (1400805079)
+#define TXOfflinePushCertificateIDForAPNS (39559)
+
 // 预生产
 //#define hostURL (@"https://ponline.colexiu.com")
 //#define SEALCLASSHOST (@"https://ponline.colexiu.com/api-classroom")

+ 2 - 2
KulexiuForTeacher/KulexiuForTeacher/Common/Tools/Category/UIView+ExtensionForDotLine.m

@@ -33,8 +33,8 @@
 }
 
 - (void)removeAllSublayers {
-    for (CALayer *layer in self.layer.sublayers) {
-        [layer removeFromSuperlayer];
+    while (self.layer.sublayers.count) {
+        [self.layer.sublayers.lastObject removeFromSuperlayer];
     }
 }
 

+ 7 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Login/Controller/VefiCodeLoginController.m

@@ -85,9 +85,16 @@
     [view showViewCallback:^(NSDictionary * _Nonnull parm) {
         [self veriImageCodeWithParm:parm checkView:weakView];
     }];
+    [view cancelCheck:^{
+        [self displayKeyboard];
+    }];
     [view disPlayImageWithPhone:phoneNo];
 }
 
+- (void)displayKeyboard {
+    [self.bodyView showKeyboard];
+}
+
 // 发送短信 校验图形验证码
 - (void)veriImageCodeWithParm:(NSDictionary *)parm checkView:(VeriCheckView *)checkView {
     [LOADING_MANAGER showHUD];

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Feedback/Controller/FeedbackListViewController.m

@@ -145,7 +145,7 @@
                 FeedbackListModel *model = [[FeedbackListModel alloc] initWithDictionary:parm];
                 [self.dataArray addObject:model];
             }
-            if ([[dic ks_dictionaryValueForKey:@"data"] ks_boolValueForKey:@"next"] == NO) {
+            if (sourceArray.count < self.rows) {
                 self.isLoadMore = NO;
             }
         }

+ 4 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/View/VeriCheckView.h

@@ -10,6 +10,8 @@
 
 typedef void(^SureCallback)(NSDictionary * _Nonnull parm);
 
+typedef void(^CheckCancelCallback)(void);
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface VeriCheckView : UIView
@@ -19,6 +21,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)showViewCallback:(SureCallback)callback;
 
+- (void)cancelCheck:(CheckCancelCallback)callback;
+
 - (void)hiddView;
 
 - (void)disPlayImageWithPhone:(NSString *)phoneNo;

+ 10 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/View/VeriCheckView.m

@@ -26,6 +26,8 @@
 
 @property (nonatomic, strong) UIView *mountView;
 
+@property (nonatomic, copy) CheckCancelCallback cancelCallback;
+
 @end
 
 @implementation VeriCheckView
@@ -123,6 +125,11 @@
     [self.mountView addSubview:self];
 }
 
+- (void)cancelCheck:(CheckCancelCallback)callback {
+    if (callback) {
+        self.cancelCallback = callback;
+    }
+}
 
 - (void)tapAction:(UITapGestureRecognizer *)g {
     [self endEditing:YES];
@@ -132,6 +139,9 @@
 - (void)hiddView {
     [self endEditing:YES];
     [self removeFromSuperview];
+    if (self.cancelCallback) {
+        self.cancelCallback();
+    }
 }
 
 - (BOOL)textFieldShouldReturn:(UITextField *)textField {

+ 2 - 3
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Works/View/MineWorksOpenDisplayCell.m

@@ -53,9 +53,8 @@
 }
 
 - (void)removeColorLayer {
-    for (CALayer *layer in self.likeView.layer.sublayers) {
-        [layer removeFromSuperlayer];
-    }
+    [self.likeView.layer.sublayers makeObjectsPerformSelector:@selector(removeFromSuperlayer)];
+
 }
 
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {