Steven 2 years ago
parent
commit
707cf3c9f7

+ 30 - 30
KulexiuForStudent/KulexiuForStudent.xcodeproj/project.pbxproj

@@ -806,7 +806,6 @@
 		BCC583BE28A9EC6400BAB4CF /* cloud_animation_24.png in Resources */ = {isa = PBXBuildFile; fileRef = BCC5839F28A9EC6400BAB4CF /* cloud_animation_24.png */; };
 		BCC583BF28A9EC6400BAB4CF /* cloud_animation_18.png in Resources */ = {isa = PBXBuildFile; fileRef = BCC583A028A9EC6400BAB4CF /* cloud_animation_18.png */; };
 		BCC583C028A9EC6400BAB4CF /* cloud_animation_15.png in Resources */ = {isa = PBXBuildFile; fileRef = BCC583A128A9EC6400BAB4CF /* cloud_animation_15.png */; };
-		BCC583C128A9EC6400BAB4CF /* cloud_animation_29.png in Resources */ = {isa = PBXBuildFile; fileRef = BCC583A228A9EC6400BAB4CF /* cloud_animation_29.png */; };
 		BCC583C228A9EC6400BAB4CF /* cloud_animation_28.png in Resources */ = {isa = PBXBuildFile; fileRef = BCC583A328A9EC6400BAB4CF /* cloud_animation_28.png */; };
 		BCC583C328A9EC6400BAB4CF /* cloud_animation_14.png in Resources */ = {isa = PBXBuildFile; fileRef = BCC583A428A9EC6400BAB4CF /* cloud_animation_14.png */; };
 		BCC583C428A9EC6400BAB4CF /* cloud_animation_16.png in Resources */ = {isa = PBXBuildFile; fileRef = BCC583A528A9EC6400BAB4CF /* cloud_animation_16.png */; };
@@ -824,6 +823,7 @@
 		BCC583D028A9EC6400BAB4CF /* cloud_animation_3.png in Resources */ = {isa = PBXBuildFile; fileRef = BCC583B128A9EC6400BAB4CF /* cloud_animation_3.png */; };
 		BCC583D128A9EC6400BAB4CF /* cloud_animation_2.png in Resources */ = {isa = PBXBuildFile; fileRef = BCC583B228A9EC6400BAB4CF /* cloud_animation_2.png */; };
 		BCC583D228A9EC6400BAB4CF /* cloud_animation.json in Resources */ = {isa = PBXBuildFile; fileRef = BCC583B328A9EC6400BAB4CF /* cloud_animation.json */; };
+		BCC5841E28AA545B00BAB4CF /* icloud_animation_29.png in Resources */ = {isa = PBXBuildFile; fileRef = BCC5841D28AA545B00BAB4CF /* icloud_animation_29.png */; };
 		BCD457A1286313D70010B493 /* NotiferNavView.m in Sources */ = {isa = PBXBuildFile; fileRef = BCD4579E286313D70010B493 /* NotiferNavView.m */; };
 		BCD457A2286313D70010B493 /* NotiferNavView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BCD457A0286313D70010B493 /* NotiferNavView.xib */; };
 		BCD457AB286469600010B493 /* PublicNoticeView.m in Sources */ = {isa = PBXBuildFile; fileRef = BCD457A92864695F0010B493 /* PublicNoticeView.m */; };
