Browse Source

版本更新下载地址增加后端返回地址,优先取接口返回地址。

Steven 2 months ago
parent
commit
e9d241a979

+ 0 - 3
KulexiuForTeacher/KulexiuForTeacher.xcodeproj/project.pbxproj

@@ -886,7 +886,6 @@
 		BCA353E52859797500377661 /* MusicRoomStudentCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = BCA353E32859797400377661 /* MusicRoomStudentCell.xib */; };
 		BCA353E92859A6FB00377661 /* MusicRoomHomeworkCell.m in Sources */ = {isa = PBXBuildFile; fileRef = BCA353E72859A6FA00377661 /* MusicRoomHomeworkCell.m */; };
 		BCA353EA2859A6FB00377661 /* MusicRoomHomeworkCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = BCA353E82859A6FA00377661 /* MusicRoomHomeworkCell.xib */; };
-		BCA353ED2859B4EC00377661 /* MusicRoomHomeworkStudentController.m in Sources */ = {isa = PBXBuildFile; fileRef = BCA353EC2859B4EC00377661 /* MusicRoomHomeworkStudentController.m */; };
 		BCA409F52D1D269700A387F1 /* HomeStatisticsView.m in Sources */ = {isa = PBXBuildFile; fileRef = BCA409F42D1D269700A387F1 /* HomeStatisticsView.m */; };
 		BCA409F92D1D2A5D00A387F1 /* HomeNewAlbumView.m in Sources */ = {isa = PBXBuildFile; fileRef = BCA409F82D1D2A5D00A387F1 /* HomeNewAlbumView.m */; };
 		BCA409FB2D1D2A6600A387F1 /* HomeNewAlbumView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BCA409FA2D1D2A6600A387F1 /* HomeNewAlbumView.xib */; };
@@ -2693,8 +2692,6 @@
 		BCA353E62859A6FA00377661 /* MusicRoomHomeworkCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MusicRoomHomeworkCell.h; sourceTree = "<group>"; };
 		BCA353E72859A6FA00377661 /* MusicRoomHomeworkCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MusicRoomHomeworkCell.m; sourceTree = "<group>"; };
 		BCA353E82859A6FA00377661 /* MusicRoomHomeworkCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MusicRoomHomeworkCell.xib; sourceTree = "<group>"; };
-		BCA353EB2859B4EC00377661 /* MusicRoomHomeworkStudentController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MusicRoomHomeworkStudentController.h; sourceTree = "<group>"; };
-		BCA353EC2859B4EC00377661 /* MusicRoomHomeworkStudentController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MusicRoomHomeworkStudentController.m; sourceTree = "<group>"; };
 		BCA409F32D1D269700A387F1 /* HomeStatisticsView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HomeStatisticsView.h; sourceTree = "<group>"; };
 		BCA409F42D1D269700A387F1 /* HomeStatisticsView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HomeStatisticsView.m; sourceTree = "<group>"; };
 		BCA409F72D1D2A5D00A387F1 /* HomeNewAlbumView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HomeNewAlbumView.h; sourceTree = "<group>"; };

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

@@ -53,7 +53,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "TEST"
+      buildConfiguration = "DEV"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

+ 7 - 2
KulexiuForTeacher/KulexiuForTeacher/AppDelegate.m

@@ -246,14 +246,19 @@
                         if ([serviceVersion isEqualToString:storeVersion] || [self isLowerVersionCompareLocalVersion:currentVersion serviceVersion:serviceVersion]) {
                             // desc
                             NSString *descMessage = [[dic ks_dictionaryValueForKey:@"data"] ks_stringValueForKey:@"description"];
+                            NSString *downloadUrl = [[dic ks_dictionaryValueForKey:@"data"] ks_stringValueForKey:@"downloadUrl"];
+                            // 如果没有配置
+                            if ([NSString isEmptyString:downloadUrl]) {
+                                downloadUrl = openUrl;
+                            }
                             // 判断
                             if ([[dic ks_dictionaryValueForKey:@"data"] ks_boolValueForKey:@"isForceUpdate"]) {
                                 self.isNeedUpdate = YES;
-                                [self showAlertWithMemo:storeVersion descMessage:descMessage isforce:YES openUrl:openUrl];
+                                [self showAlertWithMemo:storeVersion descMessage:descMessage isforce:YES openUrl:downloadUrl];
                             }
                             else {
                                 self.isNeedUpdate = NO;
-                                [self showAlertWithMemo:storeVersion descMessage:descMessage isforce:NO openUrl:openUrl];
+                                [self showAlertWithMemo:storeVersion descMessage:descMessage isforce:NO openUrl:downloadUrl];
                             }
                         }