update appliance plugin to 1.0.4

app/src/main/java/com/herewhite/demo/RoomActivity.java

@@ -12,6 +12,7 @@
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.Toast;
 
 import androidx.annotation.VisibleForTesting;

app/src/main/java/com/herewhite/demo/StartActivity.java

@@ -11,6 +11,7 @@
 import com.herewhite.demo.common.DemoAPI;
 import com.herewhite.demo.test.window.WindowAppliancePluginActivity;
 import com.herewhite.demo.test.window.WindowAppsActivity;
+import com.herewhite.demo.test.window.WindowNoAppliancePluginActivity;
 import com.herewhite.demo.test.window.WindowTestActivity;
 
 public class StartActivity extends AppCompatActivity {
@@ -137,4 +138,14 @@ public void appliancePlugin(View view) {
         Intent intent = new Intent(this, WindowAppliancePluginActivity.class);
         startActivity(intent);
     }
+
+    public void noAppliancePlugin(View view) {
+        if (demoAPI.invalidToken()) {
+            tokenAlert();
+            return;
+        }
+
+        Intent intent = new Intent(this, WindowNoAppliancePluginActivity.class);
+        startActivity(intent);
+    }
 }

app/src/main/java/com/herewhite/demo/test/window/WindowAppliancePluginActivity.java

@@ -1,14 +1,19 @@
 package com.herewhite.demo.test.window;
 
+import android.graphics.Bitmap;
 import android.view.View;
+import android.widget.ImageView;
 
+import com.herewhite.demo.R;
 import com.herewhite.demo.common.SampleBaseActivity;
 import com.herewhite.demo.databinding.ActivityWindowAppliancePluginBinding;
 import com.herewhite.sdk.WhiteSdkConfiguration;
 import com.herewhite.sdk.domain.Appliance;
 import com.herewhite.sdk.domain.CameraConfig;
 import com.herewhite.sdk.domain.ImageInformationWithUrl;
 import com.herewhite.sdk.domain.MemberState;
+import com.herewhite.sdk.domain.Promise;
+import com.herewhite.sdk.domain.SDKError;
 import com.herewhite.sdk.domain.ShapeType;
 import com.herewhite.sdk.domain.StrokeType;
 import com.herewhite.sdk.domain.WindowAppParam;
@@ -110,6 +115,38 @@ protected void initView() {
             config.setScale(1d);
             room.moveCamera(config);
         });
