diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/TVStation/TVStation.storyboard b/YouerLiveVideo/YouerLiveVideo/controllers/TVStation/TVStation.storyboard
index 08b5707..773d509 100644
--- a/YouerLiveVideo/YouerLiveVideo/controllers/TVStation/TVStation.storyboard
+++ b/YouerLiveVideo/YouerLiveVideo/controllers/TVStation/TVStation.storyboard
@@ -38,7 +38,7 @@
-
+
@@ -129,7 +129,7 @@
-
+
@@ -206,7 +206,7 @@
-
+
@@ -333,7 +333,7 @@
-
+
@@ -479,7 +479,7 @@
-
+
@@ -606,7 +606,7 @@
-
+
diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/TVStation/TVStationViewController.swift b/YouerLiveVideo/YouerLiveVideo/controllers/TVStation/TVStationViewController.swift
index 53ed77a..fbfc071 100644
--- a/YouerLiveVideo/YouerLiveVideo/controllers/TVStation/TVStationViewController.swift
+++ b/YouerLiveVideo/YouerLiveVideo/controllers/TVStation/TVStationViewController.swift
@@ -223,20 +223,20 @@ class TVStationViewControllerCollectionCell:UICollectionViewCell{
class TVStationInfor {
var f_SchoolType:String!
- var f_Id:String! //标识字段，Guid标识 ,
- var f_DeleteMark:Bool = false //删除标识，1-已删除 ,
- var f_CreatorTime:String!//创建时间 ,
- var f_CreatorUserId:String!//创建人员ID ,
- var f_LastModifyTime:String! //最近一次编辑时间 ,
- var f_LastModifyUserId:String! //最近一次编辑人员 ,
- var f_DeleteTime:String! //删除时间 ,
- var f_DeleteUserId:String! //删除人员 ,
- var f_SchoolName:String! //学校名称 ,
- var f_SchoolTypeId:String!// 学校类型 ,
- var f_Logo:String! //校徽 ,
- var f_IsTopTen:Bool = false //是否十佳校园电视台 ,
- var f_IsExcellent:Bool = false //是否优秀校园电视台 ,
- var f_Url:String!// 机构地址
+ var f_Id:String! //标识字段，Guid标识 ,
+ var f_DeleteMark:Bool = false //删除标识，1-已删除 ,
+ var f_CreatorTime:String! //创建时间 ,
+ var f_CreatorUserId:String! //创建人员ID ,
+ var f_LastModifyTime:String! //最近一次编辑时间 ,
+ var f_LastModifyUserId:String! //最近一次编辑人员 ,
+ var f_DeleteTime:String! //删除时间 ,
+ var f_DeleteUserId:String! //删除人员 ,
+ var f_SchoolName:String! //学校名称 ,
+ var f_SchoolTypeId:String! // 学校类型 ,
+ var f_Logo:String! //校徽 ,
+ var f_IsTopTen:Bool = false //是否十佳校园电视台 ,
+ var f_IsExcellent:Bool = false //是否优秀校园电视台 ,
+ var f_Url:String! // 机构地址
init(json:JSON){
f_SchoolType = json["f_SchoolType"].stringValue
@@ -269,35 +269,35 @@ class TVStationSubject {
var f_ChapterName:String!
var f_TopicName:String!
var f_TestName:String!
- var f_Id:String!// 标识字段，Guid标识 ,
- var f_DeleteMark:Bool = false // 删除标识，1-已删除 ,
- var f_CreatorTime:String!// 创建时间 ,
- var f_CreatorUserId:String!// 创建人员ID ,
- var f_LastModifyTime:String!// 最近一次编辑时间 ,
- var f_LastModifyUserId:String!//最近一次编辑人员 ,
- var f_DeleteTime:String!//删除时间 ,
- var f_DeleteUserId:String!// 删除人员 ,
- var f_Img :String!//课件图标/微课封面 ,
- var f_Title:String!//课件名称 ,
- var f_CreatorName:String!// 上传人员昵称 ,
- var f_Pv:Int!// 浏览量 ,
- var f_DownloadSum:Int!// 下载量 ,
- var f_LoveSum:Int!// 点赞量 ,
- var f_Price:Int!// 价格 ,
- var f_WaveId:String!// 所属教材ID ,
- var f_ChapterId:String!// 所属章节 ,
- var f_TopicId:String!//所属知识点 ,
- var f_TestId:String!//所属考点 ,
- var f_SchoolId:String!// 上传老师的学校ID ,
- var f_IsExamine:Int!// 审核状态：0-未审核，1-审核通过，2-审核不通过 ,
- var f_ExamineUserId :String!//审核人ID ,
- var f_ExamineName:String!//审核人姓名 ,
- var f_ExamineDatetime :String!// 审核日期 ,
- var f_ResourceType:Int!// 资源类型 0-微课 1-资源 2-电视台 ,
- var f_ResourceUrl:String!// 资源地址 ,
- var f_IsOpen:Bool = false // 是否公开 ,
- var f_Detail :String!// 资源简介 ,
- var f_TelevisionId :String!//电视台目录
+ var f_Id:String! // 标识字段，Guid标识 ,
+ var f_DeleteMark:Bool = false // 删除标识，1-已删除 ,
+ var f_CreatorTime:String! // 创建时间 ,
+ var f_CreatorUserId:String! // 创建人员ID ,
+ var f_LastModifyTime:String! // 最近一次编辑时间 ,
+ var f_LastModifyUserId:String! //最近一次编辑人员 ,
+ var f_DeleteTime:String! //删除时间 ,
+ var f_DeleteUserId:String! // 删除人员 ,
+ var f_Img :String! //课件图标/微课封面 ,
+ var f_Title:String! //课件名称 ,
+ var f_CreatorName:String! // 上传人员昵称 ,
+ var f_Pv:Int! // 浏览量 ,
+ var f_DownloadSum:Int! // 下载量 ,
+ var f_LoveSum:Int! // 点赞量 ,
+ var f_Price:Int! // 价格 ,
+ var f_WaveId:String! // 所属教材ID ,
+ var f_ChapterId:String! // 所属章节 ,
+ var f_TopicId:String! //所属知识点 ,
+ var f_TestId:String! //所属考点 ,
+ var f_SchoolId:String! // 上传老师的学校ID ,
+ var f_IsExamine:Int! // 审核状态：0-未审核，1-审核通过，2-审核不通过 ,
+ var f_ExamineUserId :String! //审核人ID ,
+ var f_ExamineName:String! //审核人姓名 ,
+ var f_ExamineDatetime :String! // 审核日期 ,
+ var f_ResourceType:Int! // 资源类型 0-微课 1-资源 2-电视台 ,
+ var f_ResourceUrl:String! // 资源地址 ,
+ var f_IsOpen:Bool = false // 是否公开 ,
+ var f_Detail :String! // 资源简介 ,
+ var f_TelevisionId :String! //电视台目录
init(json:JSON){
f_Url = json["f_Url"].stringValue
f_WaveTitle = json["f_WaveTitle"].stringValue
diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/User/HistoryViewController.swift b/YouerLiveVideo/YouerLiveVideo/controllers/User/HistoryViewController.swift
index 886f8aa..30eacbe 100644
--- a/YouerLiveVideo/YouerLiveVideo/controllers/User/HistoryViewController.swift
+++ b/YouerLiveVideo/YouerLiveVideo/controllers/User/HistoryViewController.swift
@@ -12,7 +12,7 @@ class HistoryViewController: UIViewController {
@IBOutlet weak var collectionView: UICollectionView!
- var datatSet:[TVStationSubject] = []
+ var datatSet:[HistoryView] = []
var type:Int = 0// 资源类型 0-微课 1-资源
var isHistory:Int = 0
override func viewDidLoad() {
@@ -21,7 +21,7 @@ class HistoryViewController: UIViewController {
AppDelegate.instance().httpServer.getHistroyView(parameters: ["f_ViewType":type as AnyObject,"pageIndex":1 as AnyObject]) { (str, error) in
httpJsonResule(jsonString: str, error: error, successHandler: { (json) in
for item in json.contentData()["resultData"].arrayValue{
- self.datatSet.append(TVStationSubject(json: item))
+ self.datatSet.append(HistoryView(json: item))
}
self.collectionView.reloadData()
}, failHandler: { (error) in
@@ -32,7 +32,7 @@ class HistoryViewController: UIViewController {
AppDelegate.instance().httpServer.getHistroyView(parameters: ["f_ViewType":type as AnyObject,"pageIndex":1 as AnyObject]) { (str, error) in
httpJsonResule(jsonString: str, error: error, successHandler: { (json) in
for item in json.contentData()["resultData"].arrayValue{
- self.datatSet.append(TVStationSubject(json: item))
+ self.datatSet.append(HistoryView(json: item))
}
self.collectionView.reloadData()
}, failHandler: { (error) in
@@ -103,10 +103,41 @@ class TVStationClassCell: UICollectionViewCell {
@IBOutlet weak var name: UILabel!
@IBOutlet weak var photo: UIImageView!
- var model:TVStationSubject?{
+ var model:HistoryView?{
didSet{
- name.text = model!.f_Title
+ name.text = model!.f_ViewName
photo.sd_setImage(with: URL(string:model!.f_Img), placeholderImage: #imageLiteral(resourceName: "placeholder"))
}
}
}
+
+class HistoryView{
+ var f_Img:String! // (string, optional),
+ var f_Id:String! // (string, optional): 标识字段，Guid标识 ,
+ var f_DeleteMark:Bool! // (boolean, optional): 删除标识，1-已删除 ,
+ var f_CreatorTime:String! // (string, optional): 创建时间 ,
+ var f_CreatorUserId:String! // (string, optional): 创建人员ID ,
+ var f_LastModifyTime:String! // (string, optional): 最近一次编辑时间 ,
+ var f_LastModifyUserId:String! // (string, optional): 最近一次编辑人员 ,
+ var f_DeleteTime:String! // (string, optional): 删除时间 ,
+ var f_DeleteUserId:String! // (string, optional): 删除人员 ,
+ var f_ViewType:Int! // (integer, optional): 观看类型，0-课件，1-微课，2-电视台节目 ,
+ var f_ViewId:String! // (string, optional): 对应的课件/微课/电视台节目ID ,
+ var f_ViewName:String! // (string, optional): 标题
+
+ init(json:JSON) {
+ f_Img = json["f_Img"].stringValue
+ f_Id = json["f_Id"].stringValue
+ f_DeleteMark = json["f_DeleteMark"].boolValue
+ f_CreatorTime = json["f_CreatorTime"].stringValue
+ f_CreatorUserId = json["f_CreatorUserId"].stringValue
+ f_LastModifyTime = json["f_LastModifyTime"].stringValue
+ f_LastModifyUserId = json["f_LastModifyUserId"].stringValue
+ f_DeleteTime = json["f_DeleteTime"].stringValue
+ f_DeleteUserId = json["f_DeleteUserId"].stringValue
+ f_ViewType = json["f_ViewType"].intValue
+ f_ViewId = json["f_ViewId"].stringValue
+ f_ViewName = json["f_ViewName"].stringValue
+ }
+
+}
diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/User/User.storyboard b/YouerLiveVideo/YouerLiveVideo/controllers/User/User.storyboard
index 1fc2343..91abe46 100644
--- a/YouerLiveVideo/YouerLiveVideo/controllers/User/User.storyboard
+++ b/YouerLiveVideo/YouerLiveVideo/controllers/User/User.storyboard
@@ -570,7 +570,7 @@
-
+
@@ -590,6 +590,7 @@
+
--
libgit2 0.21.0