提交修改

liushiyu
1 parent 6ece0a35
Showing 2 changed files with 48 additions and 23 deletions
metaCode/Classes/Main/HomePage/View/CNMainView.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineViewModel.swift
@@ -150,6 +150,7 @@ class CNFrontMainView : UIView{
     @objc func tapAction(){
         tapTransformAciton!()
     }
+
     @objc func addStandBtnAction() {
         //跳转到添加身份页面
         currentViewController()?.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: _idModel!), animated: true)
@@ -269,32 +269,30 @@ class CNLiveMineViewModel: NSObject {
                     if CNLiveSaveStandDB.shared.searchAllObject().count > 0 {
                         //第一页
                         if page == 1 {
-                            //在这里主要判断是不是有删除身份的情况
-//                            let no_id_auths = CNLiveSaveStandDB.shared.searchAllObjectId()
-//                            if no_id_auths.count == listModel.list.count {
-//                                //对获取的数据进行数据更新
-//                                CNLiveSaveStandDB.shared.updateObjects(newObjects: listModel.list)
-//
-//                            } else {//说明服务器有增加/减少的情况
-//
-//                            }
                             let have_id_auths = CNLiveSaveAuthDB.shared.searchAllObjectId()
                             let have_auths = NSMutableArray()
                             let no_auths = NSMutableArray()
                             for item in listModel.list {
-                                item.auth ? have_auths.add(item) : no_auths.add(item)
+                                //这里需要及时去刷新认证状态  如果没有及时刷新这里回出现已经认证的状态不会进行排序
+                                item.auth && have_id_auths.contains("\(item.id)")  ? have_auths.add(item) : no_auths.add(item)
                             }
-                            if have_auths.count == have_id_auths.count {
-                                for item in have_auths {
-                                    
+                            let tempArray = NSMutableArray()
+                            for item in have_auths {
+                                let standModel = item as! StandListModel
+                                let old_index = have_auths.index(of: standModel)
+                                let new_index = have_id_auths.firstIndex(of: "\(standModel.id)")
+                                if old_index != new_index {
+                                    swap(&have_auths[new_index!], &have_auths[old_index])
                                 }
                             }
+                            tempArray.addObjects(from: have_auths as! [Any])
+                            tempArray.addObjects(from: no_auths as! [Any])
+                            listModel.list = tempArray as! [StandListModel]
                             CNLiveSaveStandDB.shared.deleteAllObjects()
                             CNLiveSaveStandDB.shared.insertObjects(objects: listModel.list)
                         }else{
                         }
-                        
                     }else{
                         CNLiveSaveStandDB.shared.insertObjects(objects: listModel.list)
                     }
@@ -338,9 +336,31 @@ class CNLiveMineViewModel: NSObject {
                 let errorCode = "\(resp["errorCode"] ?? "0")"
                 if (errorCode == "0") {
                     let listModel = dictionaryToModel(resp as! [String : Any], MineAuthListBaseModel.self,"data") as! MineAuthListBaseModel
-                    
-                    
-                    
+                    if page == 1 {
+                        let have_id_auths = CNLiveSaveAuthDB.shared.searchAllObjectId()
+                        if have_id_auths.count > 0 {
+                            let tempArray_have = NSMutableArray()
+                            let tempArray_no = NSMutableArray()
+                            for item in listModel.list {
+                                if (have_id_auths.contains("\(item.identityId)")) {
+                                    tempArray_have.add(item)
+                                }else{
+                                    tempArray_no.add(item)
+                                }
+                            }
+                            let tempArray = NSMutableArray()
+                            tempArray.adding(tempArray_have)
+                            tempArray.adding(tempArray_no)
+                            listModel.list = tempArray as! [MineAuthListModel]
+                            CNLiveSaveAuthDB.shared.deleteAllObjects()
+                            CNLiveSaveAuthDB.shared.insertObjects(objects: listModel.list)
+                        }else{
+                            //本地没值  不进行处理
+                        }
+                    } else {
+                        //多条数据
+                        
+                    }
                     resultBlock(listModel,.success)
                 } else {
                     showMessage(message: resp["errorMessage"] as! String)
@@ -443,13 +463,17 @@ class CNLiveMineViewModel: NSObject {
                 let errorCode = "\(resp["errorCode"] ?? "0")"
                 if (errorCode == "0") {
                     let newsModel = dictionaryToModel(resp as! [String : Any], MineStandInfoBaseModel.self,"data") as! MineStandInfoBaseModel
-                    let tempArray = NSMutableArray()
-                    for authinfo in newsModel.authInfos {
-//                        if authinfo.input {
-                            tempArray.add(authinfo)
-//                        }
+                    if type == .nodate {
+                        let tempArray = NSMutableArray()
+                        for authinfo in newsModel.authInfos {
+                            if authinfo.input {
+                                tempArray.add(authinfo)
+                            }
+                        }
+                        resultBlock(tempArray,.success)
+                    }else {
+                        resultBlock(newsModel.authInfos,.success)
                     }
-                    resultBlock(tempArray,.success)
                 } else {
                     showMessage(message: resp["errorMessage"] as! String)
                     resultBlock(NSNull(),.failed)