SDK 跳转Lua 的协议中加入miniAppId

Author: lucas

VideoOS/LuaViewSDK/src/cn/com/venvy/lua/view/VenvyLVWebView.java

@@ -145,7 +145,7 @@ private String getDeveloperUserId(Globals globals) {
         try {
             JSONObject dataObj = new JSONObject(dataParams.get("data"));
             JSONObject miniAppInfoObj = dataObj.optJSONObject("miniAppInfo");
-            developerUserId = miniAppInfoObj.optString("developerUserId");
+            developerUserId = miniAppInfoObj != null ? miniAppInfoObj.optString("developerUserId") : "";
         } catch (Exception e) {
             e.printStackTrace();
         }

VideoOS/VenvyLibrary/src/main/java/cn/com/venvy/common/utils/VenvySchemeUtil.java

@@ -18,6 +18,7 @@ public class VenvySchemeUtil {
 
     public static final String QUERY_PARAMETER_TEMPLATE = "template";
     public static final String QUERY_PARAMETER_ID = "id";
+    public static final String QUERY_MINIAPP_ID = "miniAppId";
     public static final String QUERY_PARAMETER_PRIORITY = "priority";
     public static final String QUERY_PARAMETER_EVENT_TYPE = "eventType";
     public static final String QUERY_PARAMETER_ACTION_TYPE = "actionType";

VideoOS/VenvyLibrary/src/main/java/cn/com/venvy/common/webview/JsBridge.java

@@ -353,7 +353,7 @@ public void getStorageData(final String jsParams) {
                 VenvyUIUtil.runOnUIThread(new Runnable() {
                     @Override
                     public void run() {
-                        callJsFunction(VenvyPreferenceHelper.getString(mContext, mDeveloperUserId, key, ""), jsParams);
+                        callJsFunction(VenvyPreferenceHelper.getString(mContext, TextUtils.isEmpty(mDeveloperUserId) ? "" : mDeveloperUserId, key, ""), jsParams);
                     }
                 });
 

VideoOS/venvy_pub/src/main/java/cn/com/videopls/pub/VideoPlusController.java

@@ -182,7 +182,11 @@ public void successful(Object result, String miniAppInfo, final ServiceQueryAdsI
 
                     // miniAppInfo
                     if (!TextUtils.isEmpty(miniAppInfo)) {
-                        jsonObject.put(CONSTANT_MINI_APP_INFO, new JSONObject(miniAppInfo));
+                        JSONObject miniAppJson = new JSONObject(miniAppInfo);
+                        jsonObject.put(CONSTANT_MINI_APP_INFO, miniAppJson);
+                        builder.appendQueryParameter(VenvySchemeUtil.QUERY_MINIAPP_ID,miniAppJson.getString("miniAppId"));
+                    }else{
+                        builder.appendQueryParameter(VenvySchemeUtil.QUERY_MINIAPP_ID,"");
                     }
                     skipParams.put(CONSTANT_DATA, jsonObject.toString());
                 } catch (JSONException e) {

VideoOS/venvy_pub/src/main/java/cn/com/videopls/pub/VideoPlusView.java

@@ -279,21 +279,19 @@ public void launchDesktopProgram(String targetName, String miniAppInfo, String v
         addView(programViewDesktop, getChildCount() - 1);// 上层还有
         if (!TextUtils.isEmpty(targetName)) {
             programViewDesktop.setVisibility(VISIBLE);
-            Uri uri = Uri.parse("LuaView://desktopLuaView?template=" + targetName + "&id=" + targetName.substring(0, targetName.lastIndexOf(".")));
-//            HashMap<String, String> params = new HashMap<>();
-//            params.put(VenvyObservableTarget.Constant.CONSTANT_MINI_APP_INFO, miniAppInfo);//  miniAppInfo
-//            params.put(VenvyObservableTarget.Constant.CONSTANT_VIDEO_MODE_TYPE, videoModeType);//  videoModeType
-
             JSONObject jsonObject = new JSONObject();
+            Uri uri = null;
             try {
-                jsonObject.put(VenvyObservableTarget.Constant.CONSTANT_MINI_APP_INFO, new JSONObject(miniAppInfo));//  miniAppInfo
+                JSONObject miniAppInfoJson = new JSONObject(TextUtils.isEmpty(miniAppInfo) ? "{}" : miniAppInfo);
+                uri = Uri.parse("LuaView://desktopLuaView?template=" + targetName + "&miniAppId=" + miniAppInfoJson.getString("miniAppId") + "&id=" + targetName.substring(0, targetName.lastIndexOf(".")));
+                jsonObject.put(VenvyObservableTarget.Constant.CONSTANT_MINI_APP_INFO, miniAppInfoJson);//  miniAppInfo
                 jsonObject.put(VenvyObservableTarget.Constant.CONSTANT_VIDEO_MODE_TYPE, videoModeType);//  videoModeType
             } catch (JSONException e) {
                 e.printStackTrace();
             }
 
-            HashMap<String,String> finalParams = new HashMap<>();
-            finalParams.put("data",jsonObject.toString());
+            HashMap<String, String> finalParams = new HashMap<>();
+            finalParams.put("data", jsonObject.toString());
             programViewDesktop.navigation(uri, finalParams, null);
         }