+
+        binding.snapshot.setOnClickListener( v -> {
+            room.getSceneSnapshotImage("/init", new Promise<Bitmap>() {
+                @Override
+                public void then(Bitmap bitmap) {
+                    ImageView viewById = findViewById(R.id.iv_bitmap);
+                    viewById.setImageBitmap(bitmap);
+                    logAction("get bitmap");
+                }
+
+                @Override
+                public void catchEx(SDKError t) {
+                    logAction("get bitmap error");
+                }
+            });
+        });
+
+        binding.scenePreview.setOnClickListener(v -> {
+            room.getScenePreviewImage("/init", new Promise<Bitmap>() {
+                @Override
+                public void then(Bitmap bitmap) {
+                    ImageView viewById = findViewById(R.id.iv_bitmap);
+                    viewById.setImageBitmap(bitmap);
+                    logAction("get bitmap");
+                }
+
+                @Override
+                public void catchEx(SDKError t) {
+                    logAction("get bitmap error");
+                }
+            });
+        });
     }
 
     protected WhiteSdkConfiguration generateSdkConfig() {

app/src/main/java/com/herewhite/demo/test/window/WindowNoAppliancePluginActivity.java

@@ -1,14 +1,19 @@
 package com.herewhite.demo.test.window;
 
+import android.graphics.Bitmap;
 import android.view.View;
+import android.widget.ImageView;
 
+import com.herewhite.demo.R;
 import com.herewhite.demo.common.SampleBaseActivity;
 import com.herewhite.demo.databinding.ActivityWindowAppliancePluginBinding;
 import com.herewhite.sdk.WhiteSdkConfiguration;
 import com.herewhite.sdk.domain.Appliance;
 import com.herewhite.sdk.domain.CameraConfig;
 import com.herewhite.sdk.domain.ImageInformationWithUrl;
 import com.herewhite.sdk.domain.MemberState;
+import com.herewhite.sdk.domain.Promise;
+import com.herewhite.sdk.domain.SDKError;
 import com.herewhite.sdk.domain.ShapeType;
 import com.herewhite.sdk.domain.StrokeType;
 import com.herewhite.sdk.domain.WindowAppParam;
@@ -33,11 +38,7 @@ protected void initView() {
         });
 
         binding.insertImage.setOnClickListener(v -> {
-            room.insertImage(new ImageInformationWithUrl(0d,
-                    0d,
-                    100d,
-                    200d,
-                    "https://p5.ssl.qhimg.com/t01a2bd87890397464a.png"));
+            room.insertImage(new ImageInformationWithUrl(0d, 0d, 100d, 200d, "https://p5.ssl.qhimg.com/t01a2bd87890397464a.png"));
         });
 
         binding.redo.setOnClickListener(v -> {
@@ -109,6 +110,38 @@ protected void initView() {
             config.setScale(1d);
             room.moveCamera(config);
         });
+
+        binding.snapshot.setOnClickListener(v -> {
+            room.getSceneSnapshotImage("/init", new Promise<Bitmap>() {
+                @Override
+                public void then(Bitmap bitmap) {
+                    ImageView viewById = findViewById(R.id.iv_bitmap);
+                    viewById.setImageBitmap(bitmap);
+                    logAction("get bitmap");
+                }
+
+                @Override
+                public void catchEx(SDKError t) {
+                    logAction("get bitmap error");
+                }
+            });
+        });
+
+        binding.scenePreview.setOnClickListener(v -> {
+            room.getScenePreviewImage("/init", new Promise<Bitmap>() {
+                @Override
+                public void then(Bitmap bitmap) {
+                    ImageView viewById = findViewById(R.id.iv_bitmap);
+                    viewById.setImageBitmap(bitmap);
+                    logAction("get bitmap");
+                }
+
+                @Override
+                public void catchEx(SDKError t) {
+                    logAction("get bitmap error");
+                }
+            });
+        });
     }
 
     protected WhiteSdkConfiguration generateSdkConfig() {

app/src/main/res/layout/activity_window_appliance_plugin.xml

@@ -9,6 +9,13 @@
         android:layout_height="match_parent"
         android:visibility="visible" />
 
+    <ImageView
+        android:id="@+id/iv_bitmap"
+        android:layout_width="300dp"
+        android:layout_height="200dp"
+        android:layout_gravity="end"
+        android:background="#CCCCCC" />
+
     <HorizontalScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -20,6 +27,16 @@
             android:layout_height="wrap_content"
             android:orientation="horizontal">
 
+            <Button
+                android:id="@+id/snapshot"
+                style="@style/TestButton"
+                android:text="snapshot" />
+
+            <Button
+                android:id="@+id/scenePreview"
+                style="@style/TestButton"
+                android:text="scenePreview" />
+
             <Button
                 android:id="@+id/insertNewDynamic"
                 style="@style/TestButton"

app/src/main/res/layout/content_start.xml

@@ -73,6 +73,14 @@
             android:layout_height="wrap_content"
             android:onClick="appliancePlugin"
             android:text="@string/appliancePlugin" />
+
+        <Button
+            android:id="@+id/button9"
+            style="@style/HomeTestButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:onClick="noAppliancePlugin"
+            android:text="@string/noAppliancePlugin" />
     </LinearLayout>
 
 </ScrollView>

app/src/main/res/values/strings.xml

@@ -53,6 +53,7 @@
     <string name="windowAppsTest">Apps</string>
     <string name="fullScreenTest">Fullscreen</string>
     <string name="appliancePlugin">AppliancePlugin</string>
+    <string name="noAppliancePlugin">NoAppliancePlugin</string>
 
     <!--ijkplayer-->
     <string name="N_A">N/A</string>

carrot.yml

@@ -1,4 +1,4 @@
 - name: whiteboard-bridge
   repoPath: ../whiteboard-bridge
   repoURL: 'https://github.com/netless-io/whiteboard-bridge.git'
-  commit: fb4886c
+  commit: '5118914'

sdk/src/main/assets/whiteboard/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="UTF-8"><meta content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0" name="viewport"/><meta http-equiv="X-UA-Compatible" content="ie=edge"><title>white-sdk-bridge Application</title><script defer="defer" src="runtime.94c1d79a.js"></script><script defer="defer" src="web-sdk.146b42d7.js"></script><script defer="defer" src="netless.f21653ed.js"></script><script defer="defer" src="video.16e43ef6.js"></script><script defer="defer" src="vendor.12b78d47.js"></script><script defer="defer" src="main.4e1f79d9.js"></script><link href="netless.css" rel="stylesheet"><link href="vendor.css" rel="stylesheet"><link href="main.css" rel="stylesheet"></head><body><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="UTF-8"><meta content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0" name="viewport"/><meta http-equiv="X-UA-Compatible" content="ie=edge"><title>white-sdk-bridge Application</title><script defer="defer" src="runtime.94c1d79a.js"></script><script defer="defer" src="web-sdk.146b42d7.js"></script><script defer="defer" src="netless.ec08ede9.js"></script><script defer="defer" src="video.16e43ef6.js"></script><script defer="defer" src="vendor.12b78d47.js"></script><script defer="defer" src="main.670a54a5.js"></script><link href="netless.css" rel="stylesheet"><link href="vendor.css" rel="stylesheet"><link href="main.css" rel="stylesheet"></head><body><div id="root"></div></body></html>