提交修改

liushiyu
1 parent 6dadae49
Showing 5 changed files with 43 additions and 2 deletions
metaCode/Classes/Environment/CNLiveEnvironment.swift
metaCode/Classes/Main/LoginPage/Controller/CNLiveLoginViewController.swift
metaCode/Classes/Main/LoginPage/View/CNLiveLoginAuthView.swift
metaCode/Classes/Other/AppDelegate.swift
metaCode/metaCode.entitlements
@@ -54,6 +54,8 @@ let universalLinkURL: String = &quot;https://metacode.cnlive.com&quot;
 let tencentAppId: String = "1112336586"
 //微信 appId
 let wxAppId: String = "wx82209bed331a549b"
+//微信 appId
+let wxSecret: String = "5b124a6e88f6f0928b55fbaf786f471f"
  
 ///APP 环境类型
 enum CNLiveEnvironment {
@@ -9,6 +9,7 @@ import Foundation
 import UIKit
 import SnapKit
 import APButton
+import CNLiveShareToolKit
  
 class CNLiveLoginViewController : CNLiveBaseViewController, UITextViewDelegate {
  
@@ -65,6 +66,18 @@ class CNLiveLoginViewController : CNLiveBaseViewController, UITextViewDelegate {
         return loginButton
     }()
  
+    lazy var wxButton: APButton = {
+        let wxButton = APButton()
+        wxButton.setTitle("微信登录", for: .normal)
+        wxButton.setTitleColor(.white, for: .normal)
+        wxButton.titleLabel?.font = BoldFont_16_Fit
+        wxButton.layer.cornerRadius = 20
+        wxButton.activityIndicator.color = .white
+        wxButton.layer.masksToBounds = true
+        wxButton.addTarget(self, action: #selector(sendWXLoginActionMothod), for: .touchUpInside)
+        return wxButton
+    }()
+    
     var is_agree : Bool = false //是否同意协议
     var country : String = "86"
     var timeOut = 30//多少秒计时器
@@ -204,6 +217,12 @@ class CNLiveLoginViewController : CNLiveBaseViewController, UITextViewDelegate {
         }
     }
  
+    @objc func sendWXLoginActionMothod() {
+        CNLiveShareImageManager.send(CNLiveSendAuthRespWX) { resp, userInfo, error in
+            
+        }
+    }
+    
     func setupLoginButtonView() {
  
         let selectButton = HotButton(type: .custom)
@@ -239,16 +258,25 @@ class CNLiveLoginViewController : CNLiveBaseViewController, UITextViewDelegate {
             make.right.equalTo(view.snp.right).offset(-25)
         }
  
-
+        view.addSubview(wxButton)
+        wxButton.snp.makeConstraints { make in
+            make.centerX.equalTo(view)
+            make.bottom.equalTo(textView.snp.top).offset(-10)
+            make.left.equalTo(40)
+            make.right.equalTo(-40)
+            make.height.equalTo(40)
+        }
         view.addSubview(loginButton)
         loginButton.snp.makeConstraints { make in
             make.centerX.equalTo(view)
-            make.bottom.equalTo(textView.snp.top).offset(-10)
+            make.bottom.equalTo(wxButton.snp.top).offset(-10)
             make.left.equalTo(40)
             make.right.equalTo(-40)
             make.height.equalTo(40)
         }
+
         loginButton.setGradient(colors: [UIColor(red: 103/255.0, green: 197/255.0, blue: 255/255.0, alpha: 0.3),UIColor(red: 96/255.0, green: 154/255.0, blue: 255/255.0, alpha: 0.3)], startPoint: CGPoint(x: 0, y: 0.5), endPoint: CGPoint(x: 1, y: 0.5))
+        wxButton.setGradient(colors: [UIColor(red: 35/255.0, green: 203/255.0, blue: 105/255.0, alpha: 0.3),UIColor(red: 13/255.0, green: 179/255.0, blue: 85/255.0, alpha: 0.3)], startPoint: CGPoint(x: 0, y: 0.5), endPoint: CGPoint(x: 1, y: 0.5))
     }
 }
  
@@ -274,8 +302,10 @@ extension CNLiveLoginViewController {
         is_agree = sender.isSelected
         if is_agree {
             loginButton.setGradient(colors: [UIColor(red: 103/255.0, green: 197/255.0, blue: 255/255.0, alpha: 1),UIColor(red: 96/255.0, green: 154/255.0, blue: 255/255.0, alpha: 1)], startPoint: CGPoint(x: 0, y: 0.5), endPoint: CGPoint(x: 1, y: 0.5))
+            wxButton.setGradient(colors: [UIColor(red: 35/255.0, green: 203/255.0, blue: 105/255.0, alpha: 1),UIColor(red: 13/255.0, green: 179/255.0, blue: 85/255.0, alpha: 1)], startPoint: CGPoint(x: 0, y: 0.5), endPoint: CGPoint(x: 1, y: 0.5))
         } else {
             loginButton.setGradient(colors: [UIColor(red: 103/255.0, green: 197/255.0, blue: 255/255.0, alpha: 0.3),UIColor(red: 96/255.0, green: 154/255.0, blue: 255/255.0, alpha: 0.3)], startPoint: CGPoint(x: 0, y: 0.5), endPoint: CGPoint(x: 1, y: 0.5))
+            wxButton.setGradient(colors: [UIColor(red: 35/255.0, green: 203/255.0, blue: 105/255.0, alpha: 0.3),UIColor(red: 13/255.0, green: 179/255.0, blue: 85/255.0, alpha: 0.3)], startPoint: CGPoint(x: 0, y: 0.5), endPoint: CGPoint(x: 1, y: 0.5))
         }
     }
  
@@ -7,6 +7,9 @@
  
 import Foundation
  
+class LoginAuthTipView: UIView {
+    
+}
  
 class LoginAuthInfoView : UIView {
  
@@ -23,6 +23,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         // Override point for customization after application launch.
         //tencentAppId  wxAppId
         CNLiveShareManager.registeredShareView(whenDidFinishLaunch: universalLinkURL, appId: APPId, tencentAppId: tencentAppId, wxAppId: wxAppId, wxSecret: "", weiBoAppId: "")
+        CNLiveShareImageManager().wxAppid = wxAppId
+        CNLiveShareImageManager().wxSecret = wxSecret
  
         CNLiveNetworking.networkStatus { status in
  
@@ -2,6 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>com.apple.developer.applesignin</key>
+	<array>
+		<string>Default</string>
+	</array>
 	<key>com.apple.developer.associated-domains</key>
 	<array>
 		<string>applinks:metacode.cnlive.com</string>