diff --git a/app/build.gradle b/app/build.gradle index 08a4b4c..59c44cc 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.hnjc.wjtx.aligames" minSdkVersion 18 targetSdkVersion 28 versionCode 1 @@ -39,4 +39,6 @@ dependencies { implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'com.android.volley:volley:1.1.1' implementation 'org.greenrobot:eventbus:3.2.0' + implementation 'com.jakewharton:butterknife:8.2.1' + annotationProcessor('com.jakewharton:butterknife-compiler:8.2.1') } diff --git a/app/libs/alipaySdk-15.6.4-20190611174341.aar b/app/libs/alipaySdk-15.6.4-20190611174341.aar new file mode 100644 index 0000000..53bf180 Binary files /dev/null and b/app/libs/alipaySdk-15.6.4-20190611174341.aar differ diff --git a/app/libs/net-sdk-9.2.4.4.aar b/app/libs/net-sdk-9.2.4.4.aar new file mode 100644 index 0000000..1cad649 Binary files /dev/null and b/app/libs/net-sdk-9.2.4.4.aar differ diff --git a/app/libs/ugpsdk-net-7.6.3.1.aar b/app/libs/ugpsdk-net-7.6.3.1.aar new file mode 100644 index 0000000..46665c7 Binary files /dev/null and b/app/libs/ugpsdk-net-7.6.3.1.aar differ diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index f553295..512ddb0 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -83,7 +83,7 @@ -dontwarn android.support.** -keep class **.R$styleable{*;} --keep class com.hnjc.wjtx.mi.** { *; } +-keep class com.hnjc.wjtx.aligames.** { *; } -dontwarn com.hnjc.wjtx.mi.** diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d5882f7..5542834 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,8 @@ + xmlns:tools="http://schemas.android.com/tools" + package="com.hnjc.wjtx.aligames"> + @@ -10,8 +12,16 @@ + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - diff --git a/app/src/main/java/com/hnjc/wjtx/JCApplication.java b/app/src/main/java/com/hnjc/wjtx/JCApplication.java deleted file mode 100644 index e040a76..0000000 --- a/app/src/main/java/com/hnjc/wjtx/JCApplication.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.hnjc.wjtx; - -import android.app.Application; -import android.util.Log; - -public class JCApplication extends Application { - @Override - public void onCreate() { - super.onCreate(); - Log.i("JCApplication", "JCApplication onCreate"); - } -} diff --git a/app/src/main/java/com/hnjc/wjtx/aligames/JCApplication.java b/app/src/main/java/com/hnjc/wjtx/aligames/JCApplication.java new file mode 100644 index 0000000..63a6068 --- /dev/null +++ b/app/src/main/java/com/hnjc/wjtx/aligames/JCApplication.java @@ -0,0 +1,18 @@ +package com.hnjc.wjtx.aligames; + +import android.app.Application; +import android.util.Log; + +import cn.uc.gamesdk.SDKHelper; + +public class JCApplication extends Application { + @Override + public void onCreate() { + Log.i("JCApplication", "JCApplication onCreate"); + if(!SDKHelper.isBackground(this)){ + //调用super方法 + super.onCreate(); + //表示当前为SDK所属的子进程，不应该再执行其他游戏相关的初始化 + } + } +} diff --git a/app/src/main/java/com/hnjc/wjtx/LaunchActivity.java b/app/src/main/java/com/hnjc/wjtx/aligames/LaunchActivity.java similarity index 97% rename from app/src/main/java/com/hnjc/wjtx/LaunchActivity.java rename to app/src/main/java/com/hnjc/wjtx/aligames/LaunchActivity.java index 1e23c84..5408526 100644 --- a/app/src/main/java/com/hnjc/wjtx/LaunchActivity.java +++ b/app/src/main/java/com/hnjc/wjtx/aligames/LaunchActivity.java @@ -1,4 +1,4 @@ -package com.hnjc.wjtx; +package com.hnjc.wjtx.aligames; import android.Manifest; import android.app.Activity; @@ -12,12 +12,12 @@ import android.util.Log; import android.widget.ProgressBar; import android.widget.TextView; -import com.hnjc.wjtx.net.DownloadRunnable; -import com.hnjc.wjtx.net.TaskInfo; -import com.hnjc.wjtx.net.WebApi; -import com.hnjc.wjtx.util.AssetsUtil; -import com.hnjc.wjtx.util.StringUtil; -import com.hnjc.wjtx.util.UnzipRunnable; +import com.hnjc.wjtx.aligames.net.DownloadRunnable; +import com.hnjc.wjtx.aligames.net.TaskInfo; +import com.hnjc.wjtx.aligames.net.WebApi; +import com.hnjc.wjtx.aligames.util.AssetsUtil; +import com.hnjc.wjtx.aligames.util.StringUtil; +import com.hnjc.wjtx.aligames.util.UnzipRunnable; import org.json.JSONException; import org.json.JSONObject; diff --git a/app/src/main/java/com/hnjc/wjtx/MainActivity.java b/app/src/main/java/com/hnjc/wjtx/aligames/MainActivity.java similarity index 67% rename from app/src/main/java/com/hnjc/wjtx/MainActivity.java rename to app/src/main/java/com/hnjc/wjtx/aligames/MainActivity.java index f0740e0..a1c1b23 100755 --- a/app/src/main/java/com/hnjc/wjtx/MainActivity.java +++ b/app/src/main/java/com/hnjc/wjtx/aligames/MainActivity.java @@ -1,8 +1,8 @@ -package com.hnjc.wjtx; +package com.hnjc.wjtx.aligames; import android.app.Activity; -import android.app.AlertDialog; import android.content.Context; +import android.content.Intent; import android.content.SharedPreferences; import android.content.res.Resources; import android.graphics.drawable.Drawable; @@ -16,15 +16,25 @@ import android.widget.FrameLayout; 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.hnjc.wjtx.aligames.util.AssetsUtil; +import com.hnjc.wjtx.aligames.util.StorageUtil; +import com.hnjc.wjtx.aligames.util.StringUtil; import org.egret.egretnativeandroid.EgretNativeAndroid; import org.json.JSONException; import org.json.JSONObject; +import cn.gundam.sdk.shell.even.SDKEventKey; +import cn.gundam.sdk.shell.even.SDKEventReceiver; +import cn.gundam.sdk.shell.even.Subscribe; +import cn.gundam.sdk.shell.exception.AliLackActivityException; +import cn.gundam.sdk.shell.exception.AliNotInitException; +import cn.gundam.sdk.shell.open.ParamInfo; +import cn.gundam.sdk.shell.open.UCOrientation; +import cn.gundam.sdk.shell.param.SDKParamKey; +import cn.gundam.sdk.shell.param.SDKParams; +import cn.uc.gamesdk.UCGameSdk; + //Android项目发布设置详见doc目录下的README_ANDROID.md public class MainActivity extends Activity { @@ -40,7 +50,7 @@ public class MainActivity extends Activity { super.onCreate(savedInstanceState); String preloadPath = AssetsUtil.getDiskFileDir(this, this.getString(R.string.preload_path)); - String gameUrl = this.getString(R.string.game_url); + nativeAndroid = new EgretNativeAndroid(this); if (!nativeAndroid.checkGlEsVersion()) { @@ -59,7 +69,7 @@ public class MainActivity extends Activity { nativeAndroid.config.preloadPath = preloadPath; setExternalInterfaces(); - + String gameUrl = this.getString(R.string.game_url); if (!nativeAndroid.initialize(gameUrl)) { Toast.makeText(this, "Initialize native failed.", Toast.LENGTH_LONG).show(); @@ -67,10 +77,19 @@ public class MainActivity extends Activity { } setContentView(nativeAndroid.getRootFrameLayout()); rootLayout = nativeAndroid.getRootFrameLayout(); + nativeAndroid.pause(); showLoadingView(); vibrator = (Vibrator) this.getSystemService(Context.VIBRATOR_SERVICE); + ucNetworkAndInitUCGameSDK(); + UCGameSdk.defaultSdk().registerSDKEventReceiver(receiver); + } + public void startGame() { + nativeAndroid.resume(); + } + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + ucNetworkAndInitUCGameSDK(); } - @Override protected void onPause() { super.onPause(); @@ -86,19 +105,11 @@ public class MainActivity extends Activity { @Override public boolean onKeyDown(final int keyCode, final KeyEvent keyEvent) { if (keyCode == KeyEvent.KEYCODE_BACK) { - //声明并初始化弹出对象 - AlertDialog.Builder builder=new AlertDialog.Builder(this); - builder.setTitle("提示："); - builder.setMessage("是否退出"); - //设置确认按钮 - builder.setNegativeButton("确定", (dialog, which) -> { - nativeAndroid.exitGame(); - finish();//退出程序 - }); - //设置取消按钮 - builder.setPositiveButton("取消",null); - //显示弹框 - builder.show(); + try { + UCGameSdk.defaultSdk().exit(this, null); + } catch (Exception e) { + e.printStackTrace(); + } return true; } else { return super.onKeyDown(keyCode, keyEvent); @@ -163,18 +174,7 @@ public class MainActivity extends Activity { Toast.makeText(MainActivity.this, message, Toast.LENGTH_LONG).show(); }); 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", ""); - } + ucSdkLogin(); }); nativeAndroid.setExternalInterface("@onState", message -> { @@ -266,4 +266,111 @@ public class MainActivity extends Activity { launchScreenImageView = null; } + public void ucNetworkAndInitUCGameSDK() { + //!!!在调用SDK初始化前进行网络检查 + //当前没有拥有网络 + ucSdkInit();//执行UCGameSDK初始化 + } + + private void ucSdkInit() { + ParamInfo gameParamInfo = new ParamInfo(); + + gameParamInfo.setGameId(UCSdkConfig.gameId); + + gameParamInfo.setOrientation(UCOrientation.PORTRAIT); + + SDKParams sdkParams = new SDKParams(); + sdkParams.put(SDKParamKey.GAME_PARAMS, gameParamInfo); + + + + try { + UCGameSdk.defaultSdk().initSdk(this, sdkParams); + } catch (AliLackActivityException e) { + e.printStackTrace(); + } + } + + private void ucSdkLogin() { + try { + UCGameSdk.defaultSdk().login(this, null); + } catch (AliLackActivityException e) { + e.printStackTrace(); + } catch (AliNotInitException e) { + e.printStackTrace(); + } + } + + private void ucSdkPay() { +// Intent intent = new Intent(MainActivity.this, GamePayActivity.class); +// MainActivity.this.startActivity(intent); + } + + SDKEventReceiver receiver = new SDKEventReceiver() { + @Subscribe(event = SDKEventKey.ON_INIT_SUCC) + private void onInitSucc() { + + startGame(); + } + + @Subscribe(event = SDKEventKey.ON_INIT_FAILED) + private void onInitFailed(String data) { + //初始化失败 + Toast.makeText(MainActivity.this, "init failed", Toast.LENGTH_SHORT).show(); + Log.i(TAG, "UC SDK init failed"); + ucNetworkAndInitUCGameSDK(); + } + + @Subscribe(event = SDKEventKey.ON_LOGIN_SUCC) + private void onLoginSucc(String sid) { + JSONObject obj = new JSONObject(); + try { + obj.put("openid", sid); + obj.put("token", ""); + nativeAndroid.callExternalInterface("sendUidToJS", obj.toString()); + } catch (JSONException e) { + e.printStackTrace(); + nativeAndroid.callExternalInterface("loginCancel", ""); + } + } + + @Subscribe(event = SDKEventKey.ON_LOGIN_FAILED) + private void onLoginFailed(String desc) { + nativeAndroid.callExternalInterface("loginCancel", desc); + } + + @Subscribe(event = SDKEventKey.ON_LOGOUT_SUCC) + private void onLogoutSucc() { + nativeAndroid.callExternalInterface("loginOut", ""); +// AccountInfo.instance().setSid(""); + ucSdkLogin(); + } + + @Subscribe(event = SDKEventKey.ON_LOGOUT_FAILED) + private void onLogoutFailed() { + Toast.makeText(MainActivity.this, "logout failed", Toast.LENGTH_SHORT).show(); +// printMsg("注销失败"); + } + + @Subscribe(event = SDKEventKey.ON_EXIT_SUCC) + private void onExit(String desc) { + nativeAndroid.exitGame(); + finish();//退出程序 + +// // 退出程序 +// Intent intent = new Intent(Intent.ACTION_MAIN); +// intent.addCategory(Intent.CATEGORY_HOME); +// intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); +// startActivity(intent); +// android.os.Process.killProcess(android.os.Process.myPid()); +// printMsg(desc); + } + + @Subscribe(event = SDKEventKey.ON_EXIT_CANCELED) + private void onExitCanceled(String desc) { + Toast.makeText(MainActivity.this, desc, Toast.LENGTH_SHORT).show(); + } + + }; + } diff --git a/app/src/main/java/com/hnjc/wjtx/aligames/UCSdkConfig.java b/app/src/main/java/com/hnjc/wjtx/aligames/UCSdkConfig.java new file mode 100644 index 0000000..abd3ccf --- /dev/null +++ b/app/src/main/java/com/hnjc/wjtx/aligames/UCSdkConfig.java @@ -0,0 +1,14 @@ +package com.hnjc.wjtx.aligames; + +public class UCSdkConfig { + // 以下参数仅供测试。在正式集成SDK时，需要使用正式的id数据。 + // 游戏开发人员需要跟自己的商务或运营人员联系获取。 + + + public static final int gameId = 1179479; + + public static final String sign_key = "bf4dcf740ca7cd6f0980e4d8fa7f77b0"; + + + +} \ No newline at end of file diff --git a/app/src/main/java/com/hnjc/wjtx/net/AppRequest.java b/app/src/main/java/com/hnjc/wjtx/aligames/net/AppRequest.java similarity index 98% rename from app/src/main/java/com/hnjc/wjtx/net/AppRequest.java rename to app/src/main/java/com/hnjc/wjtx/aligames/net/AppRequest.java index be6b956..7af2d86 100644 --- a/app/src/main/java/com/hnjc/wjtx/net/AppRequest.java +++ b/app/src/main/java/com/hnjc/wjtx/aligames/net/AppRequest.java @@ -1,4 +1,4 @@ -package com.hnjc.wjtx.net; +package com.hnjc.wjtx.aligames.net; import com.android.volley.AuthFailureError; import com.android.volley.NetworkResponse; diff --git a/app/src/main/java/com/hnjc/wjtx/net/AppRequestUtil.java b/app/src/main/java/com/hnjc/wjtx/aligames/net/AppRequestUtil.java similarity index 97% rename from app/src/main/java/com/hnjc/wjtx/net/AppRequestUtil.java rename to app/src/main/java/com/hnjc/wjtx/aligames/net/AppRequestUtil.java index 225c20c..0d2a49a 100644 --- a/app/src/main/java/com/hnjc/wjtx/net/AppRequestUtil.java +++ b/app/src/main/java/com/hnjc/wjtx/aligames/net/AppRequestUtil.java @@ -1,4 +1,4 @@ -package com.hnjc.wjtx.net; +package com.hnjc.wjtx.aligames.net; import android.content.Context; diff --git a/app/src/main/java/com/hnjc/wjtx/net/BaseInterface.java b/app/src/main/java/com/hnjc/wjtx/aligames/net/BaseInterface.java similarity index 78% rename from app/src/main/java/com/hnjc/wjtx/net/BaseInterface.java rename to app/src/main/java/com/hnjc/wjtx/aligames/net/BaseInterface.java index fadc4c7..685211c 100644 --- a/app/src/main/java/com/hnjc/wjtx/net/BaseInterface.java +++ b/app/src/main/java/com/hnjc/wjtx/aligames/net/BaseInterface.java @@ -1,4 +1,4 @@ -package com.hnjc.wjtx.net; +package com.hnjc.wjtx.aligames.net; import org.json.JSONObject; diff --git a/app/src/main/java/com/hnjc/wjtx/net/BaseMode.java b/app/src/main/java/com/hnjc/wjtx/aligames/net/BaseMode.java similarity index 93% rename from app/src/main/java/com/hnjc/wjtx/net/BaseMode.java rename to app/src/main/java/com/hnjc/wjtx/aligames/net/BaseMode.java index 093b319..c333417 100644 --- a/app/src/main/java/com/hnjc/wjtx/net/BaseMode.java +++ b/app/src/main/java/com/hnjc/wjtx/aligames/net/BaseMode.java @@ -1,4 +1,4 @@ -package com.hnjc.wjtx.net; +package com.hnjc.wjtx.aligames.net; public class BaseMode { private boolean status; diff --git a/app/src/main/java/com/hnjc/wjtx/net/DownloadRunnable.java b/app/src/main/java/com/hnjc/wjtx/aligames/net/DownloadRunnable.java similarity index 98% rename from app/src/main/java/com/hnjc/wjtx/net/DownloadRunnable.java rename to app/src/main/java/com/hnjc/wjtx/aligames/net/DownloadRunnable.java index ccae946..b7e6fc1 100644 --- a/app/src/main/java/com/hnjc/wjtx/net/DownloadRunnable.java +++ b/app/src/main/java/com/hnjc/wjtx/aligames/net/DownloadRunnable.java @@ -1,4 +1,4 @@ -package com.hnjc.wjtx.net; +package com.hnjc.wjtx.aligames.net; import android.util.Log; diff --git a/app/src/main/java/com/hnjc/wjtx/net/RequestErrorEvent.java b/app/src/main/java/com/hnjc/wjtx/aligames/net/RequestErrorEvent.java similarity index 91% rename from app/src/main/java/com/hnjc/wjtx/net/RequestErrorEvent.java rename to app/src/main/java/com/hnjc/wjtx/aligames/net/RequestErrorEvent.java index aff1bc0..05af92a 100644 --- a/app/src/main/java/com/hnjc/wjtx/net/RequestErrorEvent.java +++ b/app/src/main/java/com/hnjc/wjtx/aligames/net/RequestErrorEvent.java @@ -1,4 +1,4 @@ -package com.hnjc.wjtx.net; +package com.hnjc.wjtx.aligames.net; public class RequestErrorEvent { private int type; diff --git a/app/src/main/java/com/hnjc/wjtx/net/RequestListener.java b/app/src/main/java/com/hnjc/wjtx/aligames/net/RequestListener.java similarity index 80% rename from app/src/main/java/com/hnjc/wjtx/net/RequestListener.java rename to app/src/main/java/com/hnjc/wjtx/aligames/net/RequestListener.java index bbfc13a..3764fba 100644 --- a/app/src/main/java/com/hnjc/wjtx/net/RequestListener.java +++ b/app/src/main/java/com/hnjc/wjtx/aligames/net/RequestListener.java @@ -1,4 +1,4 @@ -package com.hnjc.wjtx.net; +package com.hnjc.wjtx.aligames.net; import org.json.JSONObject; diff --git a/app/src/main/java/com/hnjc/wjtx/net/TaskInfo.java b/app/src/main/java/com/hnjc/wjtx/aligames/net/TaskInfo.java similarity index 97% rename from app/src/main/java/com/hnjc/wjtx/net/TaskInfo.java rename to app/src/main/java/com/hnjc/wjtx/aligames/net/TaskInfo.java index 208834d..7470cfb 100644 --- a/app/src/main/java/com/hnjc/wjtx/net/TaskInfo.java +++ b/app/src/main/java/com/hnjc/wjtx/aligames/net/TaskInfo.java @@ -1,4 +1,4 @@ -package com.hnjc.wjtx.net; +package com.hnjc.wjtx.aligames.net; public class TaskInfo { private String name;//文件名 diff --git a/app/src/main/java/com/hnjc/wjtx/net/VolleyUtil.java b/app/src/main/java/com/hnjc/wjtx/aligames/net/VolleyUtil.java similarity index 93% rename from app/src/main/java/com/hnjc/wjtx/net/VolleyUtil.java rename to app/src/main/java/com/hnjc/wjtx/aligames/net/VolleyUtil.java index 87497b8..150b3f7 100644 --- a/app/src/main/java/com/hnjc/wjtx/net/VolleyUtil.java +++ b/app/src/main/java/com/hnjc/wjtx/aligames/net/VolleyUtil.java @@ -1,4 +1,4 @@ -package com.hnjc.wjtx.net; +package com.hnjc.wjtx.aligames.net; import android.content.Context; diff --git a/app/src/main/java/com/hnjc/wjtx/net/WebApi.java b/app/src/main/java/com/hnjc/wjtx/aligames/net/WebApi.java similarity index 95% rename from app/src/main/java/com/hnjc/wjtx/net/WebApi.java rename to app/src/main/java/com/hnjc/wjtx/aligames/net/WebApi.java index 5ab0f28..1ebd854 100644 --- a/app/src/main/java/com/hnjc/wjtx/net/WebApi.java +++ b/app/src/main/java/com/hnjc/wjtx/aligames/net/WebApi.java @@ -1,4 +1,4 @@ -package com.hnjc.wjtx.net; +package com.hnjc.wjtx.aligames.net; import android.content.Context; diff --git a/app/src/main/java/com/hnjc/wjtx/util/AssetsUtil.java b/app/src/main/java/com/hnjc/wjtx/aligames/util/AssetsUtil.java similarity index 99% rename from app/src/main/java/com/hnjc/wjtx/util/AssetsUtil.java rename to app/src/main/java/com/hnjc/wjtx/aligames/util/AssetsUtil.java index 73f1481..0ac3fb0 100644 --- a/app/src/main/java/com/hnjc/wjtx/util/AssetsUtil.java +++ b/app/src/main/java/com/hnjc/wjtx/aligames/util/AssetsUtil.java @@ -1,4 +1,4 @@ -package com.hnjc.wjtx.util; +package com.hnjc.wjtx.aligames.util; import android.content.Context; import android.content.res.AssetManager; diff --git a/app/src/main/java/com/hnjc/wjtx/util/IdUtil.java b/app/src/main/java/com/hnjc/wjtx/aligames/util/IdUtil.java similarity index 88% rename from app/src/main/java/com/hnjc/wjtx/util/IdUtil.java rename to app/src/main/java/com/hnjc/wjtx/aligames/util/IdUtil.java index a554367..d3abefc 100644 --- a/app/src/main/java/com/hnjc/wjtx/util/IdUtil.java +++ b/app/src/main/java/com/hnjc/wjtx/aligames/util/IdUtil.java @@ -1,4 +1,4 @@ -package com.hnjc.wjtx.util; +package com.hnjc.wjtx.aligames.util; import android.content.ContentResolver; import android.content.Context; @@ -20,7 +20,7 @@ public class IdUtil { while (enumeration.hasMoreElements()) { NetworkInterface netInterface = enumeration.nextElement(); if (netInterface.getName().equals("wlan0")) { - return com.hnjc.wjtx.util.StringUtil.getMD5(netInterface.getHardwareAddress().toString(), false); + return com.hnjc.wjtx.aligames.util.StringUtil.getMD5(netInterface.getHardwareAddress().toString(), false); } } } catch (Exception e) { @@ -59,9 +59,9 @@ public class IdUtil { ContentResolver resolver = context.getContentResolver(); String wifiMac = getWifiMac(); String androidId = getAndroidId(resolver); - if (com.hnjc.wjtx.util.StringUtil.notBlank(androidId)) { + if (com.hnjc.wjtx.aligames.util.StringUtil.notBlank(androidId)) { return androidId; - } else if (com.hnjc.wjtx.util.StringUtil.notBlank(wifiMac)) { + } else if (com.hnjc.wjtx.aligames.util.StringUtil.notBlank(wifiMac)) { return wifiMac; } else { return getUniquePsuedoID(); diff --git a/app/src/main/java/com/hnjc/wjtx/util/StorageUtil.java b/app/src/main/java/com/hnjc/wjtx/aligames/util/StorageUtil.java similarity index 96% rename from app/src/main/java/com/hnjc/wjtx/util/StorageUtil.java rename to app/src/main/java/com/hnjc/wjtx/aligames/util/StorageUtil.java index 1465067..ab00e17 100644 --- a/app/src/main/java/com/hnjc/wjtx/util/StorageUtil.java +++ b/app/src/main/java/com/hnjc/wjtx/aligames/util/StorageUtil.java @@ -1,4 +1,4 @@ -package com.hnjc.wjtx.util; +package com.hnjc.wjtx.aligames.util; import android.content.SharedPreferences; diff --git a/app/src/main/java/com/hnjc/wjtx/util/StringUtil.java b/app/src/main/java/com/hnjc/wjtx/aligames/util/StringUtil.java similarity index 98% rename from app/src/main/java/com/hnjc/wjtx/util/StringUtil.java rename to app/src/main/java/com/hnjc/wjtx/aligames/util/StringUtil.java index e407fc9..5439948 100644 --- a/app/src/main/java/com/hnjc/wjtx/util/StringUtil.java +++ b/app/src/main/java/com/hnjc/wjtx/aligames/util/StringUtil.java @@ -1,4 +1,4 @@ -package com.hnjc.wjtx.util; +package com.hnjc.wjtx.aligames.util; import java.security.MessageDigest; diff --git a/app/src/main/java/com/hnjc/wjtx/util/UnzipRunnable.java b/app/src/main/java/com/hnjc/wjtx/aligames/util/UnzipRunnable.java similarity index 97% rename from app/src/main/java/com/hnjc/wjtx/util/UnzipRunnable.java rename to app/src/main/java/com/hnjc/wjtx/aligames/util/UnzipRunnable.java index 5837b1f..f7eed8c 100644 --- a/app/src/main/java/com/hnjc/wjtx/util/UnzipRunnable.java +++ b/app/src/main/java/com/hnjc/wjtx/aligames/util/UnzipRunnable.java @@ -1,8 +1,8 @@ -package com.hnjc.wjtx.util; +package com.hnjc.wjtx.aligames.util; import android.util.Log; -import com.hnjc.wjtx.net.TaskInfo; +import com.hnjc.wjtx.aligames.net.TaskInfo; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1b6b991..659f47a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3,7 +3,7 @@ 下载游戏资源 进入游戏 preload - http://local/index.html?channel=7103 + http://local/index.html?channel=7110 1.0.0 load_back 获取游戏版本 diff --git a/build.gradle b/build.gradle index 3f93831..3138ab9 100644 --- a/build.gradle +++ b/build.gradle @@ -15,6 +15,9 @@ buildscript { // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files + classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' + classpath 'com.jakewharton:butterknife-gradle-plugin:8.4.0' + classpath "gradle.plugin.com.dorongold.plugins:task-tree:1.3" } }