client/wjtx_native
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改vivo相关文件的位置, 移除activity的切换动画

Browse Source
This commit is contained in:
zhl 2020-11-19 15:10:32 +08:00
parent a83dd79e27
commit 9c6a55f164
6 changed files with 46 additions and 285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/assets/supplierconfig.json
View File

@ -1,17 +0,0 @@
{
"supplier":{
"vivo":{
"appid":"104485272"
},
"xiaomi":{
},
"huawei":{
},
"oppo":{
}
}
}

BIN
app/src/main/assets/vivounionsdk/vivounionapk.vua
View File

Binary file not shown.

244
app/src/main/assets/vivounionsdk/vivounionchecklist.xml
View File

@ -1,244 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- activity可正反向检测，service/provider/broadcast只做反向检测 -->
<tests xmlns:android="http://schemas.android.com/apk/res/com.vivo.sdkplugin">
<!-- 正向 -->
<!-- 权限 -->
<uses-permission android:name="vivo.game.permission.OPEN_JUMP_INTENTS"/>
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.GET_TASKS"/>
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
<!-- APK/SDK:通用activity -->
<activity android:configChanges="orientation|keyboardHidden|navigation|screenSize"
android:name="com.vivo.unionsdk.ui.UnionActivity"
android:theme="@android:style/Theme.Dialog">
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.BROWSABLE"/>
<data android:host="union.vivo.com"
android:path="/openjump"
android:scheme="vivounion"/>
</intent-filter>
</activity>
<meta-data android:name="vivo_union_sdk"/>
<!-- 反向 -->
<!-- 测试界面 -->
<activity android:include="false"
android:name="com.vivo.sdkplugin.TestActivity"/>
<!-- aidl service -->
<service android:include="false"
android:name="com.vivo.plugin.aidl.LoginAccInfoService"/>
<!-- 自升级对话框 -->
<activity android:include="false"
android:name="com.vivo.upgradelibrary.upmode.VivoUpgradeActivityDialog"/>
<!-- 权限检测对话框 -->
<activity android:include="false"
android:name="com.vivo.unionsdk.ui.PermissionAlertActivity"/>
<activity android:include="false"
android:name="com.alipay.sdk.auth.AuthActivity"/>
<!--SDK含有功能时期声明 start-->
<!--微信支付回调-->
<activity android:include="false"
android:name="@_pkg_@.wxapi.WXPayEntryActivity"/>
<!--QQ钱包支付回调-->
<activity android:include="false"
android:name="com.vivo.sdkplugin.payment.qqpay.VivoQQPayResultActivity"/>
<!--银联支付-->
<activity android:include="false"
android:name="com.unionpay.uppay.PayActivity"/>
<!--支付宝支付-->
<activity android:include="false"
android:name="com.alipay.sdk.app.H5PayActivity"/>
<!--SDK含有功能时期声明 end-->
<!-- 老版本声明 start -->
<activity android:include="false"
android:name="com.vivo.sdkplugin.activity.LoginActivity"/>
<activity android:include="false"
android:name="com.vivo.sdkplugin.activity.ChangePassWordActivity"/>
<activity android:include="false"
android:name="com.vivo.sdkplugin.activity.BindQuestionActivity"/>
<activity android:include="false"
android:name="com.vivo.sdkplugin.activity.BindPhoneActivity"/>
<activity android:include="false"
android:name="com.vivo.sdkplugin.activity.GameInfoMoreListActivity"/>
<activity android:include="false"
android:name="com.vivo.sdkplugin.activity.AccountPersonalCenterActivity"/>
<activity android:include="false"
android:name="com.vivo.sdkplugin.activity.AccountAssistWebViewActivity"/>
<activity android:include="false"
android:name="com.vivo.sdkplugin.activity.FindpwdVerifyPhoneNumActivity"/>
<activity android:include="false"
android:name="com.vivo.sdkplugin.activity.LoginDialogActivity"/>
<activity android:include="false"
android:name="com.vivo.sdkplugin.activity.UserFeedBackActivity"/>
<activity android:include="false"
android:name="com.vivo.sdkplugin.activity.SetpwdActivity"/>
<activity android:include="false"
android:name="com.vivo.sdkplugin.activity.RegisterEmailActiviy"/>
<activity android:include="false"
android:name="com.vivo.sdkplugin.activity.RegisterActivity"/>
<activity android:include="false"
android:name="com.vivo.sdkplugin.activity.PhoneRegisterCommitActivity"/>
<activity android:include="false"
android:name="com.vivo.sdkplugin.activity.RegisterOneKeyActivity"/>
<activity android:include="false"
android:name="com.vivo.sdkplugin.activity.VerifyPhoneNumActivity"/>
<activity android:include="false"
android:name="com.vivo.sdkplugin.activity.FindPasswordActivity"/>
<activity android:include="false"
android:name="com.vivo.sdkplugin.activity.SetPassWordActivity"/>
<activity android:include="false"
android:name="com.vivo.sdkplugin.activity.RegisterProtocolActivity"/>
<activity android:include="false"
android:name="com.vivo.sdkplugin.activity.CommitUserIdentifyActivity"/>
<activity android:include="false"
android:name="com.vivo.sdkplugin.activity.CommitUserContactActivity"/>
<activity android:include="false"
android:name="com.vivo.sdkplugin.activity.StrategyDetailActivity"/>
<activity android:include="false"
android:name="com.vivo.sdkplugin.activity.SubAccountActivity"/>
<activity android:include="false"
android:name="com.vivo.sdkplugin.activity.SubAccountEditActivity"/>
<activity android:include="false"
android:name="com.vivo.sdkplugin.activity.SubAccountEditCommitActivity"/>
<activity android:include="false"
android:name="com.vivo.sdkplugin.activity.SubAccountAddCommitActivity"/>
<activity android:include="false"
android:name="com.vivo.sdkplugin.activity.VivoUserInfoActivity"/>
<activity android:include="false"
android:name="com.bbk.payment.dealRecord.VivoDealRecordActivity"/>
<activity android:include="false"
android:name="com.bbk.payment.dealRecord.VivoDealRecordDetailActivity"/>
<activity android:include="false"
android:name="com.bbk.payment.PaymentActivity"/>
<activity android:include="false"
android:name="com.bbk.payment.PaymentRechargeActivity"/>
<activity android:include="false"
android:name="com.bbk.payment.SelectMoreChannelActivity"/>
<activity android:include="false"
android:name="com.bbk.payment.TicketActivity"/>
<activity android:include="false"
android:name="com.bbk.payment.PaymentActionActivity"/>
<activity android:include="false"
android:name="com.bbk.payment.CardActivity"/>
<activity android:include="false"
android:name="com.bbk.payment.RechargeChoiceActivity"/>
<activity android:include="false"
android:name="com.bbk.payment.PaySuccActivity"/>
<activity android:include="false"
android:name="com.bbk.payment.JCardActivity"/>
<activity android:include="false"
android:name="com.bbk.payment.DetectPayResultActivity"/>
<activity android:include="false"
android:name="com.bbk.payment.PayContinueActivity"/>
<activity android:include="false"
android:name="com.bbk.payment.RechargeFailActivity"/>
<activity android:include="false"
android:name="com.bbk.payment.PaymentDetailsActivity"/>
<activity android:include="false"
android:name="com.bbk.payment.tenpay.VivoQQPayResultActivity"/>
<activity android:include="false"
android:name="com.bbkmobile.iqoo.payment.PaymentActivity"/>
<activity android:include="false"
android:name="com.bbkmobile.iqoo.payment.CardActivity"/>
<activity android:include="false"
android:name="com.bbkmobile.iqoo.payment.tenpay.VivoQQPayResultActivity"/>
<activity android:include="false"
android:name="@_pkg_@.wxapi.WXSPayEntryActivity"/>
<service android:include="false"
android:name="com.vivo.sdkplugin.accounts.LocalService"/>
<service android:include="false"
android:name="com.vivo.sdkplugin.accounts.LogWatcherService"/>
<service android:include="false"
android:name="com.vivo.sdkplugin.service.VivoAccountService"/>
<service android:include="false"
android:name="com.vivo.assist.AssistService"/>
<receiver android:include="false"
android:name="com.vivo.sdkplugin.accounts.SendMsgReceiver"/>
<receiver android:include="false"
android:name="com.vivo.sdkplugin.accounts.ManageAccountReceiver"/>
<receiver android:include="false"
android:name="com.vivo.sdkplugin.accounts.VivoApkInstallRecevier"/>
<receiver android:include="false"
android:name="com.vivo.sdkplugin.accounts.VivoIThemeChangeRecevier"/>
<receiver android:include="false"
android:name="com.bbkmobile.iqoo.payment.util.ManagePamentReceiver"/>
<!-- 老版本声明 end -->
<!-- 更老版本声明 start -->
<activity android:include="false"
android:name="com.vivo.account.base.activity.LoginActivity"/>
<activity android:include="false"
android:name="com.vivo.account.base.activity.GameInfoMoreListActivity"/>
<activity android:include="false"
android:name="com.vivo.account.base.activity.ChangePassWordActivity"/>
<activity android:include="false"
android:name="com.vivo.account.base.activity.BindQuestionActivity"/>
<activity android:include="false"
android:name="com.vivo.account.base.activity.BindPhoneActivity"/>
<activity android:include="false"
android:name="com.vivo.account.base.activity.AccountPersonalCenterActivity"/>
<activity android:include="false"
android:name="com.vivo.account.base.activity.AccountAssistWebViewActivity"/>
<activity android:include="false"
android:name="com.vivo.account.base.activity.FindpwdVerifyPhoneNumActivity"/>
<activity android:include="false"
android:name="com.vivo.account.base.activity.LoginDialogActivity"/>
<activity android:include="false"
android:name="com.vivo.account.base.activity.UserFeedBackActivity"/>
<activity android:include="false"
android:name="com.vivo.account.base.activity.SetpwdActivity"/>
<activity android:include="false"
android:name="com.vivo.account.base.activity.RegisterEmailActiviy"/>
<activity android:include="false"
android:name="com.vivo.account.base.activity.RegisterActivity"/>
<activity android:include="false"
android:name="com.vivo.account.base.activity.PhoneRegisterCommitActivity"/>
<activity android:include="false"
android:name="com.vivo.account.base.activity.RegisterOneKeyActivity"/>
<activity android:include="false"
android:name="com.vivo.account.base.activity.VerifyPhoneNumActivity"/>
<activity android:include="false"
android:name="com.vivo.account.base.activity.FindPasswordActivity"/>
<activity android:include="false"
android:name="com.vivo.account.base.activity.SetPassWordActivity"/>
<activity android:include="false"
android:name="com.vivo.account.base.activity.RegisterProtocolActivity"/>
<activity android:include="false"
android:name="com.vivo.account.base.activity.CommitUserIdentifyActivity"/>
<activity android:include="false"
android:name="com.vivo.account.base.activity.CommitUserContactActivity"/>
<activity android:include="false"
android:name="com.vivo.account.base.activity.StrategyDetailActivity"/>
<activity android:include="false"
android:name="com.vivo.account.base.activity.SubAccountActivity"/>
<activity android:include="false"
android:name="com.bbk.payment.weixin.VivoWXPayEntryActivity"/>
<service android:include="false"
android:name="com.vivo.account.base.accounts.LocalService"/>
<service android:include="false"
android:name="com.vivo.account.base.accounts.LogWatcherService"/>
<receiver android:include="false"
android:name="com.vivo.account.base.accounts.SendMsgReceiver"/>
<receiver android:include="false"
android:name="com.vivo.account.base.accounts.ManageAccountReceiver"/>
<receiver android:include="false"
android:name="com.vivo.account.base.accounts.VivoApkInstallRecevier"/>
<!-- 更老版本声明 end -->
</tests>

