VideoPlusController 支持miniAppInfo & videoModeType的处理

Author: lucas

VideoOS/VenvyLibrary/src/main/assets/lua/os_shopping_hotspot.lua

@@ -99,7 +99,6 @@ end
 
 --入口Native调用--
 function show(args)
-
     local dataTable = args.data
     if (dataTable == nil) then
         return

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

@@ -116,9 +116,10 @@ public static String getIMEI(Context context) {
      * @return
      */
     public static String getIMSI(Context context) {
-        TelephonyManager tm = (TelephonyManager) context
-                .getSystemService(Context.TELEPHONY_SERVICE);//
-        return tm.getSubscriberId();
+//        TelephonyManager tm = (TelephonyManager) context
+//                .getSystemService(Context.TELEPHONY_SERVICE);//
+//        return tm.getSubscriberId();
+        return "";
     }
 
     /**

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

@@ -9,7 +9,6 @@
 import android.view.ViewGroup;
 
 import com.taobao.luaview.cache.AppCache;
-import com.taobao.luaview.util.JsonUtil;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -394,25 +393,29 @@ protected void navigation(Uri uri, HashMap<String, String> params, IRouterCallba
             }
         }
         if (params != null) {
+            String value = params.get("data");
+            if (!TextUtils.isEmpty(value)) {
+                if (targetDataMap == null) {
+                    targetDataMap = new HashMap<>();
+                }
+                targetDataMap.put("data", value);
+            }
             String miniAppInfo = params.get(VenvyObservableTarget.Constant.CONSTANT_MINI_APP_INFO);
-            String videoModeType = params.get(VenvyObservableTarget.Constant.CONSTANT_VIDEO_MODE_TYPE);
-            if (!TextUtils.isEmpty(miniAppInfo) || !TextUtils.isEmpty(videoModeType)) {
+            if (!TextUtils.isEmpty(miniAppInfo)) {
                 if (targetDataMap == null) {
                     targetDataMap = new HashMap<>();
                 }
-                try {
-                    JSONObject valueObj = new JSONObject();
-                    if (!TextUtils.isEmpty(miniAppInfo)) {
-                        valueObj.put("miniAppInfo", new JSONObject(miniAppInfo));
-                    }
-                    if (!TextUtils.isEmpty(videoModeType)) {
-                        valueObj.put("videoModeType", videoModeType);
-                    }
-                    targetDataMap.put("data", valueObj.toString());
-                } catch (Exception e) {
+                targetDataMap.put(VenvyObservableTarget.Constant.CONSTANT_MINI_APP_INFO, miniAppInfo);
+            }
 
+            String videoModeType = params.get(VenvyObservableTarget.Constant.CONSTANT_VIDEO_MODE_TYPE);
+            if (!TextUtils.isEmpty(videoModeType)) {
+                if (targetDataMap == null) {
+                    targetDataMap = new HashMap<>();
                 }
+                targetDataMap.put(VenvyObservableTarget.Constant.CONSTANT_VIDEO_MODE_TYPE, videoModeType);
             }
+
         }
         if (targetDataMap != null) {
             postInfo.withSerializable("data", targetDataMap);

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

@@ -8,6 +8,8 @@
 import android.util.AttributeSet;
 import android.widget.FrameLayout;
 
+import org.json.JSONObject;
+
 import java.util.HashMap;
 
 import cn.com.venvy.App;
@@ -213,7 +215,7 @@ public void launchVisionProgram(@NonNull String appletId, String data, final int
     /**
      * 拉起一个视联网小工具
      */
-    public void launchVisionToolsProgram(String miniAppId,String data) {
+    public void launchVisionToolsProgram(String miniAppId, String data) {
         if (programViewA != null) {
             HashMap<String, String> params = new HashMap<>();
             params.put("miniAppId", miniAppId);
@@ -278,8 +280,8 @@ public void launchDesktopProgram(String targetName, String miniAppInfo, String v
             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
+            params.put(VenvyObservableTarget.Constant.CONSTANT_MINI_APP_INFO, miniAppInfo);//  miniAppInfo
+            params.put(VenvyObservableTarget.Constant.CONSTANT_VIDEO_MODE_TYPE, videoModeType);//  videoModeType
             programViewDesktop.navigation(uri, params, null);
         }