From 59bd9f792891efa0d0d69f256e1a146c44c944db Mon Sep 17 00:00:00 2001
From: 无故事王国 <841720330@qq.com>
Date: 星期三, 24 七月 2024 09:45:41 +0800
Subject: [PATCH] fix bug
---
DolphinEnglishLearnStudent/Models/CommonModel.swift | 157 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 151 insertions(+), 6 deletions(-)
diff --git a/DolphinEnglishLearnStudent/Models/CommonModel.swift b/DolphinEnglishLearnStudent/Models/CommonModel.swift
index f9b7941..81da19e 100644
--- a/DolphinEnglishLearnStudent/Models/CommonModel.swift
+++ b/DolphinEnglishLearnStudent/Models/CommonModel.swift
@@ -91,14 +91,14 @@
var inventory: Int = 0
var isDelete: Int = 0
var name: String = ""
- var price: Int = 0
- var surplus: Int = 0
+ var price: Double = 0
+ var surplus: Int?
var total: Int = 0
var type: Int = 0
var typeIds: String = ""
var updateBy: String = ""
var updateTime: String = ""
- var userCount: Int = 0
+ var userCount: Int?
}
struct MarketTypeModel:HandyJSON,Hashable{
@@ -111,6 +111,7 @@
var good: MarketModel?
var goodTypes = [MarketTypeModel]()
var orderNumber: String = ""
+ var residueNumber:Int?
var recipient: MarketRecipientModel?
}
@@ -135,6 +136,7 @@
var updateBy: String = ""
var updateTime: String = ""
var userId: Int = 0
+ var orderId:Int = 0
}
struct AddressTreeModel:HandyJSON{
@@ -178,6 +180,7 @@
var insertTime: String = ""
var integral: Int = 0
var orderNumber: String = ""
+ var orderId:Int = 0
var state: Int = 0 //订单状态1待发货2已发货3已完成
var updateBy: String = ""
var updateTime: String = ""
@@ -195,14 +198,15 @@
struct StudyGamesRecordModel:HandyJSON{
var accuracy: Int = 0
var createBy: String = ""
- var createTime: String = ""
+ var time = ""
+// var createTime: String = ""
var disabled: Bool = false
var gameDifficulty: Int = 0
var gameId: Int = 0
var gameName: String = ""
var id: Int = 0
var updateBy: String = ""
- var updateTime: String = ""
+// var updateTime: String = ""
var userId: Int = 0
var useTime: Int = 0
}
@@ -237,14 +241,44 @@
var totalIntegral = 0
var type = 0
var week = 0
+ var canStudy = 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 TeamScheduleModel:HandyJSON{
+ var answerNumber = 0
+ var correctNumber = 0
+ var teamIds = [Int]() //题组ids
+ var topicIds = [Int]() //已回答正确的题目Id
+ var schedule = 0
+}
+
+
struct Listen1DataModel:HandyJSON{
var createBy: String = ""
var createTime: String = ""
@@ -258,9 +292,32 @@
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
+
+ //custom
+ var playNow:Bool = false //立刻播放
+
}
-class Listen1SubModel:HandyJSON{
+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() {}
@@ -277,8 +334,19 @@
var type: String = ""
var updateBy: String = ""
var updateTime: String = ""
+
+
+ //学习类型四专用
+ var isQuestion:Int = 0
+
+ //游戏类型2专用
+ var isOpen:Bool = false
+
+ // 自主学习1,3专用 (是否已回答)
+ var isAnster:Bool = false
}
+@available(*,deprecated,message: "废弃")
struct Listen4Model:HandyJSON{
var data = [Listen4DataModel]()
}
@@ -300,3 +368,80 @@
var updateTime: String = ""
var week: Int = 0
}
+
+struct StudyScheduleModel:HandyJSON,Hashable{
+ init() {}
+
+ 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
+ var gameDifficulty:Int = 0
+
+ var hashValue: Int{
+ return answer+day+computeSchedule+induction+listen+look+monthStudy+pair+todayStudy+totalStudy+week+weekStudy+gameDifficulty
+ }
+}
+
+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 = ""
+}
+
+struct ShareInfoModel:HandyJSON{
+ var title = ""
+ var phone = ""
+ var img = ""
+}
+
+struct VIPInfoModel:HandyJSON{
+ var id = 0
+ var info = ""
+ var isVip = 0
+ var time = 0
+ var amount = 0
+}
--
Gitblit v1.7.1