diff --git a/MobileTracking/.idea/caches/build_file_checksums.ser b/MobileTracking/.idea/caches/build_file_checksums.ser index dc0e6d77477eab6fe3f233fdda24cfdb384497db..98cc668dd6abc35238095dbc6859978bb862c06c 100644 Binary files a/MobileTracking/.idea/caches/build_file_checksums.ser and b/MobileTracking/.idea/caches/build_file_checksums.ser differ diff --git a/MobileTracking/.idea/gradle.xml b/MobileTracking/.idea/gradle.xml index bc863ce9ed095d172571b26559c5bfefdde41750..7c6e5419cb3bb8ed6189c49c16715b34a5ac0440 100644 --- a/MobileTracking/.idea/gradle.xml +++ b/MobileTracking/.idea/gradle.xml @@ -1,11 +1,10 @@ + diff --git a/MobileTracking/.idea/jarRepositories.xml b/MobileTracking/.idea/jarRepositories.xml new file mode 100644 index 0000000000000000000000000000000000000000..3c618c4208a2170db4abac26a5615d8db2ca447a --- /dev/null +++ b/MobileTracking/.idea/jarRepositories.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MobileTracking/.idea/misc.xml b/MobileTracking/.idea/misc.xml index 86da048a9411fc3a8477dad1830550107ca27082..829c220cae984c1b5f0029987ee7c1d243d13056 100644 --- a/MobileTracking/.idea/misc.xml +++ b/MobileTracking/.idea/misc.xml @@ -39,7 +39,7 @@ - + diff --git a/MobileTracking/.idea/modules.xml b/MobileTracking/.idea/modules.xml index a574109202a61637c36d7b37d0964d7d445e160b..aa8400c35d0d6a6764bab461b4a8ce54257eab42 100644 --- a/MobileTracking/.idea/modules.xml +++ b/MobileTracking/.idea/modules.xml @@ -2,7 +2,10 @@ + + + diff --git a/MobileTracking/MobileTrackingDemo/libs/arm64-v8a/libMMASignature.so b/MobileTracking/MobileTrackingDemo/libs/arm64-v8a/libMMASignature.so index 1f2637d0f531fece55ae027aa6041921eb173c40..f4e6d699641cd51a07435b280b9eab78d949a42c 100644 Binary files a/MobileTracking/MobileTrackingDemo/libs/arm64-v8a/libMMASignature.so and b/MobileTracking/MobileTrackingDemo/libs/arm64-v8a/libMMASignature.so differ diff --git a/MobileTracking/MobileTrackingDemo/libs/armeabi-v7a/libMMASignature.so b/MobileTracking/MobileTrackingDemo/libs/armeabi-v7a/libMMASignature.so index cf98d61c54faa6efa17dc68da8a14000000edfd0..aba376332b383c97b7b9d8142b470b682972a45c 100644 Binary files a/MobileTracking/MobileTrackingDemo/libs/armeabi-v7a/libMMASignature.so and b/MobileTracking/MobileTrackingDemo/libs/armeabi-v7a/libMMASignature.so differ diff --git a/MobileTracking/MobileTrackingDemo/libs/armeabi/libMMASignature.so b/MobileTracking/MobileTrackingDemo/libs/armeabi/libMMASignature.so index 1286e37584eade88d5913e46b43c9222a04ebb09..005d44e290c0dbf6d18a4168100d69bdd6b5f2b1 100644 Binary files a/MobileTracking/MobileTrackingDemo/libs/armeabi/libMMASignature.so and b/MobileTracking/MobileTrackingDemo/libs/armeabi/libMMASignature.so differ diff --git a/MobileTracking/MobileTrackingDemo/libs/mips/libMMASignature.so b/MobileTracking/MobileTrackingDemo/libs/mips/libMMASignature.so index f316c297e0baa6af68c6ea9b9233654c6092768a..714d4e759f836b3ae98d62b93e164f99091818aa 100644 Binary files a/MobileTracking/MobileTrackingDemo/libs/mips/libMMASignature.so and b/MobileTracking/MobileTrackingDemo/libs/mips/libMMASignature.so differ diff --git a/MobileTracking/MobileTrackingDemo/libs/mips64/libMMASignature.so b/MobileTracking/MobileTrackingDemo/libs/mips64/libMMASignature.so index 33ab9077ed2764bb05482336d57ac1a9c4aa200c..de0581b7032fe2e7e9277bcbb6d84e0e1e67e545 100644 Binary files a/MobileTracking/MobileTrackingDemo/libs/mips64/libMMASignature.so and b/MobileTracking/MobileTrackingDemo/libs/mips64/libMMASignature.so differ diff --git a/MobileTracking/MobileTrackingDemo/libs/x86/libMMASignature.so b/MobileTracking/MobileTrackingDemo/libs/x86/libMMASignature.so index 40fcc5516c5b00d06e7409eef57acc70ec01c513..f76a1a83d6d48d863144f9a15e0abfeca831174f 100644 Binary files a/MobileTracking/MobileTrackingDemo/libs/x86/libMMASignature.so and b/MobileTracking/MobileTrackingDemo/libs/x86/libMMASignature.so differ diff --git a/MobileTracking/MobileTrackingDemo/libs/x86_64/libMMASignature.so b/MobileTracking/MobileTrackingDemo/libs/x86_64/libMMASignature.so index 811c1ab0df24f66dde1e3684cba40383389644cb..d83de9f3bff457672e1853b1bbda7ec10d53dcd6 100644 Binary files a/MobileTracking/MobileTrackingDemo/libs/x86_64/libMMASignature.so and b/MobileTracking/MobileTrackingDemo/libs/x86_64/libMMASignature.so differ diff --git a/MobileTracking/libmobiletracking/src/main/java/cn/com/mma/mobile/tracking/api/Constant.java b/MobileTracking/libmobiletracking/src/main/java/cn/com/mma/mobile/tracking/api/Constant.java index f697514c98d1da6ad962f9db2221f57a3ab59394..470cf80f7b69e58d0fe48eb1c20237aa2f5f1edd 100755 --- a/MobileTracking/libmobiletracking/src/main/java/cn/com/mma/mobile/tracking/api/Constant.java +++ b/MobileTracking/libmobiletracking/src/main/java/cn/com/mma/mobile/tracking/api/Constant.java @@ -51,7 +51,7 @@ public class Constant { /** frame参数中的分隔符 */ public static final String DIVIDE_MULT = "X"; public static final String TRACKING_SDKVS = "SDKVS"; - public static final String TRACKING_SDKVS_VALUE = "V2.2.0"; //SDK版本号 + public static final String TRACKING_SDKVS_VALUE = "V2.2.1"; //SDK版本号 /** * 新版常量 Begin */ diff --git a/MobileTracking/libmobiletracking/src/main/java/cn/com/mma/mobile/tracking/api/RecordEventMessage.java b/MobileTracking/libmobiletracking/src/main/java/cn/com/mma/mobile/tracking/api/RecordEventMessage.java index 0973a624e6e05263694529daad21b5256a87c0cf..a9763789462cf384a74913663b7e6becdb9952a5 100644 --- a/MobileTracking/libmobiletracking/src/main/java/cn/com/mma/mobile/tracking/api/RecordEventMessage.java +++ b/MobileTracking/libmobiletracking/src/main/java/cn/com/mma/mobile/tracking/api/RecordEventMessage.java @@ -208,9 +208,9 @@ public class RecordEventMessage { if (checkURL.contains("/")) { String signStr = ""; if(permCheck && versionCheck){ - signStr = CommonUtil.getSignature(Constant.TRACKING_SDKVS_VALUE, timestamp / 1000, builder.toString(),"1"); + signStr = CommonUtil.getSignature(Constant.TRACKING_SDKVS_VALUE, timestamp / 1000,DeviceInfoUtil.getImei(context),DeviceInfoUtil.getPackageName(context),DeviceInfoUtil.getDevice(), builder.toString()); }else { - signStr = CommonUtil.getSignature(Constant.TRACKING_SDKVS_VALUE, timestamp / 1000, builder.toString(),null); + signStr = CommonUtil.getSignature(Constant.TRACKING_SDKVS_VALUE, timestamp / 1000,"",DeviceInfoUtil.getPackageName(context),DeviceInfoUtil.getDevice(), builder.toString()); } builder.append(separator); builder.append(company.signature.paramKey); diff --git a/MobileTracking/libmobiletracking/src/main/java/cn/com/mma/mobile/tracking/util/CommonUtil.java b/MobileTracking/libmobiletracking/src/main/java/cn/com/mma/mobile/tracking/util/CommonUtil.java index c297d81b3efc8ebaa2101cb56bc78467728df26e..edae4f8f97e3dceca5bb6e0a6a45484ea865ee0b 100644 --- a/MobileTracking/libmobiletracking/src/main/java/cn/com/mma/mobile/tracking/util/CommonUtil.java +++ b/MobileTracking/libmobiletracking/src/main/java/cn/com/mma/mobile/tracking/util/CommonUtil.java @@ -150,11 +150,12 @@ public class CommonUtil { // } // } - public static String getSignature(String sdkVersion, long timestamp, String originURL, String permissionType) { + public static String getSignature(String sdkVersion, long timestamp, String imei,String packagename,String modle,String originURL) { // 检测URL转小写 try { +// Logger.i("sdkVersion:" + sdkVersion + "timestamp:" + timestamp+ "imei:" + imei + "packagename:" + packagename+ "modle:"+ modle); //System.out.println("getSignature:" + sdkVersion + " timestamp:" + timestamp + " originURL:" + originURL); - String signature = SignUtils.mmaSdkSign(sdkVersion, timestamp, originURL,permissionType); + String signature = SignUtils.mmaSdkSign(sdkVersion, timestamp ,imei,packagename,modle,originURL); return signature; } catch (Exception e) { } diff --git a/MobileTracking/libmobiletracking/src/main/java/cn/mmachina/mobile/SignUtils.java b/MobileTracking/libmobiletracking/src/main/java/cn/mmachina/mobile/SignUtils.java index 5c13fc3ba486ccdfc5716b32dafd4e2173ed170e..da40b807275a10c511e4b4f1e5b36a153dfd02db 100644 --- a/MobileTracking/libmobiletracking/src/main/java/cn/mmachina/mobile/SignUtils.java +++ b/MobileTracking/libmobiletracking/src/main/java/cn/mmachina/mobile/SignUtils.java @@ -6,21 +6,19 @@ package cn.mmachina.mobile; */ public class SignUtils { - static { System.loadLibrary("MMASignature"); } - /** * 签名函数 * * @param sdkVersion sdk版本号 * @param timestamp 事件触发时的时间戳 * @param originURL 原始监测链接 - * @return 返回签名后的36位字符串 + * @return 返回签名后的字符串 */ - public static native String mmaSdkSign(String sdkVersion, long timestamp, String originURL, String permissionType); + public static native String mmaSdkSign(String sdkVersion, long timestamp, String imei,String packagename, String modle,String originURL); } diff --git a/OutputRelease/lib_abi/arm64-v8a/libMMASignature.so b/OutputRelease/lib_abi/arm64-v8a/libMMASignature.so index 1f2637d0f531fece55ae027aa6041921eb173c40..f4e6d699641cd51a07435b280b9eab78d949a42c 100644 Binary files a/OutputRelease/lib_abi/arm64-v8a/libMMASignature.so and b/OutputRelease/lib_abi/arm64-v8a/libMMASignature.so differ diff --git a/OutputRelease/lib_abi/armeabi-v7a/libMMASignature.so b/OutputRelease/lib_abi/armeabi-v7a/libMMASignature.so index cf98d61c54faa6efa17dc68da8a14000000edfd0..aba376332b383c97b7b9d8142b470b682972a45c 100644 Binary files a/OutputRelease/lib_abi/armeabi-v7a/libMMASignature.so and b/OutputRelease/lib_abi/armeabi-v7a/libMMASignature.so differ diff --git a/OutputRelease/lib_abi/armeabi/libMMASignature.so b/OutputRelease/lib_abi/armeabi/libMMASignature.so index 1286e37584eade88d5913e46b43c9222a04ebb09..005d44e290c0dbf6d18a4168100d69bdd6b5f2b1 100644 Binary files a/OutputRelease/lib_abi/armeabi/libMMASignature.so and b/OutputRelease/lib_abi/armeabi/libMMASignature.so differ diff --git a/OutputRelease/lib_abi/mips/libMMASignature.so b/OutputRelease/lib_abi/mips/libMMASignature.so index f316c297e0baa6af68c6ea9b9233654c6092768a..714d4e759f836b3ae98d62b93e164f99091818aa 100644 Binary files a/OutputRelease/lib_abi/mips/libMMASignature.so and b/OutputRelease/lib_abi/mips/libMMASignature.so differ diff --git a/OutputRelease/lib_abi/mips64/libMMASignature.so b/OutputRelease/lib_abi/mips64/libMMASignature.so index 33ab9077ed2764bb05482336d57ac1a9c4aa200c..de0581b7032fe2e7e9277bcbb6d84e0e1e67e545 100644 Binary files a/OutputRelease/lib_abi/mips64/libMMASignature.so and b/OutputRelease/lib_abi/mips64/libMMASignature.so differ diff --git a/OutputRelease/lib_abi/x86/libMMASignature.so b/OutputRelease/lib_abi/x86/libMMASignature.so index 40fcc5516c5b00d06e7409eef57acc70ec01c513..f76a1a83d6d48d863144f9a15e0abfeca831174f 100644 Binary files a/OutputRelease/lib_abi/x86/libMMASignature.so and b/OutputRelease/lib_abi/x86/libMMASignature.so differ diff --git a/OutputRelease/lib_abi/x86_64/libMMASignature.so b/OutputRelease/lib_abi/x86_64/libMMASignature.so index 811c1ab0df24f66dde1e3684cba40383389644cb..d83de9f3bff457672e1853b1bbda7ec10d53dcd6 100644 Binary files a/OutputRelease/lib_abi/x86_64/libMMASignature.so and b/OutputRelease/lib_abi/x86_64/libMMASignature.so differ diff --git a/OutputRelease/mmachina_sdk.jar b/OutputRelease/mmachina_sdk.jar index 53e0f952eab96667a355310a3c0ec0beb8729908..c57734930c15502507650db78e921914e9868e74 100644 Binary files a/OutputRelease/mmachina_sdk.jar and b/OutputRelease/mmachina_sdk.jar differ