|  | @@ -16,21 +16,19 @@ public class BFRecordScreenViewModel: NSObject {
 | 
	
		
			
				|  |  |      /// 取文本转语言 token
 | 
	
		
			
				|  |  |      /// - Parameter completeHander: completeHander description
 | 
	
		
			
				|  |  |      public class func getNlsAccessToken(completeHander: @escaping (_ token: String, _ appkey: String) -> Void) {
 | 
	
		
			
				|  |  | -   
 | 
	
		
			
				|  |  | -        let currentLanguage =  BFLocalizedUtil.currentLanguage()
 | 
	
		
			
				|  |  | -        BFLog(2,message: "当前的系统语言是:\(currentLanguage)")
 | 
	
		
			
				|  |  | +        let currentLanguage = BFLocalizedUtil.currentLanguage()
 | 
	
		
			
				|  |  | +        BFLog(2, message: "当前的系统语言是:\(currentLanguage)")
 | 
	
		
			
				|  |  |          let nowTime: TimeInterval = Date().timeIntervalSince1970
 | 
	
		
			
				|  |  |          //token = "5d96258dcea34d7b91576031cd25a9ba"; 返回数据
 | 
	
		
			
				|  |  | -        //expireTime = 1601376826000; //1601377050000;
 | 
	
		
			
				|  |  | +        // expireTime = 1601376826000; //1601377050000;
 | 
	
		
			
				|  |  |          let saveToken: Dictionary? = getUserDefaults(key: currentLanguage) as? [String: Any] ?? nil
 | 
	
		
			
				|  |  |          if saveToken != nil && Double(saveToken!["expireTime"] as! Double) > nowTime * 1000 {
 | 
	
		
			
				|  |  |              BFLog(message: "nls token 还有效期内不用重新请求 \(String(describing: saveToken!["expireTime"])) nowTime:\(nowTime * 1000)")
 | 
	
		
			
				|  |  |              completeHander(saveToken!["token"] as! String, saveToken!["appkey"] as! String)
 | 
	
		
			
				|  |  |              return
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  | -        
 | 
	
		
			
				|  |  | -  
 | 
	
		
			
				|  |  | -        BFNetRequestAdaptor.getRequestData(url: PQENVUtil.shared.clipapiapi + getNlsAccessTokenForJiangjieApp, parames: ["languageCode":currentLanguage], commonParams: commonParams()) { response, _, _, _ in
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +        BFNetRequestAdaptor.getRequestData(url: PQENVUtil.shared.clipapiapi + getNlsAccessTokenForJiangjieApp, parames: ["languageCode": currentLanguage], commonParams: commonParams()) { response, _, _, _ in
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |              if let response = response as? [String: Any], let token = response["token"] as? String, let appkey = response["appkey"] as? String {
 | 
	
		
			
				|  |  |                  let nowTime: TimeInterval = Date().timeIntervalSince1970
 | 
	
	
		
			
				|  | @@ -46,25 +44,23 @@ public class BFRecordScreenViewModel: NSObject {
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      // 取发音人列表数据
 | 
	
		
			
				|  |  | -    class func getAllVoiceCates(completeHander: @escaping (_ categorys:[BFVoiceCategoryModel],_ voices: Dictionary<String, [PQVoiceModel]>) -> Void) {
 | 
	
		
			
				|  |  | +    class func getAllVoiceCates(completeHander: @escaping (_ categorys: [BFVoiceCategoryModel], _ voices: Dictionary<String, [PQVoiceModel]>) -> Void) {
 | 
	
		
			
				|  |  |          BFNetRequestAdaptor.getRequestData(url: PQENVUtil.shared.clipapiapi + listAllCateVoicesUrl, parames: nil, commonParams: commonParams()) { response, _, _, _ in
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -            
 | 
	
		
			
				|  |  | -            var categorys:[BFVoiceCategoryModel] = Array()
 | 
	
		
			
				|  |  | +            var categorys: [BFVoiceCategoryModel] = Array()
 | 
	
		
			
				|  |  |              var voccesDic: Dictionary<String, [PQVoiceModel]> = Dictionary()
 | 
	
		
			
				|  |  |              if response != nil, !(response is NSNull) {
 | 
	
		
			
				|  |  |                  for voices in response as! [[String: Any]] {
 | 
	
		
			
				|  |  | -                    
 | 
	
		
			
				|  |  |                      var voicesData: [PQVoiceModel] = Array()
 | 
	
		
			
				|  |  |                      let cateName = voices["cateName"] as? String ?? ""
 | 
	
		
			
				|  |  |                      let cateId = voices["cateId"] as? Int ?? 0
 | 
	
		
			
				|  |  |                      BFLog(message: "cateName is \(cateName) cateId is \(cateId)")
 | 
	
		
			
				|  |  | -                    let category = BFVoiceCategoryModel.init()
 | 
	
		
			
				|  |  | +                    let category = BFVoiceCategoryModel()
 | 
	
		
			
				|  |  |                      category.cateName = cateName
 | 
	
		
			
				|  |  |                      category.cateID = cateId
 | 
	
		
			
				|  |  |                      categorys.append(category)
 | 
	
		
			
				|  |  |                      for voice in voices["voiceDatas"] as! [[String: Any]] {
 | 
	
		
			
				|  |  | -                        if voice.keys.contains("channel"), "\(voice["channel"] ?? "")" == "aliyun", voice.keys.contains("appEnable"), "\(voice["appEnable"] ?? "")" == "1"  {
 | 
	
		
			
				|  |  | +                        if voice.keys.contains("channel"), "\(voice["channel"] ?? "")" == "aliyun", voice.keys.contains("appEnable"), "\(voice["appEnable"] ?? "")" == "1" {
 | 
	
		
			
				|  |  |                              let voiceModel = PQVoiceModel()
 | 
	
		
			
				|  |  |                              voiceModel.voice = voice["voice"] as? String ?? ""
 | 
	
		
			
				|  |  |                              voiceModel.name = voice["name"] as? String ?? ""
 | 
	
	
		
			
				|  | @@ -95,16 +91,15 @@ public class BFRecordScreenViewModel: NSObject {
 | 
	
		
			
				|  |  |                                  }
 | 
	
		
			
				|  |  |                              }
 | 
	
		
			
				|  |  |                              voicesData.append(voiceModel)
 | 
	
		
			
				|  |  | -                            
 | 
	
		
			
				|  |  |                          }
 | 
	
		
			
				|  |  |                      }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |                      voccesDic[cateName] = voicesData
 | 
	
		
			
				|  |  |                  }
 | 
	
		
			
				|  |  | -                completeHander(categorys,voccesDic)
 | 
	
		
			
				|  |  | +                completeHander(categorys, voccesDic)
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |              } else {
 | 
	
		
			
				|  |  | -                completeHander(categorys,voccesDic)
 | 
	
		
			
				|  |  | +                completeHander(categorys, voccesDic)
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |      }
 |