[Android] Add eventHeader parameter in Java Class (#20473)

* Add Event TimeStamp * Restyled by google-java-format * Restyled by clang-format Co-authored-by: Restyled.io <[email protected]>
project-chip · Jul 8, 2022 · 5c8d76f · 5c8d76f
1 parent 88ee449
commit 5c8d76f
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 3 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
@@ -107,6 +107,10 @@ class WildcardFragment : Fragment() {
           stringBuilder.append("\t\t$attributeName: ${attributeState.value}\n")
         }
         clusterState.eventStates.forEach { (eventId, eventState) ->
+          stringBuilder.append("\t\teventNumber: ${eventState.eventNumber}\n")
+          stringBuilder.append("\t\tpriorityLevel: ${eventState.priorityLevel}\n")
+          stringBuilder.append("\t\tsystemTimeStamp: ${eventState.systemTimeStamp}\n")
+
           val eventName = ChipIdLookup.eventIdToName(clusterId, eventId)
           stringBuilder.append("\t\t$eventName: ${eventState.value}\n")
         }

diff --git a/src/controller/java/AndroidCallbacks.cpp b/src/controller/java/AndroidCallbacks.cpp
@@ -448,6 +448,10 @@ void ReportEventCallback::OnEventData(const app::EventHeader & aEventHeader, TLV
     readerForJavaTLV.Init(*apData);
     readerForJson.Init(*apData);
 
+    jlong eventNumber   = static_cast<jlong>(aEventHeader.mEventNumber);
+    jlong priorityLevel = static_cast<jint>(aEventHeader.mPriorityLevel);
+    jlong timestamp     = static_cast<jlong>(aEventHeader.mTimestamp.mValue);
+
     jobject value = DecodeEventValue(aEventHeader.mPath, readerForJavaObject, &err);
     // If we don't know this event, just skip it.
     VerifyOrReturn(err != CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB);
@@ -481,9 +485,10 @@ void ReportEventCallback::OnEventData(const app::EventHeader & aEventHeader, TLV
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Controller, "Could not find EventState class"));
     VerifyOrReturn(eventStateCls != nullptr, ChipLogError(Controller, "Could not find EventState class"));
     chip::JniClass eventStateJniCls(eventStateCls);
-    jmethodID eventStateCtor = env->GetMethodID(eventStateCls, "<init>", "(Ljava/lang/Object;[BLjava/lang/String;)V");
+    jmethodID eventStateCtor = env->GetMethodID(eventStateCls, "<init>", "(JIJLjava/lang/Object;[BLjava/lang/String;)V");
     VerifyOrReturn(eventStateCtor != nullptr, ChipLogError(Controller, "Could not find EventState constructor"));
-    jobject eventStateObj = env->NewObject(eventStateCls, eventStateCtor, value, jniByteArray.jniValue(), jsonString.jniValue());
+    jobject eventStateObj = env->NewObject(eventStateCls, eventStateCtor, eventNumber, priorityLevel, timestamp, value,
+                                           jniByteArray.jniValue(), jsonString.jniValue());
     VerifyOrReturn(eventStateObj != nullptr, ChipLogError(Controller, "Could not create EventState object"));
 
     // Add EventState to NodeState

diff --git a/src/controller/java/src/chip/devicecontroller/model/EventState.java b/src/controller/java/src/chip/devicecontroller/model/EventState.java
@@ -25,11 +25,25 @@
 public final class EventState {
   private static final String TAG = "EventState";
 
+  private long eventNumber;
+  private int priorityLevel;
+  private long systemTimeStamp;
+
   private Object valueObject;
   private byte[] tlv;
   private JSONObject json;
 
-  public EventState(Object valueObject, byte[] tlv, String jsonString) {
+  public EventState(
+      long eventNumber,
+      int priorityLevel,
+      long systemTimeStamp,
+      Object valueObject,
+      byte[] tlv,
+      String jsonString) {
+    this.eventNumber = eventNumber;
+    this.priorityLevel = priorityLevel;
+    this.systemTimeStamp = systemTimeStamp;
+
     this.valueObject = valueObject;
     this.tlv = tlv;
     try {
@@ -39,6 +53,18 @@ public EventState(Object valueObject, byte[] tlv, String jsonString) {
     }
   }
 
+  public long getEventNumber() {
+    return eventNumber;
+  }
+
+  public int getPriorityLevel() {
+    return priorityLevel;
+  }
+
+  public long getSystemTimeStamp() {
+    return systemTimeStamp;
+  }
+
   public Object getValue() {
     return valueObject;
   }