Skip to content

Commit a6aca1f

Browse files
author
lucas
committed
Merge branch 'dev_2.7.0' into dev_optimization
2 parents 43aaf96 + 54c3808 commit a6aca1f

File tree

6 files changed

+299
-61
lines changed

6 files changed

+299
-61
lines changed

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

Lines changed: 45 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import cn.com.venvy.Config;
1616
import cn.com.venvy.common.utils.VenvyAPKVersionCodeUtils;
1717
import cn.com.venvy.common.utils.VenvyDeviceUtil;
18+
import cn.com.venvy.common.utils.VenvyUIUtil;
1819
import cn.com.venvy.lua.binder.VenvyLVLibBinder;
1920

2021
/**
@@ -23,22 +24,29 @@
2324
*/
2425

2526
public class LVCommonParamPlugin {
26-
private static final String VERSION = "VERSION";//版本号
27+
private static final String LANGUAGE = "LANGUAGE";//语言
2728
private static final String SDK_VERSION = "SDK_VERSION";//sdk版本号
28-
private static final String USER_AGENT = "USER_AGENT";//代理
29-
private static final String OS_VERSION = "OS_VERSION";//系统版本号
3029
private static final String UD_ID = "UD_ID";//uuid
31-
// private static final String APP_KEY="";//app的key
32-
private static final String IP = "IP";//ip地址
33-
private static final String NETWORK = "NETWORK";//网络
34-
// private static final String PLATFORM_ID="";//平台id
35-
// private static final String CYTRON_VERSION="";//业务系统版本号
36-
private static final String LANGUAGE = "LANGUAGE";//语言
37-
// private static final String BU="OS";//业务id
38-
// private static final String ENCODING="";//编码
39-
// private static final String PLATFORM_TOKEN="";//平台token
4030
private static final String PHONE_MODEL = "PHONE_MODEL";//手机型号
31+
private static final String NETWORK = "NETWORK";//网络连接类型（0:未知，1:wifi，2:2G，3:3G，4:4G 5:5G）network
32+
private static final String VERSION = "VERSION";//APP版本（如：9.3.4）使用version
33+
private static final String OS_VERSION = "OS_VERSION";//系统版本号
4134
private static final String PHONE_PROVIDER = "PHONE_PROVIDER";//手机提供商
35+
private static final String IP = "IP";//ip地址
36+
private static final String OS_TYPE = "OS_TYPE";//0:未知 1:Android 2:iOS 3:Windows Phone
37+
private static final String MAC = "MAC";
38+
private static final String ANDROID_ID = "ANDROID_ID";//android_id
39+
private static final String IMEI = "IMEI";
40+
private static final String APP_NAME = "APP_NAME";//APP名称(utf-8)，需要UrlEncode
41+
private static final String PKG_NAME = "PKG_NAME";//APP包名(安卓是应用的PackageName,ios是Bundle ID)
42+
private static final String CARRIER = "CARRIER";//运营商信息 0:其他，1:移动，2:联通，3:电信
43+
private static final String PHONE_HEIGHT = "PHONE_HEIGHT";//设备屏幕宽度,物理像素
44+
private static final String PHONE_WIDTH = "PHONE_WIDTH";//设备屏幕高度,物理像素
45+
private static final String PPI = "PPI";//设备像素密度,物理像素
46+
private static final String IMSI = "IMSI";//国际移动客户识别码
47+
private static final String DEVICE_TYPE = "DEVICE_TYPE";//终端类型(1:移动端 2:PC 3:OTT)
48+
49+
4250
private static LVCommonParamPlugin.GetCommonParamData mCommonParamData;
4351

4452
public static void install(VenvyLVLibBinder venvyLVLibBinder) {
@@ -69,17 +77,37 @@ public Varargs invoke(Varargs args) {
6977
}
7078
table.set(LuaValue.valueOf(VERSION), LuaValue.valueOf(VenvyAPKVersionCodeUtils.getVersionName(App.getContext())));
7179
table.set(LuaValue.valueOf(SDK_VERSION), LuaValue.valueOf(Config.SDK_VERSION));
72-
table.set(LuaValue.valueOf(USER_AGENT), LuaValue.valueOf(VenvyDeviceUtil.getUserAgent(context)));
7380
table.set(LuaValue.valueOf(OS_VERSION), LuaValue.valueOf(VenvyDeviceUtil.getOsVersion()));
7481
table.set(LuaValue.valueOf(UD_ID), LuaValue.valueOf(VenvyDeviceUtil.getAndroidID(context)));
82+
table.set(LuaValue.valueOf(NETWORK), LuaValue.valueOf(VenvyDeviceUtil.getNetWorkType(context)));
83+
table.set(LuaValue.valueOf(LANGUAGE), LuaValue.valueOf(VenvyDeviceUtil.getLanguage(context)));
84+
table.set(LuaValue.valueOf(PHONE_MODEL), LuaValue.valueOf(android.os.Build.MODEL));
85+
table.set(LuaValue.valueOf(PHONE_PROVIDER), LuaValue.valueOf(android.os.Build.BRAND));
86+
table.set(LuaValue.valueOf(OS_TYPE), LuaValue.valueOf(1));
87+
table.set(LuaValue.valueOf(ANDROID_ID), LuaValue.valueOf(VenvyDeviceUtil.getAndroidID(context)));
88+
table.set(LuaValue.valueOf(IMEI), LuaValue.valueOf(VenvyDeviceUtil.getIMEI(context)));
89+
table.set(LuaValue.valueOf(IMSI), LuaValue.valueOf(VenvyDeviceUtil.getIMSI(context)));
90+
table.set(LuaValue.valueOf(DEVICE_TYPE), LuaValue.valueOf(1));
91+
table.set(LuaValue.valueOf(PHONE_WIDTH), LuaValue.valueOf(VenvyUIUtil.getScreenWidth(context)));
92+
table.set(LuaValue.valueOf(PHONE_HEIGHT), LuaValue.valueOf(VenvyUIUtil.getScreenHeight(context)));
93+
table.set(LuaValue.valueOf(PPI), LuaValue.valueOf(VenvyUIUtil.getScreenPPI(context)));
94+
table.set(LuaValue.valueOf(CARRIER), LuaValue.valueOf(VenvyDeviceUtil.getSubscriptionOperatorType(context)));
7595
String ip = VenvyDeviceUtil.getLocalIPAddress();
7696
if (!TextUtils.isEmpty(ip)) {
7797
table.set(LuaValue.valueOf(IP), LuaValue.valueOf(ip));
7898
}
79-
table.set(LuaValue.valueOf(NETWORK), LuaValue.valueOf(VenvyDeviceUtil.getNetWorkName(context)));
80-
table.set(LuaValue.valueOf(LANGUAGE), LuaValue.valueOf(VenvyDeviceUtil.getLanguage(context)));
81-
table.set(LuaValue.valueOf(PHONE_MODEL), LuaValue.valueOf(android.os.Build.MODEL));
82-
table.set(LuaValue.valueOf(PHONE_PROVIDER), LuaValue.valueOf(android.os.Build.BRAND));
99+
String appName = VenvyAPKVersionCodeUtils.getAppName(context);
100+
if (!TextUtils.isEmpty(appName)) {
101+
table.set(LuaValue.valueOf(APP_NAME), LuaValue.valueOf(appName));
102+
}
103+
String packageName = VenvyAPKVersionCodeUtils.getPackageName(context);
104+
if (!TextUtils.isEmpty(packageName)) {
105+
table.set(LuaValue.valueOf(PKG_NAME), LuaValue.valueOf(packageName));
106+
}
107+
String macAddress = VenvyDeviceUtil.getMacAddress();
108+
if (!TextUtils.isEmpty(macAddress)) {
109+
table.set(LuaValue.valueOf(MAC), LuaValue.valueOf(macAddress));
110+
}
83111
return table;
84112
}
85113
}

