Merge branch 'dev_optimization' into dev_2.7.0

Author: lucas

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

@@ -122,7 +122,7 @@ public static String getIMSI(Context context) {
                     .getSystemService(Context.TELEPHONY_SERVICE);//
             imsi = tm.getSubscriberId();
         } catch (Exception e) {
-            e.printStackTrace();
+            VenvyLog.w("SecurityException : getSubscriberId");
         }
         return imsi;
     }

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

@@ -400,21 +400,6 @@ protected void navigation(Uri uri, HashMap<String, String> params, IRouterCallba
                 }
                 targetDataMap.put("data", value);
             }
-            String miniAppInfo = params.get(VenvyObservableTarget.Constant.CONSTANT_MINI_APP_INFO);
-            if (!TextUtils.isEmpty(miniAppInfo)) {
-                if (targetDataMap == null) {
-                    targetDataMap = new HashMap<>();
-                }
-                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) {

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

@@ -8,6 +8,7 @@
 import android.util.AttributeSet;
 import android.widget.FrameLayout;
 
+import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.util.HashMap;
@@ -279,10 +280,21 @@ public void launchDesktopProgram(String targetName, String miniAppInfo, String v
         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
-            programViewDesktop.navigation(uri, params, null);
+//            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();
+            try {
+                jsonObject.put(VenvyObservableTarget.Constant.CONSTANT_MINI_APP_INFO, new JSONObject(miniAppInfo));//  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());
+            programViewDesktop.navigation(uri, finalParams, null);
         }
 
     }

VideoOS/venvy_pub/src/main/java/cn/com/videopls/pub/view/VideoOSLuaView.java

@@ -212,7 +212,7 @@ private void runLuaFile(final LuaView luaView, final String luaName, final Objec
         if (TextUtils.isEmpty(luaName)) {
             return;
         }
-//        if(luaName.contains("os_shopping_hotspot.lua")){
+//        if (luaName.contains("os_video_mode_desktop_hotspot.lua")) {
 //            runLua(luaView, luaName, valueData);
 //            return;
 //        }