Merge pull request #24 from VideoOS/test_2.6.0

Test 2.6.0

Author: phoche

VideoOS/LuaViewSDK/src/cn/com/venvy/lua/plugin/LVCommonParamPlugin.java

@@ -39,6 +39,8 @@ public class LVCommonParamPlugin {
 //    private static final String PLATFORM_TOKEN="";//平台token
     private static final String PHONE_MODEL = "PHONE_MODEL";//手机型号
     private static final String PHONE_PROVIDER = "PHONE_PROVIDER";//手机提供商
+    private static final String ANDROID_ID = "ANDROID_ID";
+    private static final String IMEI = "IMEI";
     private static LVCommonParamPlugin.GetCommonParamData mCommonParamData;
 
     public static void install(VenvyLVLibBinder venvyLVLibBinder) {
@@ -80,6 +82,8 @@ public Varargs invoke(Varargs args) {
             table.set(LuaValue.valueOf(LANGUAGE), LuaValue.valueOf(VenvyDeviceUtil.getLanguage(context)));
             table.set(LuaValue.valueOf(PHONE_MODEL), LuaValue.valueOf(android.os.Build.MODEL));
             table.set(LuaValue.valueOf(PHONE_PROVIDER), LuaValue.valueOf(android.os.Build.BRAND));
+            table.set(LuaValue.valueOf(ANDROID_ID), LuaValue.valueOf(VenvyDeviceUtil.getAndroidID(App.getContext())));
+            table.set(LuaValue.valueOf(IMEI), LuaValue.valueOf(VenvyDeviceUtil.getIMEI(App.getContext())));
             return table;
         }
     }

VideoOS/VenvyLibrary/src/main/java/cn/com/venvy/CommonParam.java

@@ -20,7 +20,7 @@ public class CommonParam {
     private static final String USER_AGENT = "USER_AGENT";//代理
     private static final String OS_VERSION = "OS_VERSION";//系统版本号
     private static final String UD_ID = "UD_ID";//uuid
-        private static final String APP_KEY="APP_KEY";//app的key
+    private static final String APP_KEY = "APP_KEY";//app的key
     private static final String IP = "IP";//ip地址
     private static final String NETWORK = "NETWORK";//网络
     //    private static final String PLATFORM_ID="";//平台id
@@ -31,6 +31,8 @@ public class CommonParam {
 //    private static final String PLATFORM_TOKEN="";//平台token
     private static final String PHONE_MODEL = "PHONE_MODEL";//手机型号
     private static final String PHONE_PROVIDER = "PHONE_PROVIDER";//手机提供商
+    private static final String ANDROID_ID = "ANDROID_ID";
+    private static final String IMEI = "IMEI";
 
     public static JSONObject getCommonParamJson(String appKey) {
         Map<String, String> paramMap = new HashMap<>();
@@ -45,9 +47,11 @@ public static JSONObject getCommonParamJson(String appKey) {
         }
         paramMap.put(NETWORK, VenvyDeviceUtil.getNetWorkName(App.getContext()));
         paramMap.put(LANGUAGE, VenvyDeviceUtil.getLanguage(App.getContext()));
-        paramMap.put(APP_KEY,appKey);
+        paramMap.put(APP_KEY, appKey);
         paramMap.put(PHONE_MODEL, android.os.Build.MODEL);
         paramMap.put(PHONE_PROVIDER, android.os.Build.BRAND);
+        paramMap.put(ANDROID_ID, VenvyDeviceUtil.getAndroidID(App.getContext()));
+        paramMap.put(IMEI, VenvyDeviceUtil.getIMEI(App.getContext()));
         return new JSONObject(paramMap);
     }
 }