fix bug

无故事王国

2024-07-04 d7282009847ce7dffcd5ec5c3faf2ef569f75744

 DolphinEnglishLearnStudent/Moudle/Home/Listen/VC/HomeListenFightVC.swift

@@ -330,7 +330,7 @@
                                                            case .story1,.story2:
                                                                        if let dict = noti.object as? Dictionary<String,Any>{
                                                                                    let type = weakSelf.viewModel.listenType.value == .story1 ? 1:2
                                                                                    let accracy = String(format: "%.0lf", Double(weakSelf.viewModel.correctNum) / Double(weakSelf.viewModel.correctNum + weakSelf.viewModel.errorNum) * 100).int ?? 0
                                                                                    let accracy = floor(Double(weakSelf.viewModel.correctNum) / Double(weakSelf.viewModel.correctNum + weakSelf.viewModel.errorNum) * 100).int
                                                                                    weakSelf.storyComplete(storyId: dict["storyId"] as! Int, accuracy: accracy, studyTime: weakSelf.viewModel.times, type: type, integral: dict["storyIntegral"] as! Int)
                                                                        }
                                                }
@@ -394,17 +394,10 @@
            /// 学习类完成
            /// - Parameter ignorePush: 是否忽略跳转（未完成答题 ：true）
            private func studyComplete(){
                        //                        var toalIntegral:Int = 0
                        let ids:String = viewModel.answerItems_1.keys.sorted().joined(separator: ",")
                        switch viewModel.listenType.value {
                                    case .lesson1,.lesson2,.lesson3,.lesson4,.lesson5:
                                                let data = (data as! ListenNewModel).data
                                                //                                                toalIntegral = data?.integral ?? 0
                                    default:break
                        }

                        //正确率
                        let accracy = String(format: "%.0lf", Double(viewModel.correctNum) / Double(viewModel.correctNum + viewModel.errorNum) * 100).int ?? 0
                        let accracy = floor(Double(viewModel.correctNum) / Double(viewModel.correctNum + viewModel.errorNum) * 100).int

                        Services.completeLearing(type: viewModel.listenType.value.rawValue, studyTime: viewModel.times, studyIds: ids, quarter: viewModel.quarter.value!, week: viewModel.week.value!, day: viewModel.day.value!, accracy: accracy).subscribe(onNext: {data in
                                    NotificationCenter.default.post(name: Refresh_ListenSchedule_Noti, object: nil)
@@ -412,8 +405,6 @@
                        }).disposed(by: disposeBag)

                        timer.invalidate()

                        //                        toalIntegral = floor(Double(toalIntegral) * (Double(accracy) / 100.0)).int

                        let vc = HomeStudyCompleteVC(viewModel: viewModel,studyScheduleModel: studyScheduleModel!)
                        vc.title = viewModel.listenType.value.rawTitle
@@ -427,27 +418,22 @@
                        var name = ""
                        var accuracy:Int = 0
                        var totalNum:Double = 0
                        //                        var toalIntegral:Int = 0

                        if viewModel.listenType.value == .game1{
                                    name = "超级听力"
                                    totalNum =  Double(viewModel.correctNum + viewModel.errorNum)
                                    if totalNum > 0{
                                                accuracy = String(format: "%.0lf", Double(viewModel.correctNum) / totalNum * 100).int ?? 0
                                                accuracy = floor(Double(viewModel.correctNum) / totalNum * 100).int
                                    }
                                    //                                    toalIntegral = floor(Double(integral) * (Double(accuracy) / 100.0)).int
                        }else{
                                    name = "超级记忆"
                                    let v = viewModel.answerItems.first?.value as! Listen1Model
                                    //11887：完成答题页，总题目、错误题目 数量计算逻辑错误（只要是没有答对的题目就算错误题目，不管是否答，相当于错误题目就是总题目减去正确题目）
                                    totalNum = Double(v.photoList.count)
                                    if totalNum > 0 && viewModel.correctNum > 0 && viewModel.errorNum > 0{
                                                accuracy = String(format: "%.0lf", Double(viewModel.correctNum) / Double(totalNum) * 100).int ?? 0
                                                accuracy = floor(Double(viewModel.correctNum) / Double(totalNum) * 100).int
                                    }

                                    viewModel.errorNum = Int(totalNum) - viewModel.correctNum

                                    //                                    toalIntegral = floor(Double(integral) * (Double(accuracy) / 100.0)).int
                        }

                        Services.completeGames(gameId: gameId, gameName: name, difficulty: viewModel.gameLevel.value, accuracy: accuracy, useTime: viewModel.times).subscribe(onNext: {data in