API変更に追従。

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/liveview/CanvasView.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/liveview/CanvasView.kt
index 60f0594..21fcd3d 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/liveview/CanvasView.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/liveview/CanvasView.kt
@@ -42,14 +42,9 @@ class CanvasView : View
         Log.v(TAG, "initComponent")
     }
 
-    override fun onDraw(canvas: Canvas?)
+    override fun onDraw(canvas: Canvas)
     {
         super.onDraw(canvas)
-        if (canvas == null)
-        {
-            Log.v(TAG, " ===== onDraw : canvas is not ready. ==== ")
-            return
-        }
         //Log.v(TAG, " ----- onDraw() ----- ")
         //canvas.drawARGB(255, 0, 0, 0)
 

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/liveview/LiveImageView.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/liveview/LiveImageView.kt
index cae6cd5..fc9e27e 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/liveview/LiveImageView.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/liveview/LiveImageView.kt
@@ -120,14 +120,9 @@ class LiveImageView : View, ILiveView, ILiveViewRefresher, IShowGridFrame, OnSee
         refreshCanvas()
     }
 
-    override fun onDraw(canvas: Canvas?)
+    override fun onDraw(canvas: Canvas)
     {
         super.onDraw(canvas)
-        if (canvas == null)
-        {
-            Log.v(TAG, " ===== onDraw : canvas is not ready. ==== ")
-            return
-        }
         if (anotherDrawer != null)
         {
             // 別の描画ロジックを使う場合...