39
app/src/main/java/com/hnjc/wjtx/LaunchActivity.java
View File

@ -25,12 +25,12 @@ import org.json.JSONObject;
import java.io.File; import java.io.File;
public class LaunchActivity extends Activity { public class LaunchActivity extends Activity {
private static final String[] permissions = {Manifest.permission.WRITE_EXTERNAL_STORAGE};
private final String TAG = "LaunchActivity"; private final String TAG = "LaunchActivity";
private final String ZERO_VERSION = "0"; private final String ZERO_VERSION = "0";
private ProgressBar progressBar = null; private ProgressBar progressBar = null;
private TextView progressLabel = null; private TextView progressLabel = null;
private WebApi webApi; private WebApi webApi;
private String zipUrl; private String zipUrl;
private String gameUrl; private String gameUrl;
private String preloadPath; private String preloadPath;
@ -43,13 +43,9 @@ public class LaunchActivity extends Activity {
private String versionStr; private String versionStr;
private String downloadStr; private String downloadStr;
private String unzipStr; private String unzipStr;
private TaskInfo info;//任务信息 private TaskInfo info;//任务信息
private DownloadRunnable runnable;//下载任务 private DownloadRunnable runnable;//下载任务
private UnzipRunnable unzipRunnable; // 解压任务 private UnzipRunnable unzipRunnable; // 解压任务
private static final String[] permissions = {Manifest.permission.WRITE_EXTERNAL_STORAGE};
private Handler handler = new Handler(new Handler.Callback() { private Handler handler = new Handler(new Handler.Callback() {
@Override @Override
public boolean handleMessage(Message msg) { public boolean handleMessage(Message msg) {
@ -59,7 +55,7 @@ public class LaunchActivity extends Activity {
int l = (int) ((float) info.getCompletedLen() / (float) info.getContentLen() * 100); int l = (int) ((float) info.getCompletedLen() / (float) info.getContentLen() * 100);
//设置进度条进度 //设置进度条进度
updateProgress(l); updateProgress(l);
if (l>=100) {//当进度>=100时，取消Handler循环 if (l >= 100) {//当进度>=100时，取消Handler循环
handler.removeCallbacksAndMessages(null); handler.removeCallbacksAndMessages(null);
if (info.getType() == 0) { if (info.getType() == 0) {
File file = new File(info.getPath() + info.getName()); File file = new File(info.getPath() + info.getName());
@ -74,6 +70,12 @@ public class LaunchActivity extends Activity {
} }
}); });
private static String getFileDirByUrl(String urlString) {
int lastSlash = urlString.lastIndexOf('/');
String server = urlString.substring(0, lastSlash + 1);
return server.replaceFirst("://", "/").replace(":", "#0A");
}
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@ -101,9 +103,11 @@ public class LaunchActivity extends Activity {
private void updateProgress(int val) { private void updateProgress(int val) {
progressBar.setProgress(val); progressBar.setProgress(val);
} }
private void changeLoadTxt(String title) { private void changeLoadTxt(String title) {
progressLabel.setText(title); progressLabel.setText(title);
} }
private void compareVersions() { private void compareVersions() {
changeLoadTxt(versionStr); changeLoadTxt(versionStr);
updateProgress(10); updateProgress(10);
@ -123,6 +127,7 @@ public class LaunchActivity extends Activity {
updateProgress(60); updateProgress(60);
getRemoteVersionInfo(); getRemoteVersionInfo();
} }
/** /**
* 获取位于预加载目录version.json中的版本号 * 获取位于预加载目录version.json中的版本号
*/ */
@ -139,6 +144,7 @@ public class LaunchActivity extends Activity {
} }
} }
} }
/** /**
* 获取位于assets目录version.json中的版本号 * 获取位于assets目录version.json中的版本号
*/ */
@ -152,6 +158,7 @@ public class LaunchActivity extends Activity {
} }
} }
} }
/** /**
* 获取远程资源的版本号 * 获取远程资源的版本号
*/ */
@ -197,6 +204,7 @@ public class LaunchActivity extends Activity {
} }
}); });
} }
private void preloadGame() { private void preloadGame() {
String dir = preloadPath + getFileDirByUrl(gameUrl); String dir = preloadPath + getFileDirByUrl(gameUrl);
File dirFile = new File(dir); File dirFile = new File(dir);
@ -229,12 +237,6 @@ public class LaunchActivity extends Activity {
handler.sendEmptyMessageDelayed(1, 200); handler.sendEmptyMessageDelayed(1, 200);
} }
private static String getFileDirByUrl(String urlString) {
int lastSlash = urlString.lastIndexOf('/');
String server = urlString.substring(0, lastSlash + 1);
return server.replaceFirst("://", "/").replace(":", "#0A");
}
private void emptyPreload() { private void emptyPreload() {
File dirFile = new File(preloadPath); File dirFile = new File(preloadPath);
if (dirFile.exists() && dirFile.isDirectory()) { if (dirFile.exists() && dirFile.isDirectory()) {
@ -244,6 +246,7 @@ public class LaunchActivity extends Activity {
} }
} }
} }
private void deletePreloadFile(File file) { private void deletePreloadFile(File file) {
if (file.isDirectory()) { if (file.isDirectory()) {
File[] files = file.listFiles(); File[] files = file.listFiles();
@ -255,20 +258,30 @@ public class LaunchActivity extends Activity {
file.delete(); file.delete();
} }
} }
private void startMain() { private void startMain() {
Intent intent = new Intent(LaunchActivity.this, MainActivity.class); Intent intent = new Intent(LaunchActivity.this, MainActivity.class);
intent.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
intent.putExtra("preloadPath", preloadPath); intent.putExtra("preloadPath", preloadPath);
startActivity(intent); startActivity(intent);
overridePendingTransition(0, 0);
finish(); finish();
} }
@Override @Override
protected void onDestroy() { protected void onDestroy() {
//在Activity销毁时移除回调和msg，并置空，防止内存泄露 //在Activity销毁时移除回调和msg，并置空，防止内存泄露
if(handler != null){ if (handler != null) {
handler.removeCallbacksAndMessages(null); handler.removeCallbacksAndMessages(null);
handler = null; handler = null;
} }
super.onDestroy(); super.onDestroy();
} }
@Override
public void finish() {
super.finish();
overridePendingTransition(0, 0);
}
} }