‎VideoOS/VenvyLibrary/build.gradle‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 25
4+
compileSdkVersion 29
55
buildToolsVersion '25.0.3'
66
defaultConfig {
77
minSdkVersion 16
@@ -42,14 +42,14 @@ dependencies {
4242
compile project(':venvy_processor_annotation')
4343
annotationProcessor project(':venvy_processor_compiler')
4444
provided 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.0.2'
45-
provided "com.squareup.okhttp3:okhttp:3.8.0"
46-
provided "com.facebook.fresco:fresco:1.8.0"
47-
provided "com.facebook.fresco:animated-gif:1.8.0"
48-
provided "com.facebook.fresco:animated-webp:1.8.0"
49-
provided "com.facebook.fresco:webpsupport:1.8.0"
50-
provided "com.github.bumptech.glide:glide:3.7.0"
51-
provided "com.just.agentweb:agentweb:4.1.2"
52-
// provided "com.github.bumptech.glide:glide:4.3.1"
53-
// compile 'com.videoli:venvy_processor_annotation:1.0.0'
54-
// annotationProcessor 'com.videoli:venvy_processor_compiler:1.0.1'
45+
provided 'com.squareup.okhttp3:okhttp:3.8.0'
46+
provided 'com.facebook.fresco:fresco:1.8.0'
47+
provided 'com.facebook.fresco:animated-gif:1.8.0'
48+
provided 'com.facebook.fresco:animated-webp:1.8.0'
49+
provided 'com.facebook.fresco:webpsupport:1.8.0'
50+
provided 'com.github.bumptech.glide:glide:3.7.0'
51+
provided 'com.just.agentweb:agentweb:4.1.2'
52+
// provided "com.github.bumptech.glide:glide:4.3.1"
53+
// compile 'com.videoli:venvy_processor_annotation:1.0.0'
54+
// annotationProcessor 'com.videoli:venvy_processor_compiler:1.0.1'
5555
}

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

Lines changed: 51 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package cn.com.venvy;
22

3+
import android.content.Context;
34
import android.text.TextUtils;
45

56
import org.json.JSONObject;
@@ -9,45 +10,72 @@
910

1011
import cn.com.venvy.common.utils.VenvyAPKVersionCodeUtils;
1112
import cn.com.venvy.common.utils.VenvyDeviceUtil;
13+
import cn.com.venvy.common.utils.VenvyUIUtil;
1214

1315
/**
1416
* Created by videojj_pls on 2019/8/30.
1517
*/
1618

1719
public class CommonParam {
18-
private static final String VERSION = "VERSION";//版本号
20+
private static final String LANGUAGE = "LANGUAGE";//语言
1921
private static final String SDK_VERSION = "SDK_VERSION";//sdk版本号
20-
private static final String USER_AGENT = "USER_AGENT";//代理
21-
private static final String OS_VERSION = "OS_VERSION";//系统版本号
2222
private static final String UD_ID = "UD_ID";//uuid
23-
private static final String APP_KEY="APP_KEY";//app的key
24-
private static final String IP = "IP";//ip地址
25-
private static final String NETWORK = "NETWORK";//网络
26-
// private static final String PLATFORM_ID="";//平台id
27-
// private static final String CYTRON_VERSION="";//业务系统版本号
28-
private static final String LANGUAGE = "LANGUAGE";//语言
29-
// private static final String BU="OS";//业务id
30-
// private static final String ENCODING="";//编码
31-
// private static final String PLATFORM_TOKEN="";//平台token
3223
private static final String PHONE_MODEL = "PHONE_MODEL";//手机型号
24+
private static final String NETWORK = "NETWORK";//网络连接类型（0:未知，1:wifi，2:2G，3:3G，4:4G 5:5G）network
25+
private static final String VERSION = "VERSION";//APP版本（如：9.3.4）使用version
26+
private static final String OS_VERSION = "OS_VERSION";//系统版本号
3327
private static final String PHONE_PROVIDER = "PHONE_PROVIDER";//手机提供商
28+
private static final String IP = "IP";//ip地址
29+
private static final String OS_TYPE = "OS_TYPE";//0:未知 1:Android 2:iOS 3:Windows Phone
30+
private static final String MAC = "MAC";
31+
private static final String ANDROID_ID = "ANDROID_ID";//android_id
32+
private static final String IMEI = "IMEI";
33+
private static final String APP_NAME = "APP_NAME";//APP名称(utf-8)，需要UrlEncode
34+
private static final String PKG_NAME = "PKG_NAME";//APP包名(安卓是应用的PackageName,ios是Bundle ID)
35+
private static final String CARRIER = "CARRIER";//运营商信息 0:其他，1:移动，2:联通，3:电信
36+
private static final String PHONE_HEIGHT = "PHONE_HEIGHT";//设备屏幕宽度,物理像素
37+
private static final String PHONE_WIDTH = "PHONE_WIDTH";//设备屏幕高度,物理像素
38+
private static final String PPI = "PPI";//设备像素密度,物理像素
39+
private static final String IMSI = "IMSI";//国际移动客户识别码
40+
private static final String DEVICE_TYPE = "DEVICE_TYPE";//终端类型(1:移动端 2:PC 3:OTT)
3441

3542
public static JSONObject getCommonParamJson(String appKey) {
3643
Map<String, String> paramMap = new HashMap<>();
37-
paramMap.put(VERSION, VenvyAPKVersionCodeUtils.getVersionName(App.getContext()));
38-
paramMap.put(SDK_VERSION, Config.SDK_VERSION);
39-
paramMap.put(USER_AGENT, VenvyDeviceUtil.getUserAgent(App.getContext()));
40-
paramMap.put(OS_VERSION, VenvyDeviceUtil.getOsVersion());
41-
paramMap.put(UD_ID, VenvyDeviceUtil.getAndroidID(App.getContext()));
44+
Context context=App.getContext();
45+
paramMap.put(VERSION,VenvyAPKVersionCodeUtils.getVersionName(context));
46+
paramMap.put(SDK_VERSION,Config.SDK_VERSION);
47+
paramMap.put(OS_VERSION,VenvyDeviceUtil.getOsVersion());
48+
paramMap.put(UD_ID,VenvyDeviceUtil.getAndroidID(context));
49+
paramMap.put(NETWORK,String.valueOf(VenvyDeviceUtil.getNetWorkType(context)));
50+
paramMap.put(LANGUAGE,VenvyDeviceUtil.getLanguage(context));
51+
paramMap.put(PHONE_MODEL,android.os.Build.MODEL);
52+
paramMap.put(PHONE_PROVIDER,android.os.Build.BRAND);
53+
paramMap.put(OS_TYPE,String.valueOf(1));
54+
paramMap.put(ANDROID_ID,VenvyDeviceUtil.getAndroidID(context));
55+
paramMap.put(IMEI,VenvyDeviceUtil.getIMEI(context));
56+
paramMap.put(IMSI,VenvyDeviceUtil.getIMSI(context));
57+
paramMap.put(DEVICE_TYPE,String.valueOf(1));
58+
paramMap.put(PHONE_WIDTH,String.valueOf(VenvyUIUtil.getScreenWidth(context)));
59+
paramMap.put(PHONE_HEIGHT,String.valueOf(VenvyUIUtil.getScreenHeight(context)));
60+
paramMap.put(PPI,String.valueOf(VenvyUIUtil.getScreenPPI(context)));
61+
paramMap.put(CARRIER,String.valueOf(VenvyDeviceUtil.getSubscriptionOperatorType(context)));
62+
4263
String ip = VenvyDeviceUtil.getLocalIPAddress();
4364
if (!TextUtils.isEmpty(ip)) {
44-
paramMap.put(IP, ip);
65+
paramMap.put(IP,ip);
66+
}
67+
String appName = VenvyAPKVersionCodeUtils.getAppName(context);
68+
if (!TextUtils.isEmpty(appName)) {
69+
paramMap.put(APP_NAME,appName);
70+
}
71+
String packageName = VenvyAPKVersionCodeUtils.getPackageName(context);
72+
if (!TextUtils.isEmpty(packageName)) {
73+
paramMap.put(PKG_NAME,packageName);
74+
}
75+
String macAddress = VenvyDeviceUtil.getMacAddress();
76+
if (!TextUtils.isEmpty(macAddress)) {
77+
paramMap.put(MAC,macAddress);
4578
}
46-
paramMap.put(NETWORK, VenvyDeviceUtil.getNetWorkName(App.getContext()));
47-
paramMap.put(LANGUAGE, VenvyDeviceUtil.getLanguage(App.getContext()));
48-
paramMap.put(APP_KEY,appKey);
49-
paramMap.put(PHONE_MODEL, android.os.Build.MODEL);
50-
paramMap.put(PHONE_PROVIDER, android.os.Build.BRAND);
5179
return new JSONObject(paramMap);
5280
}
5381
}

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

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package cn.com.venvy.common.utils;
22

33
import android.content.Context;
4+
import android.content.pm.PackageInfo;
5+
import android.content.pm.PackageManager;
46

57
/**
68
* Created by videojj_pls on 2018/9/4.
@@ -36,4 +38,38 @@ public static String getVersionName(Context context) {
3638
}
3739
return versionName;
3840
}
41+
42+
/**
43+
* [获取应用程序版本名称信息]
44+
*
45+
* @param context
46+
* @return 当前应用的版本名称
47+
*/
48+
public static synchronized String getPackageName(Context context) {
49+
try {
50+
PackageManager packageManager = context.getPackageManager();
51+
PackageInfo packageInfo = packageManager.getPackageInfo(
52+
context.getPackageName(), 0);
53+
return packageInfo.packageName;
54+
} catch (Exception e) {
55+
e.printStackTrace();
56+
}
57+
return null;
58+
}
59+
60+
/**
61+
* 获取应用程序名称
62+
*/
63+
public static synchronized String getAppName(Context context) {
64+
try {
65+
PackageManager packageManager = context.getPackageManager();
66+
PackageInfo packageInfo = packageManager.getPackageInfo(
67+
context.getPackageName(), 0);
68+
int labelRes = packageInfo.applicationInfo.labelRes;
69+
return context.getResources().getString(labelRes);
70+
} catch (Exception e) {
71+
e.printStackTrace();
72+
}
73+
return null;
74+
}
3975
}

0 commit comments

Comments
 (0)