Merge branch 'teach_video' into develop-tx-618

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/VM/YHGCPreviewViewModel.swift

@@ -554,7 +554,7 @@ private extension YHGCPreviewViewModel {
         
         do {
             // 主申请人
-            let title = model0.qla_correct == 1 ? "是" : "否"
+            let title = model0.is_name_same == true ? "是" : "否"
             let tmp0 = YHPreviewQuestionAndAnswerModel(question: "1、您的所有学历及资格证书的姓名及出生日期，是否与身份证完全一致？（例如：身份证上是【张四】，学位证上是【张三】，则为不同", answer: title)
             
 //            let title2 = model0.edu_correct == 1 ? "是" : "否"
@@ -1293,7 +1293,7 @@ private extension YHGCPreviewViewModel {
                     }
                 }
                 let tmp7 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: str.defaultStringIfEmpty())
-                let model1 = YHPersonInfoCellModel1(cellTitle: "港澳通行证", cellData: [tmp4, tmp5, tmp6, tmp7])
+                let model1 = YHPersonInfoCellModel1(cellTitle: "中国身份证", cellData: [tmp4, tmp5, tmp6, tmp7])
                 cerInfoArr.append(model1)
             }
             
@@ -1627,7 +1627,7 @@ private extension YHGCPreviewViewModel {
                     }
                 }
                 let tmp7 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: str.defaultStringIfEmpty())
-                let model1 = YHPersonInfoCellModel1(cellTitle: "港澳通行证", cellData: [tmp4, tmp5, tmp6, tmp7])
+                let model1 = YHPersonInfoCellModel1(cellTitle: "中国身份证", cellData: [tmp4, tmp5, tmp6, tmp7])
                 cerInfoArr.append(model1)
             }
             

galaxy/galaxy/Classes/Modules/Login(登录)/VM/YHLoginViewModel.swift

@@ -24,8 +24,10 @@ class YHUserMemberInfoModel: SmartCodable {
     var current_level: Int = 0
     var growth_value: Int = 0
     var max_growth: Int = 0
+    var has_education_video_permission: Bool = false
     
     required init() {
+        
     }
     
     func getVipMemberLevel() -> YHUserVipLevel {

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyNewViewController.swift

@@ -260,6 +260,11 @@ class YHMyNewViewController: YHBaseViewController {
             serviceGroupArr.append(item)
         }
         
+        if self.loginViewModel.memberInfo.has_education_video_permission {
+            let item = PersonalModuleItem(icon: "mine_item_video", title: "我的课程".local, type: .myCourseVideo)
+            serviceGroupArr.append(item)
+        }
+        
         // 其他功能
         do {
             let item = PersonalModuleItem(icon: "mine_item_msg", title: "我的消息".local, type: .myMessage)
@@ -414,6 +419,8 @@ extension YHMyNewViewController {
                 let memberInfo = self.loginViewModel.memberInfo
                 self.userInfoView.vipLevel = memberInfo.getVipMemberLevel()
                 self.vipInfoView.update(growValue: memberInfo.growth_value, vipLevel: memberInfo.getVipMemberLevel())
+                self.loadItems()
+                
             }
         } else {
             self.userInfoView.vipLevel = .none
@@ -713,7 +720,32 @@ extension YHMyNewViewController {
             UIViewController.current?.tabBarController?.selectedIndex = 1
         case .inviteFriends:
             inviteFriends()
-            
+        case .myCourseVideo:
+            if let token = YHLoginManager.shared.userModel?.token, token.count > 5 {
+                var url = YHBaseUrlManager.shared.supportH5URL() + "articleDetail.html#/video-list"
+                url = url + "?param=" + YHLoginManager.shared.h5Token
+                printLog("URL: \(url)")
+                var tUrl = url
+                if !url.contains("navigationH=") {
+                    tUrl = url + "?navigationH=\(k_Height_NavigationtBarAndStatuBar)"
+                    if url.contains("?") {
+                        tUrl = url + "&navigationH=\(k_Height_NavigationtBarAndStatuBar)"
+                    }
+                }
+                if !url.contains("statusBarH=") {
+                    tUrl = url + "?statusBarH=\(k_Height_StatusBar)"
+                    if url.contains("?") {
+                        tUrl = url + "&statusBarH=\(k_Height_StatusBar)"
+                    }
+                }
+                let vc = YHH5WebViewVC()
+                vc.url = tUrl
+                vc.isFullScreenFlag = false
+                vc.navTitle = "我的课程"
+                vc.isSupportWebviewInterBackFlag = true
+                UIViewController.current?.navigationController?.pushViewController(vc)
+                
+            }
         default:
             printLog("不需要响应")
         }

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift

@@ -22,6 +22,7 @@ enum YHPersonalModuleItemType: Int {
     case myTestCode
     case appointGalaxyBay
     case exchangeHistory
+    case myCourseVideo
     
     case notifySettings
     case permissionSettings

galaxy/galaxy/Res/Assets.xcassets/Mine/mine_item_video.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "icon_我的课程@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "icon_我的课程@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}