feat(android): rename tkd to HostConfig

Tencent · Mar 3, 2023 · 2d36d51 · 2d36d51
1 parent 3eca16b
commit 2d36d51
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 16 deletions.
diff --git a/...ndroid/src/main/java/com/tencent/mtt/hippy/adapter/thirdparty/HippyThirdPartyAdapter.java b/...ndroid/src/main/java/com/tencent/mtt/hippy/adapter/thirdparty/HippyThirdPartyAdapter.java
@@ -16,24 +16,34 @@
 
 package com.tencent.mtt.hippy.adapter.thirdparty;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import org.json.JSONObject;
 
 @SuppressWarnings({"unused"})
 public abstract class HippyThirdPartyAdapter {
 
-  public abstract void onRuntimeInit(long runtimeId);
+    public void onRuntimeInit(long runtimeId) {}
 
-  public abstract void onRuntimeDestroy();
+    public void onRuntimeDestroy() {}
 
-  public abstract String getPackageName();
+    @Nullable
+    public JSONObject getExtraData() {
+        return null;
+    }
 
-  public abstract String getAppVersion();
+    @Nullable
+    public String getPageUrl() {
+        return null;
+    }
 
-  public abstract void setPageUrl(String url);
+    public boolean getNightMode() {
+        return false;
+    }
 
-  public abstract String getPageUrl();
+    @NonNull
+    public abstract String getPackageName();
 
-  public abstract void setExtraData(JSONObject extraData);
-
-  public abstract JSONObject getExtraData();
+    @NonNull
+    public abstract String getAppVersion();
 }
diff --git a/framework/android/src/main/java/com/tencent/mtt/hippy/bridge/HippyBridgeManagerImpl.java b/framework/android/src/main/java/com/tencent/mtt/hippy/bridge/HippyBridgeManagerImpl.java
@@ -548,14 +548,18 @@ String getGlobalConfigs() {
         String packageName = "";
         String versionName = "";
         String pageUrl = "";
+        boolean nightMode = false;
 
         HippyMap extraDataMap = new HippyMap();
         if (mThirdPartyAdapter != null) {
             packageName = mThirdPartyAdapter.getPackageName();
             versionName = mThirdPartyAdapter.getAppVersion();
             pageUrl = mThirdPartyAdapter.getPageUrl();
+            nightMode = mThirdPartyAdapter.getNightMode();
             JSONObject jObject = mThirdPartyAdapter.getExtraData();
-            extraDataMap.pushJSONObject(jObject);
+            if (jObject != null) {
+                extraDataMap.pushJSONObject(jObject);
+            }
         }
 
         try {
@@ -595,12 +599,13 @@ String getGlobalConfigs() {
             globalParams.pushMap("Debug", debugParams);
         }
 
-        HippyMap tkd = new HippyMap();
-        tkd.pushString("url", (pageUrl == null) ? "" : pageUrl);
-        tkd.pushString("appName", (packageName == null) ? "" : packageName);
-        tkd.pushString("appVersion", (versionName == null) ? "" : versionName);
-        tkd.pushMap("extra", extraDataMap);
-        globalParams.pushMap("tkd", tkd);
+        HippyMap host = new HippyMap();
+        host.pushString("url", (pageUrl == null) ? "" : pageUrl);
+        host.pushString("appName", (packageName == null) ? "" : packageName);
+        host.pushString("appVersion", (versionName == null) ? "" : versionName);
+        host.pushBoolean("nightMode", nightMode);
+        host.pushMap("extra", extraDataMap);
+        globalParams.pushMap("HostConfig", host);
 
         return ArgumentUtils.objectToJson(globalParams);
     }