Bump up HaishinKit.kt to 0.13.2

shogo4405 · Feb 25, 2024 · e3477ab · e3477ab
1 parent fafc22d
commit e3477ab
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 17 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -47,5 +47,5 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.shogo4405.HaishinKit~kt:haishinkit:0.13.1'
+    implementation 'com.github.shogo4405.HaishinKit~kt:haishinkit:0.13.2'
 }
diff --git a/android/src/main/kotlin/com/haishinkit/haishin_kit/HaishinKitPlugin.kt b/android/src/main/kotlin/com/haishinkit/haishin_kit/HaishinKitPlugin.kt
@@ -2,7 +2,6 @@ package com.haishinkit.haishin_kit
 
 import android.os.Handler
 import android.os.Looper
-import androidx.annotation.NonNull
 import io.flutter.embedding.engine.plugins.FlutterPlugin
 import io.flutter.plugin.common.MethodCall
 import io.flutter.plugin.common.MethodChannel
@@ -24,13 +23,13 @@ class HaishinKitPlugin : FlutterPlugin, MethodCallHandler {
         handlers.remove(id)
     }
 
-    override fun onAttachedToEngine(@NonNull flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
+    override fun onAttachedToEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
         this.flutterPluginBinding = flutterPluginBinding
         channel = MethodChannel(flutterPluginBinding.binaryMessenger, CHANNEL_NAME)
         channel.setMethodCallHandler(this)
     }
 
-    override fun onMethodCall(@NonNull call: MethodCall, @NonNull result: Result) {
+    override fun onMethodCall(call: MethodCall, result: Result) {
         val memory = call.argument<Int>("memory")
         if (memory != null) {
             val handler = handlers[memory]
@@ -66,7 +65,7 @@ class HaishinKitPlugin : FlutterPlugin, MethodCallHandler {
         }
     }
 
-    override fun onDetachedFromEngine(@NonNull binding: FlutterPlugin.FlutterPluginBinding) {
+    override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) {
         channel.setMethodCallHandler(null)
     }
 }
diff --git a/android/src/main/kotlin/com/haishinkit/haishin_kit/RtmpStreamHandler.kt b/android/src/main/kotlin/com/haishinkit/haishin_kit/RtmpStreamHandler.kt
@@ -167,7 +167,7 @@ class RtmpStreamHandler(
                     }
                     val handler = Handler()
                     handler.postDelayed({
-                        if (instance?.drawable != null) {
+                        if (instance?.view != null) {
                             camera?.open(facing)
                         }
                     }, 750)
@@ -177,15 +177,15 @@ class RtmpStreamHandler(
 
             "$TAG#registerTexture" -> {
                 val netStream = instance
-                if (netStream?.drawable == null) {
+                if (netStream?.view == null) {
                     val texture = StreamDrawableTexture(plugin.flutterPluginBinding)
                     texture.attachStream(netStream)
                     if (camera?.stream != null) {
                         camera?.open()
                     }
                     result.success(texture.id)
                 } else {
-                    val texture = (netStream.drawable as? StreamDrawableTexture)
+                    val texture = (netStream.view as? StreamDrawableTexture)
                     result.success(texture?.id)
                 }
             }
@@ -196,13 +196,13 @@ class RtmpStreamHandler(
 
             "$TAG#updateTextureSize" -> {
                 val netStream = instance
-                if (netStream?.drawable != null) {
-                    val texture = (netStream.drawable as? StreamDrawableTexture)
+                if (netStream?.view != null) {
+                    val texture = (netStream.view as? StreamDrawableTexture)
                     val width = call.argument<Double>("width") ?: 0
                     val height = call.argument<Double>("height") ?: 0
                     texture?.imageExtent = Size(width.toInt(), height.toInt())
                     (plugin.flutterPluginBinding.applicationContext.getSystemService(Context.WINDOW_SERVICE) as? WindowManager)?.defaultDisplay?.orientation?.let {
-                        netStream.videoSource?.screen?.deviceOrientation = it
+                        camera?.video?.deviceOrientation = it
                     }
                     result.success(texture?.id)
                 } else {

diff --git a/android/src/main/kotlin/com/haishinkit/haishin_kit/StreamDrawableTexture.kt b/android/src/main/kotlin/com/haishinkit/haishin_kit/StreamDrawableTexture.kt
@@ -6,12 +6,12 @@ import com.haishinkit.graphics.PixelTransform
 import com.haishinkit.graphics.VideoGravity
 import com.haishinkit.graphics.effect.VideoEffect
 import com.haishinkit.media.Stream
-import com.haishinkit.media.StreamDrawable
+import com.haishinkit.media.StreamView
 import io.flutter.embedding.engine.plugins.FlutterPlugin
 import io.flutter.view.TextureRegistry
 
 class StreamDrawableTexture(binding: FlutterPlugin.FlutterPluginBinding) :
-    StreamDrawable {
+    StreamView {
     override var videoGravity: VideoGravity
         get() = pixelTransform.videoGravity
         set(value) {
@@ -46,9 +46,9 @@ class StreamDrawableTexture(binding: FlutterPlugin.FlutterPluginBinding) :
 
     private var stream: Stream? = null
         set(value) {
-            field?.drawable = null
+            field?.view = null
             field = value
-            field?.drawable = this
+            field?.view = this
             pixelTransform.screen = value?.screen
         }
 

diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.0'
+        classpath 'com.android.tools.build:gradle:8.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip