Merge branch 'release/0.10.0'

nuomi1 · Feb 1, 2021 · 8713d0e · 8713d0e
2 parents 9c1d7aa + 5aa2e22
commit 8713d0e
Show file tree

Hide file tree

Showing 10 changed files with 574 additions and 16 deletions.
diff --git a/Example/NBus/AppDelegate.swift b/Example/NBus/AppDelegate.swift
@@ -199,6 +199,8 @@ extension AppDelegate {
         let pasteboard = UIPasteboard.general
 
         pasteboard.items = []
+
+        pasteboard.string = "NBus"
     }
 
     private func clearUserDefaults() {

diff --git a/Example/NBus/Model/AppState.swift b/Example/NBus/Model/AppState.swift
@@ -88,10 +88,16 @@ extension AppState {
             logger.debug("\(message)", file: file, function: function, line: line)
         }
 
+        let wechatHandler = WechatHandler(
+            appID: AppState.getAppID(for: Platforms.wechat)!,
+            universalLink: AppState.getUniversalLink(for: Platforms.wechat)!
+        )
+
         let wechatItem = AppState.PlatformItem(
             platform: Platforms.wechat,
             category: .sdk,
             handlers: [
+                .bus: wechatHandler,
                 .sdk: wechatSDKHandler,
             ],
             viewController: { PlatformViewController() }

diff --git a/Example/NBus/Model/MediaSource.swift b/Example/NBus/Model/MediaSource.swift
@@ -124,11 +124,16 @@ enum MediaSource {
 
         let miniProgramID = AppState.getMiniProgramID(for: Platforms.wechat)!
 
+        let dataAsset = NSDataAsset(name: "giphy-J1ZajKJKzD0PK")!
+        let data = dataAsset.data
+        let thumbnail = UIImage(data: data)?.jpegData(compressionQuality: 0.2)
+
         return Messages.miniProgram(
             miniProgramID: miniProgramID,
             path: path,
             link: url,
-            miniProgramType: .release
+            miniProgramType: .release,
+            thumbnail: thumbnail
         )
     }()
 }
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,30 +1,33 @@
 PODS:
-  - NBus/BusHandlers (0.8.1):
+  - NBus/BusHandlers (0.9.1):
     - NBus/QQHandler
     - NBus/SystemHandler
+    - NBus/WechatHandler
     - NBus/WeiboHandler
-  - NBus/Core (0.8.1)
-  - NBus/QQHandler (0.8.1):
+  - NBus/Core (0.9.1)
+  - NBus/QQHandler (0.9.1):
     - NBus/Core
-  - NBus/QQSDK (0.8.1)
-  - NBus/QQSDKHandler (0.8.1):
+  - NBus/QQSDK (0.9.1)
+  - NBus/QQSDKHandler (0.9.1):
     - NBus/Core
     - NBus/QQSDK
-  - NBus/SDKHandlers (0.8.1):
+  - NBus/SDKHandlers (0.9.1):
     - NBus/QQSDKHandler
     - NBus/SystemHandler
     - NBus/WechatSDKHandler
     - NBus/WeiboSDKHandler
-  - NBus/SystemHandler (0.8.1):
+  - NBus/SystemHandler (0.9.1):
     - NBus/Core
-  - NBus/WechatSDK (0.8.1)
-  - NBus/WechatSDKHandler (0.8.1):
+  - NBus/WechatHandler (0.9.1):
+    - NBus/Core
+  - NBus/WechatSDK (0.9.1)
+  - NBus/WechatSDKHandler (0.9.1):
     - NBus/Core
     - NBus/WechatSDK
-  - NBus/WeiboHandler (0.8.1):
+  - NBus/WeiboHandler (0.9.1):
     - NBus/Core
-  - NBus/WeiboSDK (0.8.1)
-  - NBus/WeiboSDKHandler (0.8.1):
+  - NBus/WeiboSDK (0.9.1)
+  - NBus/WeiboSDKHandler (0.9.1):
     - NBus/Core
     - NBus/WeiboSDK
   - PinLayout (1.9.3)
@@ -59,7 +62,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  NBus: 97c14cb69f0ec19bd0752f5e25a3518849b81f8c
+  NBus: 8ecb3a7eb79360d65d22b5ca785164ca371f106d
   PinLayout: 4d8733121f8687edcc8f00c19bf1379d12808767
   RxCocoa: 3f79328fafa3645b34600f37c31e64c73ae3a80e
   RxRelay: 8d593be109c06ea850df027351beba614b012ffb

diff --git a/NBus.podspec b/NBus.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = "NBus"
-  s.version = "0.9.1"
+  s.version = "0.10.0"
   s.summary = "A short description of NBus."
 
   s.homepage = "https://github.com/nuomi1/NBus"
@@ -16,6 +16,7 @@ Pod::Spec.new do |s|
 
   s.subspec "BusHandlers" do |ss|
     ss.dependency "NBus/QQHandler"
+    ss.dependency "NBus/WechatHandler"
     ss.dependency "NBus/WeiboHandler"
     ss.dependency "NBus/SystemHandler"
   end
@@ -51,6 +52,12 @@ Pod::Spec.new do |s|
     ss.source_files = ["NBus/Classes/Handler/WechatSDKHandler.swift"]
   end
 
+  s.subspec "WechatHandler" do |ss|
+    ss.dependency "NBus/Core"
+
+    ss.source_files = ["NBus/Classes/Handler/WechatHandler.swift"]
+  end
+
   s.subspec "WeiboSDKHandler" do |ss|
     ss.dependency "NBus/Core"
     ss.dependency "NBus/WeiboSDK"

diff --git a/NBus/Classes/Core/Bus+Helper.swift b/NBus/Classes/Core/Bus+Helper.swift
@@ -6,6 +6,7 @@
 //  Copyright © 2020 nuomi1. All rights reserved.
 //
 
+import CommonCrypto
 import Foundation
 
 extension Dictionary: BusCompatible {}
@@ -30,6 +31,18 @@ extension BusWrapper where Base == String {
     var base64EncodedString: String? {
         base.data(using: .utf8)?.base64EncodedString()
     }
+
+    var sha1: String? {
+        let data = Data(base.utf8)
+
+        var digest = [UInt8](repeating: 0, count: Int(CC_SHA1_DIGEST_LENGTH))
+        data.withUnsafeBytes { pointer in
+            _ = CC_SHA1(pointer.baseAddress, CC_LONG(data.count), &digest)
+        }
+
+        let bytes = digest.map { String(format: "%02hhx", $0) }
+        return bytes.joined()
+    }
 }
 
 extension NSObject: BusCompatible {}

diff --git a/NBus/Classes/Core/Bus.swift b/NBus/Classes/Core/Bus.swift
@@ -155,5 +155,10 @@ extension Bus {
 
             public static let accessToken = Bus.OauthInfoKey(rawValue: "com.nuomi1.bus.weibo.accessToken")
         }
+
+        enum Wechat {
+
+            public static let code = Bus.OauthInfoKey(rawValue: "com.nuomi1.bus.wechat.code")
+        }
     }
 }