diff --git a/app/build.gradle b/app/build.gradle
index 91132b5..c2ab244 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 28
defaultConfig {
- applicationId "com.hnjc.wjtx.mi"
+ applicationId "com.dca.wjtx"
minSdkVersion 18
targetSdkVersion 26
versionCode 1
diff --git a/app/src/main/java/com/hnjc/wjtx/MainActivity.java b/app/src/main/java/com/hnjc/wjtx/MainActivity.java
index 333b9cc..017a3f6 100755
--- a/app/src/main/java/com/hnjc/wjtx/MainActivity.java
+++ b/app/src/main/java/com/hnjc/wjtx/MainActivity.java
@@ -22,7 +22,6 @@ import android.widget.ImageView;
import android.widget.Toast;
import com.hnjc.wjtx.util.AssetsUtil;
-import com.hnjc.wjtx.util.IdUtil;
import com.hnjc.wjtx.util.StorageUtil;
import com.hnjc.wjtx.util.StringUtil;
import com.quicksdk.QuickSDK;
@@ -47,6 +46,8 @@ import java.util.UUID;
public class MainActivity extends Activity {
private final String TAG = "MainActivity";
+ private final String PRODUCT_CODE = "53944027057769834819388076876412";
+ private final String PRODUCT_KEY = "70611892";
private EgretNativeAndroid nativeAndroid;
private ImageView launchScreenImageView = null;
private FrameLayout rootLayout = null;
@@ -105,7 +106,7 @@ public class MainActivity extends Activity {
// 设置通知，用于监听初始化，登录，注销，支付及退出功能的返回值(必接)
initQkNotifiers();
// 请将下面语句中的第二与第三个参数，替换成QuickSDK后台申请的productCode和productKey值，目前的值仅作为示例
- Sdk.getInstance().init(this, "88049844578484520615487574815873", "82414864");
+ Sdk.getInstance().init(this, PRODUCT_CODE, PRODUCT_KEY);
}
} catch (Exception e) {
// 异常 继续申请
@@ -241,17 +242,7 @@ public class MainActivity extends Activity {
});
nativeAndroid.setExternalInterface("getUid", message -> {
//TODO: 平台的登陆
- JSONObject obj = new JSONObject();
- try {
- obj.put("openid", IdUtil.getUid(this));
- obj.put("token", "");
- // 如果其他登陆过程中的错误, 则传入一个大于0的errorcode
- obj.put("errorcode", 1);
- nativeAndroid.callExternalInterface("sendUidToJS", obj.toString());
- } catch (JSONException e) {
- e.printStackTrace();
- nativeAndroid.callExternalInterface("loginCancel", "");
- }
+ com.quicksdk.User.getInstance().login(MainActivity.this);
});
nativeAndroid.setExternalInterface("@onState", message -> {
@@ -344,9 +335,10 @@ public class MainActivity extends Activity {
if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
//申请成功
initQkNotifiers();
- Sdk.getInstance().init(this, "88049844578484520615487574815873", "82414864");
+ Sdk.getInstance().init(this, PRODUCT_CODE, PRODUCT_KEY);
} else {
//失败 这里逻辑以游戏为准 这里只是模拟申请失败 退出游戏 cp方可改为继续申请 或者其他逻辑
+ nativeAndroid.exitGame();
System.exit(0);
finish();
}
@@ -414,22 +406,41 @@ public class MainActivity extends Activity {
@Override
public void onSuccess(UserInfo userInfo) {
if (userInfo != null) {
- Log.i(TAG, "登陆成功" + "\n\r" + "UserID: " + userInfo.getUID() + "\n\r" + "UserName: " + userInfo.getUserName() + "\n\r"
- + "Token: " + userInfo.getToken());
+ Log.i(TAG, "登陆成功" + "\n\r" + "UserID: " + userInfo.getUID()
+ + "\n\r" + "UserName: " + userInfo.getUserName()
+ + "\n\r" + "Token: " + userInfo.getToken()
+ + "\n\r" + "PlatformUid: " + userInfo.getPlatformUid()
+ + "\n\r" + "ChannelToken: " + userInfo.getChannelToken()
+ );
// 登录成功之后，进入游戏时，需要向渠道提交用户信息
- // setUserInfo();
+ JSONObject obj = new JSONObject();
+ try {
+ obj.put("openid", userInfo.getUID());
+ obj.put("token", userInfo.getToken());
+ obj.put("polySdkChannel", (MainActivity.this).getString(R.string.polySdkChannel));
+ obj.put("polySdkSubchannel", (MainActivity.this).getString(R.string.polySdkSubchannel));
+
+ // 如果其他登陆过程中的错误, 则传入一个大于0的errorcode
+// obj.put("errorcode", 1);
+ nativeAndroid.callExternalInterface("sendUidToJS", obj.toString());
+ } catch (JSONException e) {
+ e.printStackTrace();
+ nativeAndroid.callExternalInterface("loginCancel", "");
+ }
}
}
@Override
public void onCancel() {
Log.i(TAG, "取消登陆");
+ nativeAndroid.callExternalInterface("loginCancel", "");
}
@Override
public void onFailed(final String message, String trace) {
Log.i(TAG, "登陆失败:" + message);
+ nativeAndroid.callExternalInterface("loginCancel", "");
}
})
@@ -439,6 +450,7 @@ public class MainActivity extends Activity {
@Override
public void onSuccess() {
Log.i(TAG, "注销成功");
+ nativeAndroid.callExternalInterface("loginOut", "");
}
@Override
@@ -454,6 +466,7 @@ public class MainActivity extends Activity {
if (userInfo != null) {
Log.i(TAG, "切换账号成功" + "\n\r" + "UserID: " + userInfo.getUID() + "\n\r" + "UserName: " + userInfo.getUserName() + "\n\r"
+ "Token: " + userInfo.getToken());
+ nativeAndroid.callExternalInterface("changeAccount", "");
}
}
@@ -473,16 +486,40 @@ public class MainActivity extends Activity {
@Override
public void onSuccess(String sdkOrderID, String cpOrderID, String extrasParams) {
Log.i(TAG, "支付成功，sdkOrderID:" + sdkOrderID + ",cpOrderID:" + cpOrderID);
+ JSONObject obj = new JSONObject();
+ try {
+ obj.put("errcode", 0);
+ obj.put("errmsg", "");
+ nativeAndroid.callExternalInterface("payResult", obj.toString());
+ } catch (JSONException e) {
+ e.printStackTrace();
+ }
}
@Override
public void onCancel(String cpOrderID) {
Log.i(TAG, "支付取消，cpOrderID:" + cpOrderID);
+ JSONObject obj = new JSONObject();
+ try {
+ obj.put("errcode", 1);
+ obj.put("errmsg", "支付失败:" + "pay failed,cpOrderID:" + cpOrderID + ",message: 支付取消" );
+ nativeAndroid.callExternalInterface("payResult", obj.toString());
+ } catch (JSONException e) {
+ e.printStackTrace();
+ }
}
@Override
public void onFailed(String cpOrderID, String message, String trace) {
Log.i(TAG, "支付失败:" + "pay failed,cpOrderID:" + cpOrderID + ",message:" + message);
+ JSONObject obj = new JSONObject();
+ try {
+ obj.put("errcode", 1);
+ obj.put("errmsg", "支付失败:" + "pay failed,cpOrderID:" + cpOrderID + ",message:" + message);
+ nativeAndroid.callExternalInterface("payResult", obj.toString());
+ } catch (JSONException e) {
+ e.printStackTrace();
+ }
}
})
// 6.设置退出通知(必接)
@@ -491,6 +528,7 @@ public class MainActivity extends Activity {
@Override
public void onSuccess() {
// 进行游戏本身的退出操作，下面的finish()只是示例
+ nativeAndroid.exitGame();
finish();
}
diff --git a/app/src/main/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 0000000..288b665
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-hdpi/qk_game_load01.png b/app/src/main/res/drawable-hdpi/qk_game_load01.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/qk_game_load01.png
rename to app/src/main/res/drawable-hdpi/qk_game_load01.png
diff --git a/app/src/main/res/mipmap-hdpi/qk_game_load02.png b/app/src/main/res/drawable-hdpi/qk_game_load02.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/qk_game_load02.png
rename to app/src/main/res/drawable-hdpi/qk_game_load02.png
diff --git a/app/src/main/res/mipmap-hdpi/qk_game_load03.png b/app/src/main/res/drawable-hdpi/qk_game_load03.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/qk_game_load03.png
rename to app/src/main/res/drawable-hdpi/qk_game_load03.png
diff --git a/app/src/main/res/mipmap-hdpi/qk_game_load04.png b/app/src/main/res/drawable-hdpi/qk_game_load04.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/qk_game_load04.png
rename to app/src/main/res/drawable-hdpi/qk_game_load04.png
diff --git a/app/src/main/res/mipmap-hdpi/qk_game_load05.png b/app/src/main/res/drawable-hdpi/qk_game_load05.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/qk_game_load05.png
rename to app/src/main/res/drawable-hdpi/qk_game_load05.png
diff --git a/app/src/main/res/mipmap-hdpi/qk_game_load06.png b/app/src/main/res/drawable-hdpi/qk_game_load06.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/qk_game_load06.png
rename to app/src/main/res/drawable-hdpi/qk_game_load06.png
diff --git a/app/src/main/res/mipmap-hdpi/qk_game_load07.png b/app/src/main/res/drawable-hdpi/qk_game_load07.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/qk_game_load07.png
rename to app/src/main/res/drawable-hdpi/qk_game_load07.png
diff --git a/app/src/main/res/mipmap-hdpi/qk_game_load08.png b/app/src/main/res/drawable-hdpi/qk_game_load08.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/qk_game_load08.png
rename to app/src/main/res/drawable-hdpi/qk_game_load08.png
diff --git a/app/src/main/res/mipmap-hdpi/qk_game_loadbg.png b/app/src/main/res/drawable-hdpi/qk_game_loadbg.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/qk_game_loadbg.png
rename to app/src/main/res/drawable-hdpi/qk_game_loadbg.png
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1b6b991..2a86ddb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,10 +3,12 @@
下载游戏资源
进入游戏
preload
- http://local/index.html?channel=7103
+ http://local/index.html?channel=8001
1.0.0
load_back
获取游戏版本
正在更新游戏资源
正在解压游戏资源
+ 8001
+ 1700
diff --git a/gradle.properties b/gradle.properties
index 7af682e..a7ed372 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,5 +16,4 @@ org.gradle.jvmargs=-Xmx1536m
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
-android.injected.testOnly=false
-android.enableJetifier=true
\ No newline at end of file
+android.injected.testOnly=false
\ No newline at end of file