@@ -2256,7 +2256,6 @@
 		BCC5839F28A9EC6400BAB4CF /* cloud_animation_24.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = cloud_animation_24.png; sourceTree = "<group>"; };
 		BCC583A028A9EC6400BAB4CF /* cloud_animation_18.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = cloud_animation_18.png; sourceTree = "<group>"; };
 		BCC583A128A9EC6400BAB4CF /* cloud_animation_15.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = cloud_animation_15.png; sourceTree = "<group>"; };
-		BCC583A228A9EC6400BAB4CF /* cloud_animation_29.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = cloud_animation_29.png; sourceTree = "<group>"; };
 		BCC583A328A9EC6400BAB4CF /* cloud_animation_28.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = cloud_animation_28.png; sourceTree = "<group>"; };
 		BCC583A428A9EC6400BAB4CF /* cloud_animation_14.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = cloud_animation_14.png; sourceTree = "<group>"; };
 		BCC583A528A9EC6400BAB4CF /* cloud_animation_16.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = cloud_animation_16.png; sourceTree = "<group>"; };
@@ -2274,6 +2273,7 @@
 		BCC583B128A9EC6400BAB4CF /* cloud_animation_3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = cloud_animation_3.png; sourceTree = "<group>"; };
 		BCC583B228A9EC6400BAB4CF /* cloud_animation_2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = cloud_animation_2.png; sourceTree = "<group>"; };
 		BCC583B328A9EC6400BAB4CF /* cloud_animation.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = cloud_animation.json; sourceTree = "<group>"; };
+		BCC5841D28AA545B00BAB4CF /* icloud_animation_29.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icloud_animation_29.png; sourceTree = "<group>"; };
 		BCD4579E286313D70010B493 /* NotiferNavView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NotiferNavView.m; sourceTree = "<group>"; };
 		BCD4579F286313D70010B493 /* NotiferNavView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NotiferNavView.h; sourceTree = "<group>"; };
 		BCD457A0286313D70010B493 /* NotiferNavView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NotiferNavView.xib; sourceTree = "<group>"; };
@@ -5505,36 +5505,36 @@
 		BCC5839428A9EC6400BAB4CF /* images */ = {
 			isa = PBXGroup;
 			children = (
-				BCC5839528A9EC6400BAB4CF /* cloud_animation_9.png */,
+				BCC583AF28A9EC6400BAB4CF /* cloud_animation_0.png */,
+				BCC583B028A9EC6400BAB4CF /* cloud_animation_1.png */,
+				BCC583B228A9EC6400BAB4CF /* cloud_animation_2.png */,
+				BCC583B128A9EC6400BAB4CF /* cloud_animation_3.png */,
+				BCC583AE28A9EC6400BAB4CF /* cloud_animation_4.png */,
+				BCC583AD28A9EC6400BAB4CF /* cloud_animation_5.png */,
+				BCC583AB28A9EC6400BAB4CF /* cloud_animation_6.png */,
+				BCC583AC28A9EC6400BAB4CF /* cloud_animation_7.png */,
 				BCC5839628A9EC6400BAB4CF /* cloud_animation_8.png */,
+				BCC5839528A9EC6400BAB4CF /* cloud_animation_9.png */,
+				BCC583A928A9EC6400BAB4CF /* cloud_animation_10.png */,
+				BCC583AA28A9EC6400BAB4CF /* cloud_animation_11.png */,
+				BCC583A828A9EC6400BAB4CF /* cloud_animation_12.png */,
+				BCC583A728A9EC6400BAB4CF /* cloud_animation_13.png */,
+				BCC583A428A9EC6400BAB4CF /* cloud_animation_14.png */,
+				BCC583A128A9EC6400BAB4CF /* cloud_animation_15.png */,
+				BCC583A528A9EC6400BAB4CF /* cloud_animation_16.png */,
+				BCC583A628A9EC6400BAB4CF /* cloud_animation_17.png */,
+				BCC583A028A9EC6400BAB4CF /* cloud_animation_18.png */,
+				BCC5839D28A9EC6400BAB4CF /* cloud_animation_19.png */,
 				BCC5839728A9EC6400BAB4CF /* cloud_animation_20.png */,
 				BCC5839828A9EC6400BAB4CF /* cloud_animation_21.png */,
-				BCC5839928A9EC6400BAB4CF /* cloud_animation_23.png */,
 				BCC5839A28A9EC6400BAB4CF /* cloud_animation_22.png */,
+				BCC5839928A9EC6400BAB4CF /* cloud_animation_23.png */,
+				BCC5839F28A9EC6400BAB4CF /* cloud_animation_24.png */,
+				BCC5839E28A9EC6400BAB4CF /* cloud_animation_25.png */,
 				BCC5839B28A9EC6400BAB4CF /* cloud_animation_26.png */,
 				BCC5839C28A9EC6400BAB4CF /* cloud_animation_27.png */,
-				BCC5839D28A9EC6400BAB4CF /* cloud_animation_19.png */,
-				BCC5839E28A9EC6400BAB4CF /* cloud_animation_25.png */,
-				BCC5839F28A9EC6400BAB4CF /* cloud_animation_24.png */,
-				BCC583A028A9EC6400BAB4CF /* cloud_animation_18.png */,
-				BCC583A128A9EC6400BAB4CF /* cloud_animation_15.png */,
-				BCC583A228A9EC6400BAB4CF /* cloud_animation_29.png */,
 				BCC583A328A9EC6400BAB4CF /* cloud_animation_28.png */,
-				BCC583A428A9EC6400BAB4CF /* cloud_animation_14.png */,
-				BCC583A528A9EC6400BAB4CF /* cloud_animation_16.png */,
-				BCC583A628A9EC6400BAB4CF /* cloud_animation_17.png */,
-				BCC583A728A9EC6400BAB4CF /* cloud_animation_13.png */,
-				BCC583A828A9EC6400BAB4CF /* cloud_animation_12.png */,
-				BCC583A928A9EC6400BAB4CF /* cloud_animation_10.png */,
-				BCC583AA28A9EC6400BAB4CF /* cloud_animation_11.png */,
-				BCC583AB28A9EC6400BAB4CF /* cloud_animation_6.png */,
-				BCC583AC28A9EC6400BAB4CF /* cloud_animation_7.png */,
-				BCC583AD28A9EC6400BAB4CF /* cloud_animation_5.png */,
-				BCC583AE28A9EC6400BAB4CF /* cloud_animation_4.png */,
-				BCC583AF28A9EC6400BAB4CF /* cloud_animation_0.png */,
-				BCC583B028A9EC6400BAB4CF /* cloud_animation_1.png */,
-				BCC583B128A9EC6400BAB4CF /* cloud_animation_3.png */,
-				BCC583B228A9EC6400BAB4CF /* cloud_animation_2.png */,
+				BCC5841D28AA545B00BAB4CF /* icloud_animation_29.png */,
 			);
 			path = images;
 			sourceTree = "<group>";
@@ -5742,6 +5742,7 @@
 				BC71D267288804CD0010F14B /* img_42.png in Resources */,
 				BC71D27A288804CD0010F14B /* img_35.png in Resources */,
 				BC71D25A288804CD0010F14B /* img_46.png in Resources */,
+				BCC5841E28AA545B00BAB4CF /* icloud_animation_29.png in Resources */,
 				BCBFDF5228115DA40052AFE5 /* HomeIntroduceView.xib in Resources */,
 				BC71D277288804CD0010F14B /* img_36.png in Resources */,
 				BC71D250288804CD0010F14B /* img_6.png in Resources */,
@@ -5807,7 +5808,6 @@
 				BCB6355927F6D2A300ACFDCF /* class_stop.mp3 in Resources */,
 				BC71D274288804CD0010F14B /* img_37.png in Resources */,
 				BC6744E32892795500BB8D03 /* Boat_Loader.json in Resources */,
-				BCC583C128A9EC6400BAB4CF /* cloud_animation_29.png in Resources */,
 				BCFE53E82812765600AD6786 /* HomeHotAlbumCell.xib in Resources */,
 				BC40BA0428117B0A00DEC0D1 /* HomeBannerCell.xib in Resources */,
 				BC119239280ED98E00A716F7 /* AccompanyCourseCell.xib in Resources */,
@@ -6805,7 +6805,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForStudent/KulexiuForStudent.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.1.2;
+				CURRENT_PROJECT_VERSION = 1.3.0;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -6860,7 +6860,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.2.0;
+				MARKETING_VERSION = 1.3.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.Colexiu.KulexiuForStudent;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -6876,7 +6876,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForStudent/KulexiuForStudent.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.1.2;
+				CURRENT_PROJECT_VERSION = 1.3.0;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -6931,7 +6931,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.2.0;
+				MARKETING_VERSION = 1.3.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.Colexiu.KulexiuForStudent;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;

BIN
KulexiuForStudent/KulexiuForStudent.xcworkspace/xcuserdata/wangzhi.xcuserdatad/UserInterfaceState.xcuserstate


+ 3 - 4
KulexiuForStudent/KulexiuForStudent/Common/Base/AccompanyLoadingView.xib

@@ -17,10 +17,11 @@
                     <rect key="frame" x="0.0" y="0.0" width="699" height="340"/>
                 </imageView>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Gn9-HQ-HPj">
-                    <rect key="frame" x="81" y="0.0" width="537" height="340"/>
+                    <rect key="frame" x="199.5" y="70" width="300" height="200"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
-                        <constraint firstAttribute="width" secondItem="Gn9-HQ-HPj" secondAttribute="height" multiplier="865:548" id="nMf-gF-jkz"/>
+                        <constraint firstAttribute="width" constant="300" id="PRt-J4-ryA"/>
+                        <constraint firstAttribute="width" secondItem="Gn9-HQ-HPj" secondAttribute="height" multiplier="3:2" id="nMf-gF-jkz"/>
                     </constraints>
                 </view>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="小酷正在努力加载,请稍等..." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Bjn-zM-LJW">
@@ -55,14 +56,12 @@
                 <constraint firstItem="Gn9-HQ-HPj" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" id="QuP-sd-KI7"/>
                 <constraint firstItem="1Vl-Vy-gg3" firstAttribute="centerY" secondItem="ncV-eS-8Yx" secondAttribute="centerY" id="TSR-47-coa"/>
                 <constraint firstAttribute="bottom" secondItem="Bjn-zM-LJW" secondAttribute="bottom" constant="30" id="YAP-rE-Kfk"/>
-                <constraint firstItem="Gn9-HQ-HPj" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="YeD-2h-0IN"/>
                 <constraint firstItem="1Vl-Vy-gg3" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="Z4M-rM-8kS"/>
                 <constraint firstItem="ZV3-qJ-uxE" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="beT-6f-OTP"/>
                 <constraint firstAttribute="bottom" secondItem="ZV3-qJ-uxE" secondAttribute="bottom" id="hv4-uE-orY"/>
                 <constraint firstItem="ncV-eS-8Yx" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="22" id="ioX-pe-BBS"/>
                 <constraint firstItem="Gn9-HQ-HPj" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="jNQ-KE-15G"/>
                 <constraint firstItem="ncV-eS-8Yx" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="17" id="lw2-0g-sel"/>
-                <constraint firstAttribute="bottom" secondItem="Gn9-HQ-HPj" secondAttribute="bottom" id="mmb-Wl-p7o"/>
                 <constraint firstItem="Bjn-zM-LJW" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="qjV-MX-C2L"/>
             </constraints>
             <nil key="simulatedTopBarMetrics"/>

File diff suppressed because it is too large
+ 0 - 0
KulexiuForStudent/KulexiuForStudent/Common/CloudLoadingSource/cloud_animation.json


+ 0 - 0
KulexiuForStudent/KulexiuForStudent/Common/CloudLoadingSource/images/cloud_animation_29.png → KulexiuForStudent/KulexiuForStudent/Common/CloudLoadingSource/images/icloud_animation_29.png


+ 14 - 14
KulexiuForStudent/KulexiuForStudent/Common/Define/PrefixHeader.pch

@@ -117,24 +117,24 @@ shouldPrevent = NO; \
 
 //#ifdef DEBUG
 
-#define hostURL (@"https://dev.colexiu.com")
-#define SEALCLASSHOST (@"https://dev.colexiu.com/api-classroom")
-#define WEBHOST (@"https://dev.colexiu.com/student")
-#define SOCKET_URL (@"wss://dev.colexiu.com/audioAnalysis")
-#define JSPUSH_ENVIRONMENT (NO)
-#define RCIM_KEY (@"0vnjpoad0jbdz")
-#define SUBMIT_UUID (YES)
+//#define hostURL (@"https://dev.colexiu.com")
+//#define SEALCLASSHOST (@"https://dev.colexiu.com/api-classroom")
+//#define WEBHOST (@"https://dev.colexiu.com/student")
+//#define SOCKET_URL (@"wss://dev.colexiu.com/audioAnalysis")
+//#define JSPUSH_ENVIRONMENT (NO)
+//#define RCIM_KEY (@"0vnjpoad0jbdz")
+//#define SUBMIT_UUID (YES)
 
 
 //#else
 
-//#define hostURL (@"https://online.colexiu.com")
-//#define SEALCLASSHOST (@"https://online.colexiu.com/api-classroom")
-//#define WEBHOST (@"https://online.colexiu.com/student")
-//#define SOCKET_URL (@"wss://online.colexiu.com/audioAnalysis")
-//#define JSPUSH_ENVIRONMENT (YES)
-//#define RCIM_KEY (@"e5t4ouvpe42pa")
-//#define SUBMIT_UUID (YES)
+#define hostURL (@"https://online.colexiu.com")
+#define SEALCLASSHOST (@"https://online.colexiu.com/api-classroom")
+#define WEBHOST (@"https://online.colexiu.com/student")
+#define SOCKET_URL (@"wss://online.colexiu.com/audioAnalysis")
+#define JSPUSH_ENVIRONMENT (YES)
+#define RCIM_KEY (@"e5t4ouvpe42pa")
+#define SUBMIT_UUID (YES)
 
 //#endif
 

Some files were not shown because too many files changed in this diff