tv-casting-app: Implemented getDeviceProxy, used android chip IM

examples/tv-casting-app/android/App/app/src/main/java/com/chip/casting/util/GlobalCastingConstants.java

@@ -6,5 +6,5 @@ public class GlobalCastingConstants {
  public static final int SetupPasscode = 20202021;
  public static final int Discriminator = 0xF00;
  public static final boolean ChipCastingSimplified =
- false; // set this flag to true to demo simplified casting APIs
+ true; // set this flag to true to demo simplified casting APIs
 }

examples/tv-casting-app/android/App/app/src/main/java/com/matter/casting/ContentLauncherLaunchURLExampleFragment.java

@@ -23,10 +23,15 @@
 import android.view.ViewGroup;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
+import chip.devicecontroller.ChipClusters;
 import com.R;
 import com.matter.casting.core.CastingPlayer;
 import com.matter.casting.core.Endpoint;
+import com.matter.casting.core.MatterEndpoint;
+import com.matter.casting.support.MatterCallback;
+import com.matter.casting.support.MatterError;
 import java.util.List;
+import java.util.Optional;
 
 /** A {@link Fragment} to send Content Launcher LaunchURL command from the TV Casting App. */
 public class ContentLauncherLaunchURLExampleFragment extends Fragment {
@@ -73,7 +78,42 @@ public View onCreateView(
  return;
  }
 
- // TODO: add command invocation API call
+ // TODO: complete command invocation API implementation
+ ((MatterEndpoint) endpoint)
+ .getDeviceProxy(
+ new MatterCallback<Long>() {
+ @Override
+ public void handle(Long device) {
+ Log.d(TAG, "getDeviceProxy success. Device: " + device);
+
+ if (device != null) {
+ ChipClusters.ContentLauncherCluster cluster =
+ new ChipClusters.ContentLauncherCluster(device, endpoint.getId());
+ Log.d(TAG, "Content launcher cluster created " + cluster);
+ cluster.launchURL(
+ new ChipClusters.ContentLauncherCluster.LauncherResponseCallback() {
+ @Override
+ public void onSuccess(Integer status, Optional<String> data) {
+ Log.d(TAG, "Content launcher success " + status + data);
+ }
+
+ @Override
+ public void onError(Exception error) {
+ Log.e(TAG, "Content launcher failure " + error);
+ }
+ },
+ "my test url",
+ Optional.of("my display str"),
+ Optional.empty());
+ }
+ }
+ },
+ new MatterCallback<MatterError>() {
+ @Override
+ public void handle(MatterError err) {
+ Log.e(TAG, "getDeviceProxy err" + err);
+ }
+ });
  };
  return inflater.inflate(R.layout.fragment_content_launcher, container, false);
  }

examples/tv-casting-app/android/App/app/src/main/jni/com/matter/casting/core/MatterEndpoint.java

@@ -17,6 +17,8 @@
 package com.matter.casting.core;
 
 import com.matter.casting.support.DeviceTypeStruct;
+import com.matter.casting.support.MatterCallback;
+import com.matter.casting.support.MatterError;
 import java.util.List;
 import java.util.Objects;
 
