Support isUrgent in Android

project-chip · Feb 24, 2023 · 998550c · 998550c
1 parent 6ff2b3a
commit 998550c
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 5 deletions.
diff --git a/...oid/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/WildcardFragment.kt b/...oid/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/WildcardFragment.kt
@@ -9,6 +9,7 @@ import android.view.ViewGroup
 import android.widget.Button
 import android.widget.EditText
 import android.widget.Spinner
+import android.widget.TextView
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import chip.devicecontroller.ChipDeviceController
@@ -114,7 +115,7 @@ class WildcardFragment : Fragment() {
     return stringBuilder.toString()
   }
 
-  private suspend fun subscribe(type: Int, minInterval: Int, maxInterval: Int, keepSubscriptions: Boolean, isFabricFiltered: Boolean) {
+  private suspend fun subscribe(type: Int, minInterval: Int, maxInterval: Int, keepSubscriptions: Boolean, isFabricFiltered: Boolean, isUrgent: Boolean) {
     val subscriptionEstablishedCallback =
       SubscriptionEstablishedCallback { Log.i(TAG, "Subscription to device established") }
 
@@ -141,7 +142,7 @@ class WildcardFragment : Fragment() {
                                        keepSubscriptions,
                                        isFabricFiltered)
     } else if (type == EVENT) {
-      val eventPath = ChipEventPath.newInstance(endpointId, clusterId, eventId)
+      val eventPath = ChipEventPath.newInstance(endpointId, clusterId, eventId, isUrgent)
       deviceController.subscribeToPath(subscriptionEstablishedCallback,
                                       resubscriptionAttemptCallback,
                                       reportCallback,
@@ -199,6 +200,15 @@ class WildcardFragment : Fragment() {
 
   private fun showSubscribeDialog(type: Int) {
     val dialogView = requireActivity().layoutInflater.inflate(R.layout.subscribe_dialog, null)
+    val isUrgentTv = dialogView.findViewById<TextView>(R.id.titleisUrgent)
+    val isUrgentSp = dialogView.findViewById<Spinner>(R.id.isUrgentSp)
+    if (type == EVENT) {
+      isUrgentTv.visibility = View.VISIBLE
+      isUrgentSp.visibility = View.VISIBLE
+    } else {
+      isUrgentTv.visibility = View.GONE
+      isUrgentSp.visibility = View.GONE
+    }
     val dialog = AlertDialog.Builder(requireContext()).apply {
       setView(dialogView)
     }.create()
@@ -215,7 +225,8 @@ class WildcardFragment : Fragment() {
             minIntervalEd.text.toString().toInt(),
             maxIntervalEd.text.toString().toInt(),
             keepSubscriptionsSp.selectedItem.toString().toBoolean(),
-            isFabricFilteredSp.selectedItem.toString().toBoolean()
+            isFabricFilteredSp.selectedItem.toString().toBoolean(),
+            isUrgentSp.selectedItem.toString().toBoolean(),
           )
         } else {
           Log.e(TAG, "minInterval or maxInterval is empty!" )

diff --git a/examples/android/CHIPTool/app/src/main/res/layout/subscribe_dialog.xml b/examples/android/CHIPTool/app/src/main/res/layout/subscribe_dialog.xml
@@ -34,6 +34,28 @@
       android:layout_marginBottom="8dp"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toBottomOf="@id/minIntervalEd" />
+  <TextView
+      android:id="@+id/titleisUrgent"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:text="@string/subscribe_dialog_is_urgent_hint"
+      android:textSize="16sp"
+      android:layout_marginTop="8dp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/maxIntervalEd"
+      />
+  <Spinner
+      android:id="@+id/isUrgentSp"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:hint="@string/subscribe_dialog_is_urgent_hint"
+      android:entries="@array/chip_select_menu"
+      android:inputType="text"
+      android:spinnerMode="dropdown"
+      android:textSize="16sp"
+      android:layout_marginTop="8dp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/titleisUrgent" />
   <TextView
       android:id="@+id/titleKeepSubscriptions"
       android:layout_width="match_parent"
@@ -42,7 +64,7 @@
       android:textSize="16sp"
       android:layout_marginTop="8dp"
       app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@id/maxIntervalEd"
+      app:layout_constraintTop_toBottomOf="@id/isUrgentSp"
       />
   <Spinner
       android:id="@+id/keepSubscriptionsSp"
@@ -56,7 +78,6 @@
       android:layout_marginTop="8dp"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toBottomOf="@id/titleKeepSubscriptions" />
-
   <TextView
       android:id="@+id/titleIsFabricFilter"
       android:layout_width="match_parent"

diff --git a/examples/android/CHIPTool/app/src/main/res/values/strings.xml b/examples/android/CHIPTool/app/src/main/res/values/strings.xml
@@ -142,6 +142,7 @@
     <string name="subscribe_dialog_subscribe_btn_text">Subscribe</string>
     <string name="subscribe_dialog_min_interval_hint">Minimum interval (seconds)</string>
     <string name="subscribe_dialog_max_interval_hint">Maximum interval (seconds)</string>
+    <string name="subscribe_dialog_is_urgent_hint">is Urgent Event (bool)</string>
     <string name="subscribe_dialog_keep_subscriptions_hint">keep subscriptions (bool)</string>
     <string name="subscribe_dialog_is_fabric_filtered_hint">is Fabric Filtered (bool)</string>