nothing

KulexiuForStudent/KulexiuForStudent.xcodeproj/project.pbxproj

@@ -8589,7 +8589,7 @@
 					"$(PROJECT_DIR)/KulexiuForStudent/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.5/SocialLibraries/Sina/SinaSDK",
 					"$(PROJECT_DIR)/KulexiuForStudent/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.5/UMSocialSDKPlugin",
 				);
-				MARKETING_VERSION = 1.5.2;
+				MARKETING_VERSION = 1.5.1;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++17";
 				PRODUCT_BUNDLE_IDENTIFIER = com.Colexiu.KulexiuForStudent;
@@ -8668,7 +8668,7 @@
 					"$(PROJECT_DIR)/KulexiuForStudent/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.5/SocialLibraries/Sina/SinaSDK",
 					"$(PROJECT_DIR)/KulexiuForStudent/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.5/UMSocialSDKPlugin",
 				);
-				MARKETING_VERSION = 1.5.2;
+				MARKETING_VERSION = 1.5.1;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++17";
 				PRODUCT_BUNDLE_IDENTIFIER = com.Colexiu.KulexiuForStudent;

KulexiuForStudent/KulexiuForStudent/Common/Define/KSDomain.h

@@ -18,16 +18,16 @@
 
 // 测试环境
 
-#define hostURL (@"https://dev.colexiu.com")
-#define SEALCLASSHOST (@"https://dev.colexiu.com/api-classroom")
-#define WEBHOST (@"https://dev.colexiu.com/student")
-#define TENANT_WEBHOST (@"https://dev.colexiu.com/tenant")
-#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 (39557)
+//#define hostURL (@"https://dev.colexiu.com")
+//#define SEALCLASSHOST (@"https://dev.colexiu.com/api-classroom")
+//#define WEBHOST (@"https://dev.colexiu.com/student")
+//#define TENANT_WEBHOST (@"https://dev.colexiu.com/tenant")
+//#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 (39557)
 
 
 // 开发环境
@@ -56,16 +56,16 @@
 
 //#else
 
-//#define hostURL (@"https://online.colexiu.com")
-//#define SEALCLASSHOST (@"https://online.colexiu.com/api-classroom")
-//#define WEBHOST (@"https://online.colexiu.com/student")
-//#define TENANT_WEBHOST (@"https://online.colexiu.com//tenant")
-//#define SOCKET_URL (@"wss://online.colexiu.com/audioAnalysis")
-//#define JSPUSH_ENVIRONMENT (YES)
-//#define RCIM_KEY (@"e5t4ouvpe42pa")
-//#define SUBMIT_UUID (YES)
-//#define CONFIG_TXSDKAPPID (1400799837)
-//#define TXOfflinePushCertificateIDForAPNS (39560)
+#define hostURL (@"https://online.colexiu.com")
+#define SEALCLASSHOST (@"https://online.colexiu.com/api-classroom")
+#define WEBHOST (@"https://online.colexiu.com/student")
+#define TENANT_WEBHOST (@"https://online.colexiu.com//tenant")
+#define SOCKET_URL (@"wss://online.colexiu.com/audioAnalysis")
+#define JSPUSH_ENVIRONMENT (YES)
+#define RCIM_KEY (@"e5t4ouvpe42pa")
+#define SUBMIT_UUID (YES)
+#define CONFIG_TXSDKAPPID (1400799837)
+#define TXOfflinePushCertificateIDForAPNS (39560)
 
 //#endif
 

KulexiuForStudent/KulexiuForStudent/Common/Tools/Custom/PickerView/KSFullDatePicker.m

@@ -170,7 +170,7 @@ typedef NS_ENUM(NSInteger, PickViewTag) {
     }
     //最小限制
     if (!minLimitDate) {
-        self.minLimitDate = [NSDate dateWithString:@"1970-01-01 00:00" dateFormat:@"yyyy-MM-dd HH:mm"];
+        self.minLimitDate = [NSDate dateWithString:@"1900-01-01 00:00" dateFormat:@"yyyy-MM-dd HH:mm"];
     }
     else {
         self.minLimitDate = minLimitDate;
@@ -617,7 +617,7 @@ typedef NS_ENUM(NSInteger, PickViewTag) {
     // 年
     int yearInt = [[NSDate date] getYear];
     [self.yearArray removeAllObjects];
-    for (int i = yearInt - 99; i <= yearInt + 99; i++) {
+    for (int i = 1900; i <= 2099; i++) {
         [self.yearArray addObject:[NSString stringWithFormat:@"%d", i]];
     }
     
@@ -715,10 +715,21 @@ typedef NS_ENUM(NSInteger, PickViewTag) {
 
 - (NSInteger)getYearRow:(NSInteger)year {
     NSInteger index = [self.yearArray indexOfObject:[NSString stringWithFormat:@"%zd",year]];
-    if (index > 0) {
+    if (index == NSNotFound) {
+        NSDate *currentDate = [NSDate date];
+        NSInteger currentYear = [currentDate getYear];
+        NSInteger newIndex;
+        newIndex = [self.yearArray indexOfObject:[NSString stringWithFormat:@"%zd",currentYear]];
+        if (newIndex == NSNotFound) {
+            return [self.yearArray count]-100;
+        }
+        else {
+            return newIndex;
+        }
+    }
+    else {
         return index;
     }
-    return [self.yearArray count]-100;
 }
 
 #pragma mark -pickerViewDelegate