From 6086984dfb5c8c2b3111fd4adb35806a63bfd547 Mon Sep 17 00:00:00 2001
From: Jeonghwan Kim <kim.jh@gsenc.com>
Date: Wed, 5 Apr 2023 21:12:35 +0900
Subject: [PATCH] [Android] Add Endpoint Number in Fragment (#25892)

---
 .../clusterclient/AddressUpdateFragment.kt    |  7 ++-
 .../clusterclient/BasicClientFragment.kt      |  8 ++-
 .../clusterclient/OnOffClientFragment.kt      | 11 +++-
 .../res/layout/address_update_fragment.xml    | 50 +++++++++++--------
 4 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/AddressUpdateFragment.kt b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/AddressUpdateFragment.kt
index 9e7c021aad039a..5579c04735d83b 100644
--- a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/AddressUpdateFragment.kt
+++ b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/AddressUpdateFragment.kt
@@ -20,7 +20,11 @@ class AddressUpdateFragment: Fragment() {
 
   val deviceId: Long
     get() = binding.deviceIdEd.text.toString().toULong().toLong()
-
+  var endpointId : Int
+    get() = binding.epIdEd.text.toString().toInt()
+    set(value) {
+      binding.epIdEd.setText(value.toString())
+    }
   private var _binding: AddressUpdateFragmentBinding? = null
   private val binding get() = _binding!!
 
@@ -39,6 +43,7 @@ class AddressUpdateFragment: Fragment() {
     val compressedFabricId = deviceController.compressedFabricId
     binding.fabricIdEd.setText(compressedFabricId.toULong().toString(16).padStart(16, '0'))
     binding.deviceIdEd.setText(DeviceIdUtil.getLastDeviceId(requireContext()).toString())
+    binding.epIdEd.setText(endpointId.toString())
   }
 
   override fun onDestroyView() {
diff --git a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/BasicClientFragment.kt b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/BasicClientFragment.kt
index 792850b7bc3f1a..9e73c5d4e645ea 100644
--- a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/BasicClientFragment.kt
+++ b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/BasicClientFragment.kt
@@ -42,7 +42,6 @@ class BasicClientFragment : Fragment() {
 
     addressUpdateFragment =
       childFragmentManager.findFragmentById(R.id.addressUpdateFragment) as AddressUpdateFragment
-
     binding.writeNodeLabelBtn.setOnClickListener { scope.launch {
       sendWriteNodeLabelAttribute()
       binding.nodeLabelEd.onEditorAction(EditorInfo.IME_ACTION_DONE)
@@ -480,10 +479,15 @@ class BasicClientFragment : Fragment() {
 
   private suspend fun getBasicClusterForDevice(): BasicInformationCluster {
     return BasicInformationCluster(
-      ChipClient.getConnectedDevicePointer(requireContext(), addressUpdateFragment.deviceId), ENDPOINT
+      ChipClient.getConnectedDevicePointer(requireContext(), addressUpdateFragment.deviceId), addressUpdateFragment.endpointId
     )
   }
 
+  override fun onResume() {
+    super.onResume()
+    addressUpdateFragment.endpointId = ENDPOINT
+  }
+
   companion object {
     private const val TAG = "BasicClientFragment"
     private const val ENDPOINT = 0
diff --git a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/OnOffClientFragment.kt b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/OnOffClientFragment.kt
index 02188301d2ec40..891d63bf0414bd 100644
--- a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/OnOffClientFragment.kt
+++ b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/OnOffClientFragment.kt
@@ -166,7 +166,7 @@ class OnOffClientFragment : Fragment() {
   private suspend fun sendLevelCommandClick() {
     val cluster = ChipClusters.LevelControlCluster(
       ChipClient.getConnectedDevicePointer(requireContext(), addressUpdateFragment.deviceId),
-      LEVEL_CONTROL_CLUSTER_ENDPOINT
+      addressUpdateFragment.endpointId
     )
     cluster.moveToLevel(object : ChipClusters.DefaultClusterCallback {
       override fun onSuccess() {
@@ -223,8 +223,9 @@ class OnOffClientFragment : Fragment() {
 
   private suspend fun getOnOffClusterForDevice(): OnOffCluster {
     return OnOffCluster(
+
       ChipClient.getConnectedDevicePointer(requireContext(), addressUpdateFragment.deviceId),
-      ON_OFF_CLUSTER_ENDPOINT
+      addressUpdateFragment.endpointId
     )
   }
 
@@ -240,6 +241,12 @@ class OnOffClientFragment : Fragment() {
     }
   }
 
+  override fun onResume() {
+    super.onResume()
+    addressUpdateFragment.endpointId = ON_OFF_CLUSTER_ENDPOINT
+
+  }
+
   companion object {
     private const val TAG = "OnOffClientFragment"
 
diff --git a/examples/android/CHIPTool/app/src/main/res/layout/address_update_fragment.xml b/examples/android/CHIPTool/app/src/main/res/layout/address_update_fragment.xml
index 3a401297e326aa..53d85ba9eb5144 100644
--- a/examples/android/CHIPTool/app/src/main/res/layout/address_update_fragment.xml
+++ b/examples/android/CHIPTool/app/src/main/res/layout/address_update_fragment.xml
@@ -1,35 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-  <EditText
-      android:id="@+id/fabricIdEd"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_margin="16dp"
-      app:layout_constraintLeft_toLeftOf="parent"
-      app:layout_constraintTop_toTopOf="parent"
-      android:inputType="text"
-      android:textSize="20sp"
-      android:hint="@string/enter_fabric_id_hint_text"/>
+    android:layout_height="match_parent">
+
+    <EditText
+        android:id="@+id/fabricIdEd"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="20sp"
+        android:hint="@string/enter_fabric_id_hint_text"
+        android:inputType="number"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintRight_toLeftOf="@+id/deviceIdEd"/>
+
+    <EditText
+        android:id="@+id/deviceIdEd"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:inputType="number"
+        android:textSize="20sp"
+        android:hint="@string/enter_device_id_hint_text"
+        app:layout_constraintStart_toEndOf="@+id/fabricIdEd"
+        app:layout_constraintTop_toTopOf="parent"  />
 
   <EditText
-      android:id="@+id/deviceIdEd"
+      android:id="@+id/epIdEd"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_margin="16dp"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintTop_toTopOf="parent"
-      android:layout_toEndOf="@id/fabricIdEd"
-      android:inputType="text"
+      android:hint="@string/enter_endpoint_id_hint_text"
+      android:inputType="number"
       android:textSize="20sp"
-      android:hint="@string/enter_device_id_hint_text"/>
+      android:text ="1"
+      app:layout_constraintStart_toEndOf="@+id/deviceIdEd"
+      app:layout_constraintTop_toTopOf="parent" />
 
   <androidx.constraintlayout.widget.Barrier
       android:id="@+id/barrier"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       app:barrierDirection="bottom"
-      app:constraint_referenced_ids="fabricIdEd,deviceIdEd" />
+      app:constraint_referenced_ids="fabricIdEd,deviceIdEd,epIdEd" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file