Commit 45213823 authored by ljh's avatar ljh

更换工作中心的存储方式

parent 5d2fd070
...@@ -10,7 +10,7 @@ import Foundation ...@@ -10,7 +10,7 @@ import Foundation
import Alamofire import Alamofire
import SwiftyJSON import SwiftyJSON
import ObjectMapper import ObjectMapper
import RealmSwift
import UIKit import UIKit
private let NetworkRequestShareInstance = NetworkRequest() private let NetworkRequestShareInstance = NetworkRequest()
...@@ -126,10 +126,8 @@ extension NetworkRequest { ...@@ -126,10 +126,8 @@ extension NetworkRequest {
HUD.flash(.label(json["message"].stringValue), delay: 1.5) HUD.flash(.label(json["message"].stringValue), delay: 1.5)
failture(DogError.DataInvalidError) failture(DogError.DataInvalidError)
delay(1.5) { delay(1.5) {
let realm = try! Realm() UserDefaults.standard.removeObject(forKey: "WorkDataModel")
try! realm.write {
realm.deleteAll()
}
UserDefaults.standard.removeObject(forKey: "user_token") UserDefaults.standard.removeObject(forKey: "user_token")
NotificationCenter.default.post(name: Notification.Name(rawValue: "logout"), object: nil) NotificationCenter.default.post(name: Notification.Name(rawValue: "logout"), object: nil)
JPUSHService.deleteAlias({ (resCode, alias, num) in JPUSHService.deleteAlias({ (resCode, alias, num) in
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
// //
import UIKit import UIKit
import RealmSwift
import IQKeyboardManagerSwift import IQKeyboardManagerSwift
import SwiftDate import SwiftDate
...@@ -60,7 +59,7 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD ...@@ -60,7 +59,7 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
}) })
} }
browser.show() browser.show()
} }
//MARK:--头部按钮方法 //MARK:--头部按钮方法
let selectV = WorkSelectTimeView() let selectV = WorkSelectTimeView()
...@@ -110,14 +109,14 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD ...@@ -110,14 +109,14 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
case 1004: case 1004:
if beginDate != nil && endginDate != nil { if beginDate != nil && endginDate != nil {
let timeInterval:TimeInterval = beginDate!.timeIntervalSince1970 let timeInterval:TimeInterval = beginDate!.timeIntervalSince1970
let timeIntervalEnd:TimeInterval = endginDate!.timeIntervalSince1970 let timeIntervalEnd:TimeInterval = endginDate!.timeIntervalSince1970
let timestr = dayByDouble(sender: timeInterval) + "-" + dayByDouble(sender: timeIntervalEnd) let timestr = dayByDouble(sender: timeInterval) + "-" + dayByDouble(sender: timeIntervalEnd)
topNavBtn.setTitle(timestr, for: .normal) topNavBtn.setTitle(timestr, for: .normal)
endTime = endginDate! endTime = endginDate!
starTime = beginDate! starTime = beginDate!
loadData() loadData()
} }
break break
default: default:
break break
...@@ -156,7 +155,6 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD ...@@ -156,7 +155,6 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
var endTime = Date() var endTime = Date()
var starTime = DateInRegion().dateAt(.startOfDay).date var starTime = DateInRegion().dateAt(.startOfDay).date
let realm = try! Realm()
var dataModel:WorkcenterIndexDataModel? = nil var dataModel:WorkcenterIndexDataModel? = nil
var oftenArr:Array<WorkcenterIndexAuthResModel>? = [] var oftenArr:Array<WorkcenterIndexAuthResModel>? = []
//MARK:--加载数据 //MARK:--加载数据
...@@ -174,11 +172,11 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD ...@@ -174,11 +172,11 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
if dataM.code == 1 { if dataM.code == 1 {
self.dataModel = dataM.data self.dataModel = dataM.data
//查询常用的 //查询常用的
let items = self.realm.objects(WorkDataModel.self) let userdataStr = UserDefaults.standard.value(forKey: "WorkDataModel")
if items.count > 0 { if userdataStr != nil {
print("有数据哦--") print("有数据哦--")
let workTestMd:WorkDataModel = items[0]; let workTestMd = WorkDataModel(JSONString: userdataStr as! String)
let oftenStr = workTestMd.oftenArrStr let oftenStr = workTestMd!.oftenArrStr
if oftenStr.count > 0 { if oftenStr.count > 0 {
//经过对比需要删除剩哪一些 //经过对比需要删除剩哪一些
let oldOftenArr = Array<WorkcenterIndexAuthResModel>(JSONString: oftenStr) let oldOftenArr = Array<WorkcenterIndexAuthResModel>(JSONString: oftenStr)
...@@ -211,15 +209,9 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD ...@@ -211,15 +209,9 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
saveModel.end_time = end_time saveModel.end_time = end_time
saveModel.oftenArrStr = oftenStr! saveModel.oftenArrStr = oftenStr!
// 数据持久化操作--(退出登录的话,或者token异常那里,全部要删除) // 数据持久化操作--(退出登录的话,或者token异常那里,全部要删除)
try! self.realm.write { let userDataStr = saveModel.toJSONString()
self.realm.deleteAll() UserDefaults.standard.set(userDataStr, forKey: "WorkDataModel")
} UserDefaults.standard.synchronize()
//成功插入
try! self.realm.write {
self.realm.add(saveModel)
}
//打印出数据库地址
print(self.realm.configuration.fileURL ?? "")
self.tableV.reloadData() self.tableV.reloadData()
} }
...@@ -323,7 +315,7 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD ...@@ -323,7 +315,7 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
return tableV.rowHeight return tableV.rowHeight
} }
//MARK: - diy cell delegate //MARK: - diy cell delegate
...@@ -339,13 +331,13 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD ...@@ -339,13 +331,13 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
//未发货订单 //未发货订单
NotificationCenter.default.post(name: NSNotification.Name(rawValue: "changgeTabItem"), object: nil, userInfo: ["tag":0]) NotificationCenter.default.post(name: NSNotification.Name(rawValue: "changgeTabItem"), object: nil, userInfo: ["tag":0])
NotificationCenter.default.post(name: NSNotification.Name(rawValue: "orderNavChange"), object: nil, userInfo: ["tag":3]) NotificationCenter.default.post(name: NSNotification.Name(rawValue: "orderNavChange"), object: nil, userInfo: ["tag":3])
return return
case 1: case 1:
//待确认订单 //待确认订单
NotificationCenter.default.post(name: NSNotification.Name(rawValue: "changgeTabItem"), object: nil, userInfo: ["tag":0]) NotificationCenter.default.post(name: NSNotification.Name(rawValue: "changgeTabItem"), object: nil, userInfo: ["tag":0])
NotificationCenter.default.post(name: NSNotification.Name(rawValue: "orderNavChange"), object: nil, userInfo: ["tag":1]) NotificationCenter.default.post(name: NSNotification.Name(rawValue: "orderNavChange"), object: nil, userInfo: ["tag":1])
return return
case 2: case 2:
//入库申请 //入库申请
...@@ -364,182 +356,181 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD ...@@ -364,182 +356,181 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
default: default:
break break
} }
} }
//MARK:--item相关跳转 //MARK:--item相关跳转
func getTheWorkVcByAuthId(auth_id:Int){ func getTheWorkVcByAuthId(auth_id:Int){
switch auth_id { switch auth_id {
case 47: //订单列表 case 47: //订单列表
NotificationCenter.default.post(name: NSNotification.Name(rawValue: "changgeTabItem"), object: nil, userInfo: ["tag":0]) NotificationCenter.default.post(name: NSNotification.Name(rawValue: "changgeTabItem"), object: nil, userInfo: ["tag":0])
return return
case 48: //销售统计 case 48: //销售统计
HUD.flash(.label("敬请期待"),delay: 1.2) HUD.flash(.label("敬请期待"),delay: 1.2)
return return
case 50: //商品列表 case 50: //商品列表
NotificationCenter.default.post(name: NSNotification.Name(rawValue: "changgeTabItem"), object: nil, userInfo: ["tag":1]) NotificationCenter.default.post(name: NSNotification.Name(rawValue: "changgeTabItem"), object: nil, userInfo: ["tag":1])
return return
case 51: //品牌列表 case 51: //品牌列表
let vc = PinPaiListViewController() let vc = PinPaiListViewController()
self.navigationController?.pushViewController(vc, animated: true) self.navigationController?.pushViewController(vc, animated: true)
return return
case 53: //销售下单-代客下单 case 53: //销售下单-代客下单
let vc = DaiKeXiaDanGouWuViewController() let vc = DaiKeXiaDanGouWuViewController()
self.navigationController?.pushViewController(vc, animated: true) self.navigationController?.pushViewController(vc, animated: true)
return return
case 54: //扫码下单 case 54: //扫码下单
HUD.flash(.label("敬请期待"),delay: 1.2) HUD.flash(.label("敬请期待"),delay: 1.2)
return return
case 55: //预售下单 case 55: //预售下单
let vc = DaiKeXiaDanGouWuViewController() let vc = DaiKeXiaDanGouWuViewController()
vc.orderType = 1 vc.orderType = 1
self.navigationController?.pushViewController(vc, animated: true) self.navigationController?.pushViewController(vc, animated: true)
return return
case 57: //商家信息 case 57: //商家信息
let vc = ShopInfoViewController() let vc = ShopInfoViewController()
self.navigationController?.pushViewController(vc, animated: true) self.navigationController?.pushViewController(vc, animated: true)
return return
case 58: //支付账号==格利支付 case 58: //支付账号==格利支付
let vc = PayViewController() let vc = PayViewController()
self.navigationController?.pushViewController(vc, animated: true) self.navigationController?.pushViewController(vc, animated: true)
return return
case 59: //地址管理 case 59: //地址管理
HUD.flash(.label("敬请期待"),delay: 1.2) HUD.flash(.label("敬请期待"),delay: 1.2)
return return
case 61: //库存商品 case 61: //库存商品
HUD.flash(.label("敬请期待"),delay: 1.2) HUD.flash(.label("敬请期待"),delay: 1.2)
return return
case 62: //出入库记录 case 62: //出入库记录
let vc = CRKListVC() let vc = CRKListVC()
self.navigationController?.pushViewController(vc, animated: true) self.navigationController?.pushViewController(vc, animated: true)
return return
case 63: //入库--直接入库 case 63: //入库--直接入库
let vc = NewRKVc() let vc = NewRKVc()
self.navigationController?.pushViewController(vc, animated: true) self.navigationController?.pushViewController(vc, animated: true)
return return
case 64: //出库--直接出库 case 64: //出库--直接出库
let vc = NewCKVc() let vc = NewCKVc()
self.navigationController?.pushViewController(vc, animated: true) self.navigationController?.pushViewController(vc, animated: true)
return return
case 65: //申请入库 case 65: //申请入库
let vc = NewRKVc() let vc = NewRKVc()
self.navigationController?.pushViewController(vc, animated: true) self.navigationController?.pushViewController(vc, animated: true)
return return
case 66: //申请出库 case 66: //申请出库
let vc = NewCKVc() let vc = NewCKVc()
self.navigationController?.pushViewController(vc, animated: true) self.navigationController?.pushViewController(vc, animated: true)
return return
case 67: //仓库管理 case 67: //仓库管理
NotificationCenter.default.post(name: NSNotification.Name(rawValue: "changgeTabItem"), object: nil, userInfo: ["tag":3]) NotificationCenter.default.post(name: NSNotification.Name(rawValue: "changgeTabItem"), object: nil, userInfo: ["tag":3])
return return
case 69: //主营收入 case 69: //主营收入
HUD.flash(.label("敬请期待"),delay: 1.2) HUD.flash(.label("敬请期待"),delay: 1.2)
return return
case 70: //其他收入 case 70: //其他收入
HUD.flash(.label("敬请期待"),delay: 1.2) HUD.flash(.label("敬请期待"),delay: 1.2)
return return
case 71: //费用支出 case 71: //费用支出
HUD.flash(.label("敬请期待"),delay: 1.2) HUD.flash(.label("敬请期待"),delay: 1.2)
return return
case 72: //样品福利 case 72: //样品福利
HUD.flash(.label("敬请期待"),delay: 1.2) HUD.flash(.label("敬请期待"),delay: 1.2)
return return
case 73: //主营成本 case 73: //主营成本
HUD.flash(.label("敬请期待"),delay: 1.2) HUD.flash(.label("敬请期待"),delay: 1.2)
return return
case 74: //现金记账 case 74: //现金记账
HUD.flash(.label("敬请期待"),delay: 1.2) HUD.flash(.label("敬请期待"),delay: 1.2)
return return
case 75: //收支统计 case 75: //收支统计
HUD.flash(.label("敬请期待"),delay: 1.2) HUD.flash(.label("敬请期待"),delay: 1.2)
return return
case 76: //收支详情 case 76: //收支详情
HUD.flash(.label("敬请期待"),delay: 1.2) HUD.flash(.label("敬请期待"),delay: 1.2)
return return
case 77: //应收账款 case 77: //应收账款
HUD.flash(.label("敬请期待"),delay: 1.2) HUD.flash(.label("敬请期待"),delay: 1.2)
return return
case 78: //应付账款 case 78: //应付账款
HUD.flash(.label("敬请期待"),delay: 1.2) HUD.flash(.label("敬请期待"),delay: 1.2)
return return
case 80: //客户列表 case 80: //客户列表
HUD.flash(.label("敬请期待"),delay: 1.2) HUD.flash(.label("敬请期待"),delay: 1.2)
return return
case 82: //账期用户列表 case 82: //账期用户列表
HUD.flash(.label("敬请期待"),delay: 1.2) HUD.flash(.label("敬请期待"),delay: 1.2)
return return
case 83: //用户账期申请列表 case 83: //用户账期申请列表
HUD.flash(.label("敬请期待"),delay: 1.2) HUD.flash(.label("敬请期待"),delay: 1.2)
return return
case 84: //账期设置 case 84: //账期设置
HUD.flash(.label("敬请期待"),delay: 1.2) HUD.flash(.label("敬请期待"),delay: 1.2)
return return
case 86: //档口列表 case 86: //档口列表
HUD.flash(.label("敬请期待"),delay: 1.2) HUD.flash(.label("敬请期待"),delay: 1.2)
return return
case 88: //运单列表 case 88: //运单列表
HUD.flash(.label("敬请期待"),delay: 1.2) HUD.flash(.label("敬请期待"),delay: 1.2)
return return
case 89: //物流公司列表 case 89: //物流公司列表
HUD.flash(.label("敬请期待"),delay: 1.2) HUD.flash(.label("敬请期待"),delay: 1.2)
return return
case 90: //下运单 case 90: //下运单
HUD.flash(.label("敬请期待"),delay: 1.2) HUD.flash(.label("敬请期待"),delay: 1.2)
return return
case 92: //采购订单管理 case 92: //采购订单管理
HUD.flash(.label("敬请期待"),delay: 1.2) HUD.flash(.label("敬请期待"),delay: 1.2)
return return
case 93: //供应商管理 case 93: //供应商管理
HUD.flash(.label("敬请期待"),delay: 1.2) HUD.flash(.label("敬请期待"),delay: 1.2)
return return
case 113: //管理员列表 case 113: //管理员列表
HUD.flash(.label("敬请期待"),delay: 1.2) HUD.flash(.label("敬请期待"),delay: 1.2)
return return
case 115: //角色列表 case 115: //角色列表
HUD.flash(.label("敬请期待"),delay: 1.2) HUD.flash(.label("敬请期待"),delay: 1.2)
return return
case 116: //字段列表 case 116: //字段列表
HUD.flash(.label("敬请期待"),delay: 1.2) HUD.flash(.label("敬请期待"),delay: 1.2)
return return
case 118: //新增商品 case 118: //新增商品
let vc = ProductDetailViewController() let vc = ProductDetailViewController()
self.navigationController?.pushViewController(vc, animated: true) self.navigationController?.pushViewController(vc, animated: true)
return return
case 119: //新增采购单 case 119: //新增采购单
HUD.flash(.label("敬请期待"),delay: 1.2) HUD.flash(.label("敬请期待"),delay: 1.2)
return return
case 120: //商品毛利统计 case 120: //商品毛利统计
HUD.flash(.label("敬请期待"),delay: 1.2) HUD.flash(.label("敬请期待"),delay: 1.2)
return return
default: default:
break; break;
} }
HUD.flash(.label("敬请期待"),delay: 1.2) HUD.flash(.label("敬请期待"),delay: 1.2)
return return
} }
//MARK:--编辑页面保存回调(主要增加使用体验)不应网络请求出差而无法改变 //MARK:--编辑页面保存回调(主要增加使用体验)不应网络请求出差而无法改变
func updataUIbyEditWorkSave() { func updataUIbyEditWorkSave() {
//查询所有记录
let items = realm.objects(WorkDataModel.self) let userdataStr = UserDefaults.standard.value(forKey: "WorkDataModel")
// 已经有记录的话就不插入了 if userdataStr != nil {
if items.count > 0 {
print("有数据哦--") print("有数据哦--")
let workTestMd:WorkDataModel = items[0]; let workTestMd = WorkDataModel(JSONString: userdataStr as! String)
let dataModelStr = workTestMd.dataModelStr let dataModelStr = workTestMd?.dataModelStr
self.dataModel = WorkcenterIndexDataModel(JSONString: dataModelStr) self.dataModel = WorkcenterIndexDataModel(JSONString: dataModelStr!)
//旧的常用功能 //旧的常用功能
let oftenStr = workTestMd.oftenArrStr let oftenStr = workTestMd?.oftenArrStr
if oftenStr.count > 0 { if oftenStr!.count > 0 {
self.oftenArr?.removeAll() self.oftenArr?.removeAll()
self.oftenArr = Array<WorkcenterIndexAuthResModel>(JSONString: oftenStr) self.oftenArr = Array<WorkcenterIndexAuthResModel>(JSONString: oftenStr!)
} }
self.tableV.reloadData() self.tableV.reloadData()
}else{ }else{
print("没有数据hehe--") print("没有数据hehe--")
} }
} }
} }
...@@ -7,16 +7,29 @@ ...@@ -7,16 +7,29 @@
// //
import Foundation import Foundation
import RealmSwift import ObjectMapper
//工作中心 //工作中心
class WorkDataModel:Object { class WorkDataModel:Mappable {
//类型名 //类型名
@objc dynamic var dataModelStr = "" var dataModelStr:String = ""
@objc dynamic var star_time = 0 var star_time = 0
@objc dynamic var end_time = 0 var end_time = 0
@objc dynamic var oftenArrStr = "" var oftenArrStr = ""
} init(){
}
required init?(map: Map) {
}
// Mappable
func mapping(map: Map) {
dataModelStr <- map["dataModelStr"]
star_time <- map["star_time"]
end_time <- map["end_time"]
oftenArrStr <- map["oftenArrStr"]
}
}
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
// //
import UIKit import UIKit
import RealmSwift
protocol EditWorkCViewControllerDelegate { protocol EditWorkCViewControllerDelegate {
func updataUIbyEditWorkSave() func updataUIbyEditWorkSave()
...@@ -21,8 +20,7 @@ class EditWorkCViewController: BaseViewController, UICollectionViewDelegate, UIC ...@@ -21,8 +20,7 @@ class EditWorkCViewController: BaseViewController, UICollectionViewDelegate, UIC
//MARK:--一级分类 //MARK:--一级分类
var titleStrArr:[String] = [] var titleStrArr:[String] = []
var pAuthResModelArr:[WorkcenterIndexAuthResModel] = [] var pAuthResModelArr:[WorkcenterIndexAuthResModel] = []
let realm = try! Realm()//数据库
@IBOutlet weak var topLayou: NSLayoutConstraint! @IBOutlet weak var topLayou: NSLayoutConstraint!
@IBOutlet weak var itemListCollectionView: UICollectionView! @IBOutlet weak var itemListCollectionView: UICollectionView!
@IBOutlet weak var titleView: UIView! @IBOutlet weak var titleView: UIView!
...@@ -90,14 +88,15 @@ class EditWorkCViewController: BaseViewController, UICollectionViewDelegate, UIC ...@@ -90,14 +88,15 @@ class EditWorkCViewController: BaseViewController, UICollectionViewDelegate, UIC
} }
func sureGeliAlertViewAction(sender: UIButton) { func sureGeliAlertViewAction(sender: UIButton) {
if sender.tag == 1001 { if sender.tag == 1001 {
let items = self.realm.objects(WorkDataModel.self) let userdataStr = UserDefaults.standard.value(forKey: "WorkDataModel")
if items.count > 0 { if userdataStr != nil {
let workTestMd:WorkDataModel = items[0]; let workTestMd = WorkDataModel(JSONString: userdataStr as! String)
// 在一个事务中更新对象 // 在一个事务中更新对象
let oftenStr = self.oftenArr?.toJSONString() let oftenStr = self.oftenArr?.toJSONString()
try! realm.write { workTestMd!.oftenArrStr = oftenStr!
workTestMd.oftenArrStr = oftenStr! let userDataStr = workTestMd!.toJSONString()
} UserDefaults.standard.set(userDataStr, forKey: "WorkDataModel")
UserDefaults.standard.synchronize()
HUD.flash(.label("保存成功"), onView: nil, delay: 1.2) { (istrue) in HUD.flash(.label("保存成功"), onView: nil, delay: 1.2) { (istrue) in
self.delegate?.updataUIbyEditWorkSave() self.delegate?.updataUIbyEditWorkSave()
self.navigationController?.popViewController(animated: true) self.navigationController?.popViewController(animated: true)
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
// //
import UIKit import UIKit
import RealmSwift
class AccountViewController: BaseViewController{ class AccountViewController: BaseViewController{
@IBOutlet weak var phoneLbl: UILabel! @IBOutlet weak var phoneLbl: UILabel!
...@@ -52,10 +52,7 @@ class AccountViewController: BaseViewController{ ...@@ -52,10 +52,7 @@ class AccountViewController: BaseViewController{
@IBAction func logOutAction(_ sender: Any) { @IBAction func logOutAction(_ sender: Any) {
print("退出登录") print("退出登录")
//模拟退出登录 //模拟退出登录
let realm = try! Realm() UserDefaults.standard.removeObject(forKey: "WorkDataModel")
try! realm.write {
realm.deleteAll()
}
UserDefaults.standard.removeObject(forKey: "user_token") UserDefaults.standard.removeObject(forKey: "user_token")
NotificationCenter.default.post(name: Notification.Name(rawValue: "logout"), object: nil) NotificationCenter.default.post(name: Notification.Name(rawValue: "logout"), object: nil)
JPUSHService.deleteAlias({ (resCode, alias, num) in JPUSHService.deleteAlias({ (resCode, alias, num) in
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment