Steven 3 年之前
父节点
当前提交
e9dc9003d6

二进制
KulexiuForTeacher/KulexiuForTeacher.xcworkspace/xcuserdata/wangzhi.xcuserdatad/UserInterfaceState.xcuserstate


+ 73 - 9
KulexiuForTeacher/KulexiuForTeacher.xcworkspace/xcuserdata/wangzhi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -186,8 +186,8 @@
             filePath = "KulexiuForTeacher/Common/Tools/KSUploadManager.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "167"
-            endingLineNumber = "167"
+            startingLineNumber = "166"
+            endingLineNumber = "166"
             landmarkName = "-mutilUploadImage:fileName:successCallback:faliure:"
             landmarkType = "7">
          </BreakpointContent>
@@ -314,8 +314,8 @@
             filePath = "KulexiuForTeacher/Module/Home/Controller/HomeViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "251"
-            endingLineNumber = "251"
+            startingLineNumber = "249"
+            endingLineNumber = "249"
             landmarkName = "-cycleScrollView:didSelectItemAtIndex:"
             landmarkType = "7">
          </BreakpointContent>
@@ -323,16 +323,80 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "A4E5CD2B-147F-4C71-85D6-01C71191AFE0"
+            uuid = "F0003F49-A484-4565-AE50-C3F3374E00CA"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KulexiuForTeacher/Common/Base/KSBaseWKWebViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1082"
+            endingLineNumber = "1082"
+            landmarkName = "-documentPicker:didPickDocumentAtURL:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "71FA8FBF-57FD-4D5B-94AE-AB18D5ACCB52"
             shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "KulexiuForTeacher/Module/Home/Controller/HomeViewController.m"
+            filePath = "KulexiuForTeacher/Common/Base/KSBaseWKWebViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1052"
+            endingLineNumber = "1052"
+            landmarkName = "-documentPicker:didPickDocumentAtURL:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "971014A9-C061-43E3-81DA-63AF8A88A09B"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KulexiuForTeacher/Common/Base/KSBaseWKWebViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "938"
+            endingLineNumber = "938"
+            landmarkName = "-uploadImageArray:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "5C38C352-734D-4E17-9E58-6F01BA04271B"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KulexiuForTeacher/Common/Base/KSBaseWKWebViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "946"
+            endingLineNumber = "946"
+            landmarkName = "-uploadImageArray:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "58FB6DF8-7978-4C70-BAC3-A5B8F3BF24C9"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KulexiuForTeacher/Common/Base/KSBaseWKWebViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "99"
-            endingLineNumber = "99"
-            landmarkName = "-requestRecentCourse"
+            startingLineNumber = "933"
+            endingLineNumber = "933"
+            landmarkName = "-uploadImageArray:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

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