29
app/src/main/java/com/hnjc/wjtx/MainActivity.java
View File

@ -42,33 +42,31 @@ public class MainActivity extends Activity {
private Vibrator vibrator; private Vibrator vibrator;
//用户uid //用户uid
private String mUid = ""; private String mUid = "";
private String mAuthToken = "";
//游戏订单号 //游戏订单号
private String cpPayOrderNumber; private String cpPayOrderNumber;
//订单金额 //订单金额
private String cpOrderAmount; private String cpOrderAmount;
private VivoAccountCallback mAcccountCallback = new VivoAccountCallback() { private final VivoAccountCallback mAcccountCallback = new VivoAccountCallback() {
@Override @Override
public void onVivoAccountLogin(String userName, String uid, String authToken) { public void onVivoAccountLogin(String userName, String uid, String authToken) {
// 1. 收到登录成功回调后，调用服务端接口校验登录有效性。arg2返回值为authtoken。服务端接口详见文档。校验登录代码略。 // 1. 收到登录成功回调后，调用服务端接口校验登录有效性。arg2返回值为authtoken。服务端接口详见文档。校验登录代码略。
mUid = uid; mUid = uid;
// 2. 登录成功后上报角色信息 mAuthToken = authToken;
VivoUnionHelper.reportRoleInfo(new VivoRoleInfo("角色ID", "角色等级", "角色名称", "区服ID", "区服名称")); sendUidToGame(mUid, mAuthToken);
// 3. 处理自己的登录成功逻辑
Toast.makeText(MainActivity.this, "登录成功", Toast.LENGTH_SHORT).show();
//登录成功 //登录成功
VivoUnionHelper.queryMissOrderResult(uid); VivoUnionHelper.queryMissOrderResult(uid);
} }
@Override @Override
public void onVivoAccountLogout(int i) { public void onVivoAccountLogout(int i) {
nativeAndroid.callExternalInterface("loginOut", "");
} }
@Override @Override
public void onVivoAccountLoginCancel() { public void onVivoAccountLoginCancel() {
nativeAndroid.callExternalInterface("loginCancel", "");
} }
}; };
@ -251,7 +249,7 @@ public class MainActivity extends Activity {
Toast.makeText(MainActivity.this, message, Toast.LENGTH_LONG).show(); Toast.makeText(MainActivity.this, message, Toast.LENGTH_LONG).show();
}); });
nativeAndroid.setExternalInterface("getUid", message -> { nativeAndroid.setExternalInterface("getUid", message -> {
//TODO: 平台的登陆 loginVivoAccount();
}); });
nativeAndroid.setExternalInterface("@onState", message -> { nativeAndroid.setExternalInterface("@onState", message -> {
Log.e(TAG, "Get @onState: " + message); Log.e(TAG, "Get @onState: " + message);
@ -351,7 +349,7 @@ public class MainActivity extends Activity {
*/ */
public void loginVivoAccount() { public void loginVivoAccount() {
if (!TextUtils.isEmpty(mUid)) { if (!TextUtils.isEmpty(mUid)) {
Toast.makeText(this, "已登录成功，禁止重复登录", Toast.LENGTH_SHORT).show(); sendUidToGame(mUid, mAuthToken);
return; return;
} }
@ -406,4 +404,15 @@ public class MainActivity extends Activity {
// VivoUnionHelper.payNowV2(this, vivoPayInfo, mVivoPayCallback, code); // VivoUnionHelper.payNowV2(this, vivoPayInfo, mVivoPayCallback, code);
} }
private void sendUidToGame(String uid, String token) {
JSONObject obj = new JSONObject();
try {
obj.put("openid", uid);
obj.put("token", token);
nativeAndroid.callExternalInterface("sendUidToJS", obj.toString());
} catch (JSONException e) {
e.printStackTrace();
}
}
} }

2
platform.js
View File

@ -12,7 +12,7 @@ class GamePlatform {
this.jcGameId = 1009; this.jcGameId = 1009;
this.jcChannelId = getQueryString('channel') ? Number(getQueryString('channel')) : 7103; this.jcChannelId = getQueryString('channel') ? Number(getQueryString('channel')) : 7103;
console.log('jcchannelid: ' + this.jcChannelId); console.log('jcchannelid: ' + this.jcChannelId);
this.isDev = false; this.isDev = true;
this.orderIdUrl = `https://game1009proxy${this.isDev ? '-test':''}.kingsome.cn/webapp/index.php?c=Pay&a=preOrder`; this.orderIdUrl = `https://game1009proxy${this.isDev ? '-test':''}.kingsome.cn/webapp/index.php?c=Pay&a=preOrder`;
this.checkRegRewardUrl = `https://game1009proxy${this.isDev ? '-test':''}.kingsome.cn/webapp/index.php?c=GoProxy&a=checkRegisterReward`; this.checkRegRewardUrl = `https://game1009proxy${this.isDev ? '-test':''}.kingsome.cn/webapp/index.php?c=GoProxy&a=checkRegisterReward`;
this.regRewardUrl = `https://game1009proxy${this.isDev ? '-test':''}.kingsome.cn/webapp/index.php?c=GoProxy&a=registerReward`; this.regRewardUrl = `https://game1009proxy${this.isDev ? '-test':''}.kingsome.cn/webapp/index.php?c=GoProxy&a=registerReward`;