ios/DolphinEnglishStudent.git

			@@ -173,14 +173,17 @@
			var expressNumber: String = ""
			var expressTime: String = ""
			var goodsId: Int = 0
			var goodsName: String = ""
			var id: Int = 0
			var insertTime: String = ""
			var integral: Int = 0
			var orderNumber: String = ""
			var state: Int = 0
			var state: Int = 0 //订单状态1待发货2已发货3已完成
			var updateBy: String = ""
			var updateTime: String = ""
			var userId: Int = 0
			var goodsType = [String]()
			var coverImg:String = ""
			}

			struct StudyGamesModel:HandyJSON{
			@@ -191,23 +194,23 @@

			struct StudyGamesRecordModel:HandyJSON{
			var accuracy: Int = 0
			var createBy: String?
			var createTime: String?
			var createBy: String = ""
			var createTime: String = ""
			var disabled: Bool = false
			var gameDifficulty: Int = 0
			var gameId: Int = 0
			var gameName: String?
			var gameName: String = ""
			var id: Int = 0
			var updateBy: String?
			var updateTime: String?
			var updateBy: String = ""
			var updateTime: String = ""
			var userId: Int = 0
			var useTime: Int = 0
			}

			struct StudyDataRecordModel:HandyJSON{
			var answer: Int = 0
			var createBy: String?
			var createTime: String?
			var createBy: String = ""
			var createTime: String = ""
			var day: Int = 0
			var disabled: Bool = false
			var id: Int = 0
			@@ -219,8 +222,8 @@
			var surplus: Int = 0
			var todayStudy: Int = 0
			var totalStudy: Int = 0
			var updateBy: String?
			var updateTime: String?
			var updateBy: String = ""
			var updateTime: String = ""
			var userId: Int = 0
			var week: Int = 0
			var weekStudy: Int = 0
			@@ -235,3 +238,168 @@
			var type = 0
			var week = 0
			}

			class ListenNewModel:HandyJSON{
			var data:ListenNewDataModel?
			var subjectList = [[Listen1SubModel]]()

			required init(){}
			}

			class ListenNewDataModel:HandyJSON{
			var id:String = ""
			var integral = 0

			required init(){}
			}

			class Listen1Model:HandyJSON{
			var data:Listen1DataModel?
			var subjectList = [Listen1SubModel]()
			var storyList = [Listen1SubModel]()

			//超级记忆专用
			var photoList = [SimpleListenDataModel]()
			var voiceList = [SimpleListenDataModel]()

			required init(){}
			}
			struct Listen1DataModel:HandyJSON{
			var createBy: String = ""
			var createTime: String = ""
			var day: Int = 0
			var disabled: Bool = false
			var id: Int = 0
			var integral: Int = 0
			var isVip: Int = 0
			var studyId: Int = 0
			var subject: String = ""
			var updateBy: String = ""
			var updateTime: String = ""
			var week: Int = 0
			var answerCount = 0
			var answerIntegral = 0
			var answerTime = 0
			var time = 0
			var count = 0
			var lookIntegral = 0

			}

			class Listen1SubModel:HandyJSON,Hashable{

			static func == (lhs: Listen1SubModel, rhs: Listen1SubModel) -> Bool {
			return lhs.id == rhs.id
			}

			// var hashValue: Int{
			// return id
			// }

			func hash(into hasher: inout Hasher) {

			}


			required init() {}

			var correct: String = ""
			var createBy: String = ""
			var createTime: String = ""
			var disabled: Bool = false
			var english: String = ""
			var error: String = ""
			var id: Int = 0
			var img: String = ""
			var name: String = ""
			var state: Int = 0
			var type: String = ""
			var updateBy: String = ""
			var updateTime: String = ""


			//学习类型四专用
			var isQuestion:Int = 0

			//游戏类型2专用
			var isOpen:Bool = false
			}

			@available(*,deprecated,message: "废弃")
			struct Listen4Model:HandyJSON{
			var data = [Listen4DataModel]()
			}

			struct Listen4DataModel:HandyJSON{
			var answerSubject: Int = 0
			var createBy: String = ""
			var createTime: String = ""
			var day: Int = 0
			var disabled: Bool = false
			var id: Int = 0
			var integral: Int = 0
			var isAnswer: Int = 0
			var isVip: Int = 0
			var studyId: Int = 0
			var subject: Int = 0
			var subjectList = [Listen1SubModel]()
			var updateBy: String = ""
			var updateTime: String = ""
			var week: Int = 0
			}

			struct StudyScheduleModel:HandyJSON{
			var answer: Int = 0
			var day: Int = 0
			var computeSchedule:Int = 0
			var id: Int = 0
			var induction: Int = 0
			var listen: Int = 0
			var look: Int = 0
			var monthStudy: Int = 0
			var pair: Int = 0
			var surplus: String = ""
			var todayStudy: Int = 0
			var totalStudy: Int = 0
			var userId: Int = 0
			var week: Int = 0
			var weekStudy: Int = 0
			}

			class SimpleListenDataModel:HandyJSON,Hashable{

			required init() {}

			static func == (lhs: SimpleListenDataModel, rhs: SimpleListenDataModel) -> Bool {
			return lhs.id == rhs.id
			}

			func hash(into hasher: inout Hasher) {

			}

			var id = 0
			var photo = ""
			var voice = ""

			//游戏类型2专用
			var isOpen:Bool = false
			var type = 0 // 1:图片 2:音频
			}

			struct PromptVoiceModel:HandyJSON{
			var correct: String = ""
			var createBy: String = ""
			var createTime: String = ""
			var disabled: Bool = false
			var error: String = ""
			var id: Int = 0
			var img: String = ""
			var integral: String = ""
			var integralShare: String = ""
			var phone: String = ""
			var time: String = ""
			var title: String = ""
			var updateBy: String = ""
			var updateTime: String = ""
			}