|
@@ -191,9 +191,27 @@ public class ActXianWanWeb extends BaseActivity {
|
|
|
String deviceId = DeviceIDUtil.getimei(activity);
|
|
String deviceId = DeviceIDUtil.getimei(activity);
|
|
|
String appId = xianWanEntity.getAndroid().getAppid();
|
|
String appId = xianWanEntity.getAndroid().getAppid();
|
|
|
String userId = DataUtil.getInstance().getUserId();
|
|
String userId = DataUtil.getInstance().getUserId();
|
|
|
|
|
+ String msaoaid = "";
|
|
|
|
|
+ int versionCode = Build.VERSION.SDK_INT;
|
|
|
String appSecret = xianWanEntity.getAndroid().getAppsecret();
|
|
String appSecret = xianWanEntity.getAndroid().getAppsecret();
|
|
|
- String keyCodeBefore = String.format(Locale.CHINA, "%s%s%d%s%s", appId, deviceId, pType, userId, appSecret);
|
|
|
|
|
|
|
+ String keyCodeBefore = String.format(Locale.CHINA, "%s%s%s%d%d%s%s",
|
|
|
|
|
+ appId,
|
|
|
|
|
+ deviceId,
|
|
|
|
|
+ msaoaid,
|
|
|
|
|
+ versionCode,
|
|
|
|
|
+ pType,
|
|
|
|
|
+ userId,
|
|
|
|
|
+ appSecret);
|
|
|
String keyCode = CommonUtil.getInstance().encrypt2Md5(keyCodeBefore);
|
|
String keyCode = CommonUtil.getInstance().encrypt2Md5(keyCodeBefore);
|
|
|
- return String.format(Locale.CHINA, "%s?ptype=%d&deviceid=%s&appid=%s&appsign=%s&keycode=%s", baseUrl, pType, deviceId, appId, userId, keyCode);
|
|
|
|
|
|
|
+
|
|
|
|
|
+ return String.format(Locale.CHINA, "%s?ptype=%d&deviceid=%s&appid=%s&appsign=%s&keycode=%s&androidosv=%d&msaoaid=%s",
|
|
|
|
|
+ baseUrl,
|
|
|
|
|
+ pType,
|
|
|
|
|
+ deviceId,
|
|
|
|
|
+ appId,
|
|
|
|
|
+ userId,
|
|
|
|
|
+ keyCode,
|
|
|
|
|
+ versionCode,
|
|
|
|
|
+ msaoaid);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|