@@ -39,6 +41,9 @@ public class MatterEndpoint implements Endpoint {
  @Override
  public native CastingPlayer getCastingPlayer();
 
+ public native void getDeviceProxy(
+ MatterCallback<Long> successCallback, MatterCallback<MatterError> failureCallback);
+
  @Override
  public String toString() {
  return "MatterEndpoint{" + "id=" + getId() + '}';

examples/tv-casting-app/android/App/app/src/main/jni/cpp/core/MatterEndpoint-JNI.cpp

@@ -19,7 +19,6 @@
 #include "MatterEndpoint-JNI.h"
 
 #include "../JNIDACProvider.h"
-#include "../support/Converters-JNI.h"
 #include "../support/MatterCallback-JNI.h"
 #include "../support/RotatingDeviceIdUniqueIdProvider-JNI.h"
 #include "clusters/Clusters.h" // from tv-casting-common
@@ -86,6 +85,30 @@ JNI_METHOD(jobject, getCastingPlayer)
  return support::convertCastingPlayerFromCppToJava(std::shared_ptr<CastingPlayer>(endpoint->GetCastingPlayer()));
 }
 
+JNI_METHOD(void, getDeviceProxy)
+(JNIEnv * env, jobject thiz, jobject jSuccessCallback, jobject jFailureCallback)
+{
+ chip::DeviceLayer::StackLock lock;
+ ChipLogProgress(AppServer, "MatterEndpoint-JNI::getDeviceProxy() called");
+ Endpoint * endpoint = support::convertEndpointFromJavaToCpp(thiz);
+ VerifyOrReturn(endpoint != nullptr, ChipLogError(AppServer, "MatterEndpoint-JNI::getDeviceProxy() endpoint == nullptr"));
+
+ ReturnOnFailure(MatterEndpointJNIMgr().mGetDeviceProxySuccessHandler.SetUp(env, jSuccessCallback));
+ ReturnOnFailure(MatterEndpointJNIMgr().mGetDeviceProxyFailureHandler.SetUp(env, jFailureCallback));
+
+ endpoint->GetCastingPlayer()->FindOrEstablishSession(
+ nullptr,
+ [](void * context, chip::Messaging::ExchangeManager & exchangeMgr, const chip::SessionHandle & sessionHandle) {
+ ChipLogProgress(AppServer, "MatterEndpointJNI FindOrEstablishSession success");
+ OperationalDeviceProxy * device = new OperationalDeviceProxy(&exchangeMgr, sessionHandle); // TODO: delete *device
+ MatterEndpointJNIMgr().mGetDeviceProxySuccessHandler.Handle(device);
+ },
+ [](void * context, const chip::ScopedNodeId & peerId, CHIP_ERROR error) {
+ ChipLogError(AppServer, "MatterEndpointJNI FindOrEstablishSession failure %" CHIP_ERROR_FORMAT, error.Format());
+ MatterEndpointJNIMgr().mGetDeviceProxyFailureHandler.Handle(error);
+ });
+}
+
 }; // namespace core
 }; // namespace casting
 }; // namespace matter

examples/tv-casting-app/android/App/app/src/main/jni/cpp/core/MatterEndpoint-JNI.h

@@ -18,8 +18,11 @@
 
 #pragma once
 
+#include "../support/Converters-JNI.h"
+#include "../support/MatterCallback-JNI.h"
 #include "core/Endpoint.h" // from tv-casting-common
 
+#include <app/DeviceProxy.h>
 #include <jni.h>
 #include <lib/support/JniReferences.h>
 #include <lib/support/JniTypeWrappers.h>
