Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

debug和release生成对应域名

Browse Source
This commit is contained in:
kehaoyuan
2017-07-07 14:36:15 +08:00
parent 658ee78213
commit 475221a011
5 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/com/gh/base/AppController.java
View File

@ -10,7 +10,6 @@ import android.support.v4.util.ArrayMap;
import android.text.TextUtils;
import android.util.Log;
import com.bandeng.MyEventBusIndex;
import com.facebook.drawee.backends.pipeline.Fresco;
import com.gh.common.constant.Config;
import com.gh.common.util.DataUtils;
@ -27,8 +26,6 @@ import com.xiaomi.mipush.sdk.Logger;
import com.xiaomi.mipush.sdk.MiPushClient;
import com.xiaomi.mipush.sdk.MiPushCommandMessage;
import org.greenrobot.eventbus.EventBus;
import java.util.List;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
@ -129,10 +126,6 @@ public class AppController extends Application {
try {
if (shouldInit()) {
MiPushClient.registerPush(this, Config.MIPUSH_APPID, Config.MIPUSH_APPKEY);
if (BuildConfig.DEBUG) {
MiPushClient.registerPush(this, Config.DEBUG_MIPUSH_APPID, Config.DEBUG_MIPUSH_APPKEY);
}
}
} catch (Exception e) {
e.printStackTrace();
@ -161,10 +154,6 @@ public class AppController extends Application {
//友盟推送
final PushAgent pushAgent = PushAgent.getInstance(this);
pushAgent.setAppkeyAndSecret(Config.UMENG_APPKEY, Config.UMENG_MESSAGE_SECRET);
if (BuildConfig.DEBUG) {
// 设置debug的key，覆盖掉原值，非debug build这个if分支会被去掉
pushAgent.setAppkeyAndSecret(Config.DEBUG_UMENG_APPKEY, Config.DEBUG_UMENG_MESSAGE_SECRET);
}
//注册推送服务，每次调用register方法都会回调该接口
pushAgent.register(new IUmengRegisterCallback() {
@ -212,7 +201,7 @@ public class AppController extends Application {
// }
// 启用EventBus3.0加速功能
EventBus.builder().addIndex(new MyEventBusIndex()).installDefaultEventBus();
// EventBus.builder().addIndex(new MyEventBusIndex()).installDefaultEventBus();
}
private boolean shouldInit() {

15
app/src/main/java/com/gh/common/constant/Config.java
View File

@ -9,12 +9,12 @@ import com.gh.gamecenter.BuildConfig;
public class Config {
public static final String HOST = "http://api2.ghzhushou.com/v2d6/";
public static final String USER_HOST = "http://user2.ghzhushou.com/v1d2/";
public static final String COMMENT_HOST = "http://comment2.ghzhushou.com/v1d2/";
public static final String HOST = BuildConfig.HOST;
public static final String USER_HOST = BuildConfig.USER_HOST;
public static final String COMMENT_HOST = BuildConfig.COMMENT_HOST;
public static final String DATA_HOST = "http://data.ghzhushou.com/";
public static final String LIBAO_HOST = "http://libao2.ghzhushou.com/v1d2/";
public static final String MESSAGE_HOST = "http://message.ghzhushou.com/v1d0/"; // TODO TEST v1d1
public static final String LIBAO_HOST = BuildConfig.LIBAO_HOST;
public static final String MESSAGE_HOST = BuildConfig.MESSAGE_HOST;
public static final String PREFERENCE = "ghzhushou";
// Third-Party confs
@ -29,11 +29,6 @@ public class Config {
public static final String UMENG_APPKEY = BuildConfig.UMENG_APPKEY;
public static final String UMENG_MESSAGE_SECRET = BuildConfig.UMENG_MESSAGE_SECRET;
public static final String DEBUG_MIPUSH_APPID = BuildConfig.DEBUG_MIPUSH_APPID;
public static final String DEBUG_MIPUSH_APPKEY = BuildConfig.DEBUG_MIPUSH_APPKEY;
public static final String DEBUG_UMENG_APPKEY = BuildConfig.DEBUG_UMENG_APPKEY;
public static final String DEBUG_UMENG_MESSAGE_SECRET = BuildConfig.DEBUG_UMENG_MESSAGE_SECRET;
public static boolean isShow(Context context) {
SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);

2
app/src/main/java/com/gh/gamecenter/entity/GameEntity.kt
View File

@ -70,7 +70,7 @@ class GameEntity : Parcelable {
return apk!!
}
fun setApk(apk: ArrayList<ApkEntity>) {
fun setApk(apk: ArrayList<ApkEntity>?) {
this.apk = apk
}