@@ -931,7 +931,7 @@ typedef NS_ENUM(NSInteger, CHOOSETYPE) {
     [[KSUploadManager shareInstance] mutilUploadImage:imageDataArray fileName:@"complainImg" successCallback:^(NSMutableArray * _Nonnull fileUrlArray) {
         [self removehub];
         NSMutableArray *urlArray = [NSMutableArray array];
-        for (NSString *url in urlArray) {
+        for (NSString *url in fileUrlArray) {
             [urlArray addObject:url];
         }
         NSString *attachments = [urlArray componentsJoinedByString:@","];
@@ -1041,6 +1041,9 @@ typedef NS_ENUM(NSInteger, CHOOSETYPE) {
     }
 }
 
+//- (void)documentPicker:(UIDocumentPickerViewController *)controller didPickDocumentsAtURLs:(NSArray<NSURL *> *)urls {
+//    NSLog(@"---");
+//}
 - (void)documentPicker:(UIDocumentPickerViewController *)controller didPickDocumentAtURL:(NSURL *)url {
     NSArray *array = [[url absoluteString] componentsSeparatedByString:@"/"];
     NSString *fileName = [array lastObject];
@@ -1064,8 +1067,8 @@ typedef NS_ENUM(NSInteger, CHOOSETYPE) {
         if (![fileName hasSuffix:@".mp3"]) {
             [self MBPShow:@"请上传mp3格式文件"];
             [self fileChooseErrorCallback];
+            return;
         }
-        return;
     }
     else {
         if (![fileName hasSuffix:@".mp3"] && ![fileName hasSuffix:@".aac"]) {

+ 1 - 0
KulexiuForTeacher/KulexiuForTeacher/Common/Define/PrefixHeader.pch

@@ -115,6 +115,7 @@ shouldPrevent = NO; \
 #define SEALCLASSHOST (@"http://dev.colexiu.com/api-im")
 #define WEBHOST (@"http://dev.colexiu.com/teacher")
 //#define WEBHOST (@"http://192.168.3.13:5002")
+#define WEBHOST (@"http://192.168.3.63:5000")
 
 #define SOCKET_URL (@"ws://mteadev.colexiu.com/audioAnalysis")
 #define JSPUSH_ENVIRONMENT (NO)

+ 0 - 2
KulexiuForTeacher/KulexiuForTeacher/Module/Home/Controller/HomeViewController.m

@@ -190,8 +190,6 @@
         make.height.mas_equalTo(kNaviBarHeight);
     }];
     
-   
-    
     [self.scrollView mas_remakeConstraints:^(MASConstraintMaker *make) {
         make.left.right.mas_equalTo(self.view);
         make.top.mas_equalTo(self.navView.mas_bottom);

+ 13 - 2
KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/HomeRecentCourseView.m

@@ -38,8 +38,19 @@
     NSDateFormatter *formatter = [NSObject getDateformatter];
     [formatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"];
     NSDate *beginDate = [formatter dateFromString:model.courseStartTime];
-    [formatter setDateFormat:@"HH:mm"];
-    self.timeLabel.text = [NSString stringWithFormat:@"今日 %@", [NSString returnNoNullStringWithString:[formatter stringFromDate:beginDate]]];
+    NSDate *currentDate = [NSDate date];
+    [formatter setDateFormat:@"yyyy-MM-dd"];
+    NSString *currentDay = [formatter stringFromDate:currentDate];
+    NSString *courseDay = [formatter stringFromDate:beginDate];
+    if ([currentDay isEqualToString:courseDay]) {
+        [formatter setDateFormat:@"HH:mm"];
+        self.timeLabel.text = [NSString stringWithFormat:@"今日 %@", [NSString returnNoNullStringWithString:[formatter stringFromDate:beginDate]]];
+    }
+    else {
+        [formatter setDateFormat:@"yyyy-MM-dd HH:mm"];
+        self.timeLabel.text = [NSString returnNoNullStringWithString:[formatter stringFromDate:beginDate]];
+    }
+    
 }
 
 - (IBAction)joinRoomAction:(id)sender {

+ 1 - 3
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/BankCard/Controller/BandCardViewController.m

@@ -134,9 +134,7 @@
             [self showResultViewSuccess:YES errorMessage:nil];
         }
         else {
-            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                [self showResultViewSuccess:NO errorMessage:MESSAGEKEY];
-            });            
+            [self showResultViewSuccess:NO errorMessage:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
         [self removehub];

+ 1 - 3
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/BankCard/Controller/UnbindCardViewController.m

@@ -65,9 +65,7 @@
             [self showResultViewSuccess:YES errorMsg:nil];
         }
         else {
-            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                [self showResultViewSuccess:NO errorMsg:MESSAGEKEY];
-            });
+            [self showResultViewSuccess:NO errorMsg:MESSAGEKEY];
         }
     } faliure:^(NSError * _Nonnull error) {
         [self removehub];

+ 3 - 3
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/BankCard/View/CardBindResultBodyView.xib

@@ -21,9 +21,9 @@
                     </constraints>
                 </imageView>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zKA-Td-gGZ">
-                    <rect key="frame" x="207" y="257" width="0.0" height="27"/>
+                    <rect key="frame" x="14" y="257" width="386" height="27"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="27" id="Le2-Me-Wou"/>
+                        <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="27" id="Le2-Me-Wou"/>
                     </constraints>
                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
                     <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
@@ -53,7 +53,7 @@
                 <constraint firstItem="zKA-Td-gGZ" firstAttribute="top" secondItem="9CR-3J-Btv" secondAttribute="bottom" constant="12" id="4fG-8H-OCt"/>
                 <constraint firstItem="9CR-3J-Btv" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="15" id="4k4-PR-oyg"/>
                 <constraint firstItem="9CR-3J-Btv" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="6df-U2-z8s"/>
-                <constraint firstItem="zKA-Td-gGZ" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="iN0-l3-epB" secondAttribute="leading" constant="14" id="BvI-yo-TEw"/>
+                <constraint firstItem="zKA-Td-gGZ" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="14" id="BvI-yo-TEw"/>
                 <constraint firstItem="9bw-58-pc5" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="WNE-iz-OyQ"/>
                 <constraint firstItem="zKA-Td-gGZ" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="Wlc-gw-FVi"/>
                 <constraint firstItem="9bw-58-pc5" firstAttribute="top" secondItem="zKA-Td-gGZ" secondAttribute="bottom" constant="14" id="ucv-NY-6GP"/>

+ 15 - 15
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/Controller/FeedbackViewController.m

@@ -39,21 +39,21 @@
 }
 
 - (void)submitWithPhone:(NSString *)phone suggestion:(NSString *)suggession {
-//    [self showhud];
-//    [KSRequestManager suggestionAddRequest:KS_POST content:suggession mobileNo:phone success:^(NSDictionary * _Nonnull dic) {
-//        [self removehub];
-//        if ([dic integerValueForKey:@"code"] == 200 && [dic boolValueForKey:@"status"]) {
-//            KSWeakSelf(weakSelf);
-//            [self KSShowMsg:@"提交成功" promptCompletion:^{
-//                [weakSelf.navigationController popViewControllerAnimated:YES];
-//            }];
-//        }
-//        else {
-//            [self MBPShow:MESSAGEKEY];
-//        }
-//    } faliure:^(NSError * _Nonnull error) {
-//        [self removehub];
-//    }];
+    [self showhud];
+    [KSNetworkingManager suggestionAddRequest:KS_POST content:suggession mobileNo:phone success:^(NSDictionary * _Nonnull dic) {
+        [self removehub];
+        if ([dic integerValueForKey:@"code"] == 200 && [dic boolValueForKey:@"status"]) {
+            KSWeakSelf(weakSelf);
+            [self KSShowMsg:@"提交成功" promptCompletion:^{
+                [weakSelf.navigationController popViewControllerAnimated:YES];
+            }];
+        }
+        else {
+            [self MBPShow:MESSAGEKEY];
+        }
+    } faliure:^(NSError * _Nonnull error) {
+        [self removehub];
+    }];
 }
 
 /*