|
|
@@ -42,8 +42,8 @@ import org.json.JSONObject;
|
|
|
|
|
|
import java.util.regex.Pattern;
|
|
|
|
|
|
-import vip.raex.oasismeta.BuildConfig;
|
|
|
-import vip.raex.oasismeta.R;
|
|
|
+import vip.raex.nft.BuildConfig;
|
|
|
+import vip.raex.nft.R;
|
|
|
|
|
|
/**
|
|
|
* This class echoes a string called from JavaScript.
|
|
|
@@ -52,7 +52,7 @@ public class UmengPlugin extends CordovaPlugin {
|
|
|
|
|
|
private final static String TAG = "CordovUmengPlugin";
|
|
|
private final static String umengKey = "62b5753a05844627b5c56bc8";
|
|
|
- private final static String umengSecret = "mIZqKz6cvkBKDh3D/dBmOxL76jOFTHhNSMtr0iluIYamZEXgBIITLHyL6v5t0skjp9Bwm0H9RVzNyb7GrYDB9VOlrDeFmI/sTdQyWTqmWPqEEcefzYWL0k3lah0bgcbeXV6m/Zi3zcRdFUssWScncllhEbUOgR7Pq6R+4HpkG3fyN3yvMnOApDV5TnTyPPCoAt097aXpvJpMT8Sk5X2qor1lW7xWuzejBh4xL7HuKJV6UV7+sQcXpBv/1eLlOAH2gWVzGCqT7PqCsMgrPi+aMw1jy+V+sSGhP2XpVEWS94M1wLYE45hq2Q==";
|
|
|
+ private final static String umengSecret = "+oY1et2uQC+eRcdrfsQ5+v/JB9BZVHz3p72arX0EgLUQ7A9AaOzfgxgcJyAR5gxy6JLHgV3OoM+c3aV87MmOHJesNy08T5WSWM47j+CbiglwUsrUl7joLj0ZQ+AeimovCLHqeZOSVrwSD8lzmN6rFXUPXEjcyS0mhetd5+hrEhACR/h/OlHzIXDsv4W3GW9NdvCJiF74+J95qU/5kRw8rseXnoMM9MSmOqefezcWaxFV4EcXuknCO9TBzhEpZL0FiFmG5GonpXJkmfWgrM7bta+bU7neiGabWqHXvZq7rpc=";
|
|
|
private final static String umengMessageSecret = "269f72d7c87938bef3a49dbe14fc4f16";
|
|
|
private final static String umengAppMasterSecret = "dlo3bqifmuuvbpmodmcyc2xnh0b1fphi";
|
|
|
|
|
|
@@ -68,8 +68,8 @@ public class UmengPlugin extends CordovaPlugin {
|
|
|
} else if ("closeLogin".equals(action)) {
|
|
|
closeLogin(callbackContext);
|
|
|
return true;
|
|
|
- } else if ("initPush".equals(action)) {
|
|
|
- initPush(callbackContext);
|
|
|
+ } else if ("init".equals(action)) {
|
|
|
+ init(callbackContext);
|
|
|
return true;
|
|
|
} else if ("shareImg".equals(action)) {
|
|
|
try {
|
|
|
@@ -118,50 +118,8 @@ public class UmengPlugin extends CordovaPlugin {
|
|
|
@Override
|
|
|
public void initialize(CordovaInterface cordova, CordovaWebView webView) {
|
|
|
super.initialize(cordova, webView);
|
|
|
- //日志开关
|
|
|
UMConfigure.setLogEnabled(true);
|
|
|
- UMConfigure.init(cordova.getContext(), umengKey, "android", UMConfigure.DEVICE_TYPE_PHONE, umengMessageSecret);
|
|
|
-
|
|
|
- // 微信设置
|
|
|
- PlatformConfig.setWeixin("wx6816dbdc07254dcb", "dc6a12cf5ea483a4d6a303a57b5f6654");
|
|
|
- PlatformConfig.setWXFileProvider(BuildConfig.APPLICATION_ID + ".fileprovider");
|
|
|
- // QQ设置. 78.
|
|
|
- PlatformConfig.setQQZone("101830139", "5d63ae8858f1caab67715ccd6c18d7a5");
|
|
|
- PlatformConfig.setQQFileProvider(BuildConfig.APPLICATION_ID + ".fileprovider");
|
|
|
- // 新浪微博设置
|
|
|
- PlatformConfig.setSinaWeibo("3921700954", "04b48b094faeb16683c32669824ebdad", "https://www.raex.vip");
|
|
|
- PlatformConfig.setSinaFileProvider(BuildConfig.APPLICATION_ID + ".fileprovider");
|
|
|
-
|
|
|
- mPhoneNumberAuthHelper = UMVerifyHelper.getInstance(this.cordova.getContext(), new UMTokenResultListener() {
|
|
|
- @Override
|
|
|
- public void onTokenSuccess(String s) {
|
|
|
- try {
|
|
|
- Log.i(TAG, "checkEnvAvailable:" + s);
|
|
|
- UMTokenRet tokenRet = UMTokenRet.fromJson(s);
|
|
|
- if (UMResultCode.CODE_ERROR_ENV_CHECK_SUCCESS.equals(tokenRet.getCode())) {
|
|
|
- accelerateLoginPage(5000);
|
|
|
- }
|
|
|
- if (UMResultCode.CODE_START_AUTHPAGE_SUCCESS.equals(tokenRet.getCode())) {
|
|
|
- Log.i("TAG", "唤起授权页成功:" + s);
|
|
|
- }
|
|
|
-
|
|
|
- if (UMResultCode.CODE_SUCCESS.equals(tokenRet.getCode())) {
|
|
|
- Log.i("TAG", "获取token成功:" + s);
|
|
|
- }
|
|
|
- } catch (Exception e) {
|
|
|
- e.printStackTrace();
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- @Override
|
|
|
- public void onTokenFailed(String s) {
|
|
|
- sdkAvailable = false;
|
|
|
- Log.e(TAG, "checkEnvAvailable:" + s);
|
|
|
- //终端环境检查失败之后 跳转到其他号码校验方式
|
|
|
- }
|
|
|
- });
|
|
|
- mPhoneNumberAuthHelper.setAuthSDKInfo(umengSecret);
|
|
|
- mPhoneNumberAuthHelper.checkEnvAvailable(UMVerifyHelper.SERVICE_TYPE_LOGIN);
|
|
|
+ UMConfigure.preInit(cordova.getContext(), umengKey, null);
|
|
|
}
|
|
|
|
|
|
public void login(CallbackContext callbackContext) {
|
|
|
@@ -200,8 +158,8 @@ public class UmengPlugin extends CordovaPlugin {
|
|
|
.setLogBtnTextColor(Color.BLACK)
|
|
|
.setLogBtnTextSize(15)
|
|
|
.setSwitchAccHidden(true)
|
|
|
- .setPrivacyState(true)
|
|
|
- .setCheckboxHidden(true)
|
|
|
+ .setPrivacyState(false)
|
|
|
+ .setCheckboxHidden(false)
|
|
|
.setVendorPrivacyPrefix("《")
|
|
|
.setVendorPrivacySuffix("》")
|
|
|
.setAppPrivacyColor(Color.WHITE, Color.parseColor("#3ab200"))
|
|
|
@@ -292,7 +250,50 @@ public class UmengPlugin extends CordovaPlugin {
|
|
|
});
|
|
|
}
|
|
|
|
|
|
- public void initPush(CallbackContext callbackContext) {
|
|
|
+ public void init(CallbackContext callbackContext) {
|
|
|
+ UMConfigure.submitPolicyGrantResult(cordova.getContext(), true);
|
|
|
+ UMConfigure.init(cordova.getContext(), umengKey, "android", UMConfigure.DEVICE_TYPE_PHONE, umengMessageSecret);
|
|
|
+
|
|
|
+ // 微信设置
|
|
|
+ PlatformConfig.setWeixin("wx6816dbdc07254dcb", "dc6a12cf5ea483a4d6a303a57b5f6654");
|
|
|
+ PlatformConfig.setWXFileProvider(BuildConfig.APPLICATION_ID + ".fileprovider");
|
|
|
+ // QQ设置. 78.
|
|
|
+ PlatformConfig.setQQZone("101830139", "5d63ae8858f1caab67715ccd6c18d7a5");
|
|
|
+ PlatformConfig.setQQFileProvider(BuildConfig.APPLICATION_ID + ".fileprovider");
|
|
|
+ // 新浪微博设置
|
|
|
+ PlatformConfig.setSinaWeibo("3921700954", "04b48b094faeb16683c32669824ebdad", "https://www.raex.vip");
|
|
|
+ PlatformConfig.setSinaFileProvider(BuildConfig.APPLICATION_ID + ".fileprovider");
|
|
|
+
|
|
|
+ mPhoneNumberAuthHelper = UMVerifyHelper.getInstance(this.cordova.getContext(), new UMTokenResultListener() {
|
|
|
+ @Override
|
|
|
+ public void onTokenSuccess(String s) {
|
|
|
+ try {
|
|
|
+ Log.i(TAG, "checkEnvAvailable:" + s);
|
|
|
+ UMTokenRet tokenRet = UMTokenRet.fromJson(s);
|
|
|
+ if (UMResultCode.CODE_ERROR_ENV_CHECK_SUCCESS.equals(tokenRet.getCode())) {
|
|
|
+ accelerateLoginPage(5000);
|
|
|
+ }
|
|
|
+ if (UMResultCode.CODE_START_AUTHPAGE_SUCCESS.equals(tokenRet.getCode())) {
|
|
|
+ Log.i("TAG", "唤起授权页成功:" + s);
|
|
|
+ }
|
|
|
+
|
|
|
+ if (UMResultCode.CODE_SUCCESS.equals(tokenRet.getCode())) {
|
|
|
+ Log.i("TAG", "获取token成功:" + s);
|
|
|
+ }
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public void onTokenFailed(String s) {
|
|
|
+ sdkAvailable = false;
|
|
|
+ Log.e(TAG, "checkEnvAvailable:" + s);
|
|
|
+ //终端环境检查失败之后 跳转到其他号码校验方式
|
|
|
+ }
|
|
|
+ });
|
|
|
+ mPhoneNumberAuthHelper.setAuthSDKInfo(umengSecret);
|
|
|
+ mPhoneNumberAuthHelper.checkEnvAvailable(UMVerifyHelper.SERVICE_TYPE_LOGIN);
|
|
|
cordova.getThreadPool().execute(() -> {
|
|
|
PushAgent.getInstance(cordova.getContext()).register(new UPushRegisterCallback() {
|
|
|
@Override
|