更新眼镜板域名

diff --git a/ShenYin/ShenYin/Sdk/DcSdk/tool/CCConfig.swift b/ShenYin/ShenYin/Sdk/DcSdk/tool/CCConfig.swift
index fb06aa7..18e73f6 100644 (file)
--- a/ShenYin/ShenYin/Sdk/DcSdk/tool/CCConfig.swift
+++ b/ShenYin/ShenYin/Sdk/DcSdk/tool/CCConfig.swift
@@ -41,7 +41,8 @@ class CCConfig{
     /// 服务器地址
     static let baseURL = "https://app-api.playboykq.com"
 
+//    https://pub-cdn.playboykq.com/protocol/cn/yonghuxieyi.html
     /// 用户隐私协议地址
-    static let yonghuBaseURL = "https://pub-tos.deepchords.com"
+    static let yonghuBaseURL = "https://pub-cdn.playboykq.com"
 
 }

diff --git a/ShenYin/ShenYin/Sdk/DcSdk/tool/DcSdkManager.swift b/ShenYin/ShenYin/Sdk/DcSdk/tool/DcSdkManager.swift
index a9b6ec1..a2dee20 100644 (file)
--- a/ShenYin/ShenYin/Sdk/DcSdk/tool/DcSdkManager.swift
+++ b/ShenYin/ShenYin/Sdk/DcSdk/tool/DcSdkManager.swift
@@ -14,7 +14,7 @@ class DcSdkManager{
     func initSdk(){
         DcCall.shared.start()
         DCSdk.shared.initSDK()
-        DCLogger.isDebug = false
+        DCLogger.isDebug = true
         DCSdk.shared.authCallback = {[weak self] (code,msg)in
             DCLogger.debug(code,msg)
             guard let self = self else{return}

diff --git a/ShenYin/ShenYin/Sdk/LogManager.swift b/ShenYin/ShenYin/Sdk/LogManager.swift
index f61e054..8735333 100644 (file)
--- a/ShenYin/ShenYin/Sdk/LogManager.swift
+++ b/ShenYin/ShenYin/Sdk/LogManager.swift
@@ -9,7 +9,7 @@ import Foundation
 
 /// 日记管理
 class Logger {
-    static var isDebug: Bool = false
+    static var isDebug: Bool = true
     
     fileprivate static let shared = Logger()
     private var fileHandle:FileHandle?

diff --git a/ShenYin/ShenYin/ShenYin copy-Info.plist b/ShenYin/ShenYin/ShenYin copy-Info.plist
index 82a0f3a..9f4fb07 100644 (file)
--- a/ShenYin/ShenYin/ShenYin copy-Info.plist
+++ b/ShenYin/ShenYin/ShenYin copy-Info.plist
@@ -51,5 +51,9 @@
                <string>bluetooth-central</string>
                <string>audio</string>
        </array>
+       <key>UIStatusBarStyle</key>
+       <string>UIStatusBarStyleLightContent</string>
+       <key>UIViewControllerBasedStatusBarAppearance</key>
+       <true/>
 </dict>
 </plist>

diff --git a/ShenYin/ShenYin/UI/Base/BaseVC.swift b/ShenYin/ShenYin/UI/Base/BaseVC.swift
index 226a4bf..f6172a1 100644 (file)
--- a/ShenYin/ShenYin/UI/Base/BaseVC.swift
+++ b/ShenYin/ShenYin/UI/Base/BaseVC.swift
@@ -64,12 +64,12 @@ open class BaseVC:UIViewController {
         super.didReceiveMemoryWarning()
         KingfisherManager.shared.cache.clearMemoryCache()
     }
-    
-    override open var preferredStatusBarStyle: UIStatusBarStyle {
-        if #available(iOS 13.0, *) {
+    open override var preferredStatusBarStyle: UIStatusBarStyle {
+        if CCDevice.isJoy{
             return .darkContent
-        } else {
-            return .default
+        }
+        else{
+            return .lightContent
         }
     }
 

diff --git a/ShenYin/ShenYin/UI/Home/Device/HomeHeadInfoView.swift b/ShenYin/ShenYin/UI/Home/Device/HomeHeadInfoView.swift
index b559388..dc1c33b 100644 (file)
--- a/ShenYin/ShenYin/UI/Home/Device/HomeHeadInfoView.swift
+++ b/ShenYin/ShenYin/UI/Home/Device/HomeHeadInfoView.swift
@@ -16,9 +16,7 @@ class HomeHeadInfoView: BaseColletionSetionHeader {
         addSubviews([icon,titleLabel,deviceLabel,nameLabel])
         
         icon.do { v in
-            if CCDevice.isJoy{
-                v.yc.setCornerRadius(25)
-            }
+            v.yc.setCornerRadius(25)
         }
         titleLabel.do { (v) in
             v.textColor = .color(.first)

diff --git a/ShenYin/ShenYin/UI/Mine/ProtocolVC.swift b/ShenYin/ShenYin/UI/Mine/ProtocolVC.swift
index 2d31386..74b9d36 100644 (file)
--- a/ShenYin/ShenYin/UI/Mine/ProtocolVC.swift
+++ b/ShenYin/ShenYin/UI/Mine/ProtocolVC.swift
@@ -66,9 +66,22 @@ final class FileDownloadVC: BaseVC {
     override func setupData() {
         let lan = CCConfig.appLanguage.yonghuCode
 //        let fileUrl = "https://dc-cloud-pub.tos-cn-guangzhou.volces.com/protocol/\(lan)/\(type.rawValue).pdf"
-        let fileUrl =  CCConfig.yonghuBaseURL + "/protocol/\(lan)/\(type.rawValue).pdf"
+        if CCDevice.isJoy{
+            let fileUrl =  CCConfig.yonghuBaseURL + "/protocol/\(lan)/\(type.rawValue).pdf"
+            self.dowmload(url:fileUrl)
+        }
+        else{
+//            https://pub-cdn.playboykq.com/protocol/cn/yonghuxieyi.html
+//            https://pub-cdn.playboykq.com/protocol/zh/yonghuxieyi.html
+//            https://pub-cdn.playboykq.com/protocol/\(lan)/\(type.rawValue).html
+            let path =  CCConfig.yonghuBaseURL + "/protocol/\(lan)/\(type.rawValue).html"
+            guard let url = URL(string: path) else{
+                return
+            }
+            let request = URLRequest(url: url)
+            webView.load(request)
+        }
         
-        self.dowmload(url:fileUrl)
     }
     func dowmload(url:String){
         HttpClient.download(url: url){[weak self] filePath in

diff --git a/ShenYin/ShenYin/UI/Mine/RevokeVC.swift b/ShenYin/ShenYin/UI/Mine/RevokeVC.swift
index 75c93c3..1316e9b 100644 (file)
--- a/ShenYin/ShenYin/UI/Mine/RevokeVC.swift
+++ b/ShenYin/ShenYin/UI/Mine/RevokeVC.swift
@@ -26,7 +26,14 @@ class RevokeVC:BaseVC{
             v.font = .regular(14)
             v.textColor = .color(.secondary)
             v.numberOfLines = 0
-            let text = "请您确保您是有权进行本撤回同意隐私政策操作的相关当事人。撤回同意隐私政策，您将放弃以下资产或者权益:\n\n1.数据清空\n将会停止收集您的个人信息。您使用DeepChords应用过程中产生的数据将被清空;手机中DeepChords应用的缓存数据将被清除。\n\n2.设备解除绑定\nDeepChords账号中，所有设备会与您当前登录的账号解除绑定，并清除设备之前存储在服务器的数据。存储在物理设备中的数据请通过人工本地物理重置来清除。如果您需要重新使用设备，需要您再次进行绑定并且重新授权。\n\n3.其他\n此举还将撤回您对用户协议的同意，并退出DeepChords应用。\n\n请您知悉，撤回同意隐私政策不代表撤回同意前的相关行为和责任得到豁免或减轻。若您需要重新在该账号管理设备，需要您重新授权并绑定。请谨慎操作!".l10n
+            var text = ""
+            if CCDevice.isJoy{
+                 text = "请您确保您是有权进行本撤回同意隐私政策操作的相关当事人。撤回同意隐私政策，您将放弃以下资产或者权益:\n\n1.数据清空\n将会停止收集您的个人信息。您使用DeepChords应用过程中产生的数据将被清空;手机中DeepChords应用的缓存数据将被清除。\n\n2.设备解除绑定\nDeepChords账号中，所有设备会与您当前登录的账号解除绑定，并清除设备之前存储在服务器的数据。存储在物理设备中的数据请通过人工本地物理重置来清除。如果您需要重新使用设备，需要您再次进行绑定并且重新授权。\n\n3.其他\n此举还将撤回您对用户协议的同意，并退出DeepChords应用。\n\n请您知悉，撤回同意隐私政策不代表撤回同意前的相关行为和责任得到豁免或减轻。若您需要重新在该账号管理设备，需要您重新授权并绑定。请谨慎操作!".l10n
+            }
+            else{
+                 text = "请您确保您是有权进行本撤回同意隐私政策操作的相关当事人。撤回同意隐私政策，您将放弃以下资产或者权益:\n\n1.数据清空\n将会停止收集您的个人信息。您使用PLAYBOY应用过程中产生的数据将被清空;手机中PLAYBOY应用的缓存数据将被清除。\n\n2.设备解除绑定\nPLAYBOY账号中，所有设备会与您当前登录的账号解除绑定，并清除设备之前存储在服务器的数据。存储在物理设备中的数据请通过人工本地物理重置来清除。如果您需要重新使用设备，需要您再次进行绑定并且重新授权。\n\n3.其他\n此举还将撤回您对用户协议的同意，并退出PLAYBOY应用。\n\n请您知悉，撤回同意隐私政策不代表撤回同意前的相关行为和责任得到豁免或减轻。若您需要重新在该账号管理设备，需要您重新授权并绑定。请谨慎操作!".l10n
+            }
+
             
             let attributedString = NSMutableAttributedString(string: text)
             let paragraphStyle = NSMutableParagraphStyle()