@@ -30,6 +33,15 @@ namespace core {
 
 class MatterEndpointJNI
 {
+public:
+ MatterEndpointJNI() :
+ mGetDeviceProxySuccessHandler([](chip::DeviceProxy * device) -> jobject {
+ return support::convertLongFromCppToJava(reinterpret_cast<jlong>(device));
+ })
+ {}
+ support::MatterCallbackJNI<chip::DeviceProxy *> mGetDeviceProxySuccessHandler;
+ support::MatterFailureCallbackJNI mGetDeviceProxyFailureHandler;
+
 private:
  friend MatterEndpointJNI & MatterEndpointJNIMgr();
  static MatterEndpointJNI sInstance;

examples/tv-casting-app/android/App/app/src/main/jni/cpp/support/Converters-JNI.cpp

@@ -25,6 +25,30 @@ namespace support {
 
 using namespace chip;
 
+jobject convertLongFromCppToJava(jlong value)
+{
+ ChipLogProgress(AppServer, "convertLongFromCppToJava called");
+ JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+ VerifyOrReturnValue(env != nullptr, nullptr, ChipLogError(AppServer, "Could not get JNIEnv for current thread"));
+
+ jclass responseTypeClass = env->FindClass("java/lang/Long");
+ if (responseTypeClass == nullptr)
+ {
+ ChipLogError(AppServer, "ConvertToJObject: Class for Response Type not found!");
+ env->ExceptionClear();
+ return nullptr;
+ }
+
+ jmethodID constructor = env->GetMethodID(responseTypeClass, "<init>", "(J)V");
+ if (constructor == nullptr)
+ {
+ ChipLogError(AppServer, "Failed to access Long constructor");
+ env->ExceptionClear();
+ return nullptr;
+ }
+ return env->NewObject(responseTypeClass, constructor, value);
+}
+
 jobject convertMatterErrorFromCppToJava(CHIP_ERROR inErr)
 {
  ChipLogProgress(AppServer, "convertMatterErrorFromCppToJava() called");

examples/tv-casting-app/android/App/app/src/main/jni/cpp/support/Converters-JNI.h

@@ -29,6 +29,8 @@ namespace matter {
 namespace casting {
 namespace support {
 
+jobject convertLongFromCppToJava(jlong value);
+
 jobject convertMatterErrorFromCppToJava(CHIP_ERROR inErr);
 
 /**

examples/tv-casting-app/android/App/app/src/main/jni/cpp/support/MatterCallback-JNI.h

@@ -53,7 +53,7 @@ class MatterCallbackJNI
  VerifyOrReturnError(mSuperClazz != nullptr, CHIP_JNI_ERROR_TYPE_NOT_FOUND,
  ChipLogError(AppServer, "Failed to get callback's parent's Java class"));
 
- mMethod = env->GetMethodID(mClazz, "handleInternal", mMethodSignature);
+ mMethod = env->GetMethodID(mSuperClazz, "handleInternal", mMethodSignature);
  VerifyOrReturnError(
  mMethod != nullptr, CHIP_JNI_ERROR_METHOD_NOT_FOUND,
  ChipLogError(AppServer, "Failed to access 'handleInternal' method with signature %s", mMethodSignature));

examples/tv-casting-app/android/BUILD.gn

@@ -55,6 +55,7 @@ shared_library("jni") {
  "${chip_root}/examples/tv-casting-app/tv-casting-common",
  "${chip_root}/src/app/data-model:heap",
  "${chip_root}/src/app/server/java:jni",
+ "${chip_root}/src/controller/java:android_chip_im",
  "${chip_root}/src/lib",
  "${chip_root}/third_party/inipp",
  ]
@@ -72,6 +73,8 @@ android_library("java") {
  deps = [
  ":android",
  "${chip_root}/src/app/server/java",
+
+ #"${chip_root}/src/controller/java:android_interaction_model",
  "${chip_root}/src/platform/android:java",
  "${chip_root}/third_party/android_deps:annotation",
  ]
@@ -120,7 +123,84 @@ android_library("java") {
  "App/app/src/main/jni/com/matter/casting/support/MatterError.java",
  ]
 
- javac_flags = [ "-Xlint:deprecation" ]
+ #########
+ sources += [
+ "${chip_root}/src/controller/java/src/chip/devicecontroller/ChipClusterException.java",
+ "${chip_root}/src/controller/java/src/chip/devicecontroller/ChipInteractionClient.java",
+ "${chip_root}/src/controller/java/src/chip/devicecontroller/ExtendableInvokeCallback.java",
+ "${chip_root}/src/controller/java/src/chip/devicecontroller/ExtendableInvokeCallbackJni.java",
+ "${chip_root}/src/controller/java/src/chip/devicecontroller/GetConnectedDeviceCallbackJni.java",
+ "${chip_root}/src/controller/java/src/chip/devicecontroller/InvokeCallback.java",
+ "${chip_root}/src/controller/java/src/chip/devicecontroller/InvokeCallbackJni.java",
+ "${chip_root}/src/controller/java/src/chip/devicecontroller/ReportCallback.java",
+ "${chip_root}/src/controller/java/src/chip/devicecontroller/ReportCallbackJni.java",
+ "${chip_root}/src/controller/java/src/chip/devicecontroller/ResubscriptionAttemptCallback.java",
+ "${chip_root}/src/controller/java/src/chip/devicecontroller/StatusException.java",
+ "${chip_root}/src/controller/java/src/chip/devicecontroller/SubscriptionEstablishedCallback.java",
+ "${chip_root}/src/controller/java/src/chip/devicecontroller/WriteAttributesCallback.java",
+ "${chip_root}/src/controller/java/src/chip/devicecontroller/WriteAttributesCallbackJni.java",
+ "${chip_root}/src/controller/java/src/chip/devicecontroller/model/AttributeState.java",
+ "${chip_root}/src/controller/java/src/chip/devicecontroller/model/AttributeWriteRequest.java",
+ "${chip_root}/src/controller/java/src/chip/devicecontroller/model/ChipAttributePath.java",
+ "${chip_root}/src/controller/java/src/chip/devicecontroller/model/ChipEventPath.java",
+ "${chip_root}/src/controller/java/src/chip/devicecontroller/model/ChipPathId.java",
+ "${chip_root}/src/controller/java/src/chip/devicecontroller/model/ClusterState.java",
+ "${chip_root}/src/controller/java/src/chip/devicecontroller/model/DataVersionFilter.java",
+ "${chip_root}/src/controller/java/src/chip/devicecontroller/model/EndpointState.java",
+ "${chip_root}/src/controller/java/src/chip/devicecontroller/model/EventState.java",
+ "${chip_root}/src/controller/java/src/chip/devicecontroller/model/InvokeElement.java",
+ "${chip_root}/src/controller/java/src/chip/devicecontroller/model/InvokeResponseData.java",
+ "${chip_root}/src/controller/java/src/chip/devicecontroller/model/NoInvokeResponseData.java",
+ "${chip_root}/src/controller/java/src/chip/devicecontroller/model/NodeState.java",
+ "${chip_root}/src/controller/java/src/chip/devicecontroller/model/Status.java",
+ ]
+
+ if (matter_enable_tlv_decoder_api) {
+ sources += [ "${chip_root}/src/controller/java/src/chip/devicecontroller/ChipTLVValueDecoder.java" ]
+ }
+
+ if (matter_enable_java_generated_api) {
+ sources += [
+ "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java",
+ "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/ChipEventStructs.java",
+ "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java",
+ "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java",
+ "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java",
+ "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/ClusterWriteMapping.java",
+ "${chip_root}/src/controller/java/src/chip/clusterinfo/ClusterCommandCallback.java",
+ "${chip_root}/src/controller/java/src/chip/clusterinfo/ClusterInfo.java",
+ "${chip_root}/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java",
+ "${chip_root}/src/controller/java/src/chip/clusterinfo/CommandResponseInfo.java",
+ "${chip_root}/src/controller/java/src/chip/clusterinfo/DelegatedClusterCallback.java",
+ "${chip_root}/src/controller/java/src/chip/clusterinfo/InteractionInfo.java",
+ "${chip_root}/src/controller/java/src/chip/devicecontroller/ChipTLVType.java",
+ ]
+ }
+
+ deps += [
+ "${chip_root}/src/controller/java/:chipcluster",
+ "${chip_root}/src/controller/java/:chipclusterID",
+ "${chip_root}/third_party/java_deps:annotation",
+ ]
+
+ if (matter_enable_java_compilation) {
+ deps += [
+ "${chip_root}/third_party/java_deps:json",
+ "${chip_root}/third_party/java_deps/stub_src",
+ ]
+ } else {
+ deps += [ "${chip_root}/src/controller/java/:android" ]
+
+ data_deps += [ "${chip_root}/build/chip/java:shared_cpplib" ]
+ }
+
+ javac_flags = [
+ "-Xlint:deprecation",
+ "-parameters", # Store infomation about method parameters
+ ]
+
+ ##############
+ #javac_flags = [ "-Xlint:deprecation" ]
 
  # TODO: add classpath support (we likely need to add something like
  # ..../platforms/android-26/android.jar to access BLE items)