diff --git a/app/src/main/java/com/herewhite/demo/RoomActivity.java b/app/src/main/java/com/herewhite/demo/RoomActivity.java index da74c075..0d027a4c 100644 --- a/app/src/main/java/com/herewhite/demo/RoomActivity.java +++ b/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; diff --git a/app/src/main/java/com/herewhite/demo/StartActivity.java b/app/src/main/java/com/herewhite/demo/StartActivity.java index 09044848..1a782fe1 100644 --- a/app/src/main/java/com/herewhite/demo/StartActivity.java +++ b/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); + } } diff --git a/app/src/main/java/com/herewhite/demo/test/window/WindowAppliancePluginActivity.java b/app/src/main/java/com/herewhite/demo/test/window/WindowAppliancePluginActivity.java index bde0ed76..5276e052 100644 --- a/app/src/main/java/com/herewhite/demo/test/window/WindowAppliancePluginActivity.java +++ b/app/src/main/java/com/herewhite/demo/test/window/WindowAppliancePluginActivity.java @@ -1,7 +1,10 @@ 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; @@ -9,6 +12,8 @@ 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() { + @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() { + @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() { diff --git a/app/src/main/java/com/herewhite/demo/test/window/WindowNoAppliancePluginActivity.java b/app/src/main/java/com/herewhite/demo/test/window/WindowNoAppliancePluginActivity.java index f3025249..a388df41 100644 --- a/app/src/main/java/com/herewhite/demo/test/window/WindowNoAppliancePluginActivity.java +++ b/app/src/main/java/com/herewhite/demo/test/window/WindowNoAppliancePluginActivity.java @@ -1,7 +1,10 @@ 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; @@ -9,6 +12,8 @@ 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() { + @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() { + @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() { diff --git a/app/src/main/res/layout/activity_window_appliance_plugin.xml b/app/src/main/res/layout/activity_window_appliance_plugin.xml index dba4a19f..d772005d 100644 --- a/app/src/main/res/layout/activity_window_appliance_plugin.xml +++ b/app/src/main/res/layout/activity_window_appliance_plugin.xml @@ -9,6 +9,13 @@ android:layout_height="match_parent" android:visibility="visible" /> + + +