Skip to content

android / dayu

Go to a project
Commit d56d640b by 罗翻
Options

修改初始页

parent 7b966d09
Inline Side-by-side
Showing with 30 additions and 32 deletions
app/src/main/java/com/dayu/bigfish/InitializeActivity.java
...@@ -18,10 +18,6 @@ import com.dayu.utils.UserManager; ...@@ -18,10 +18,6 @@ import com.dayu.utils.UserManager;
import com.dayu.widgets.CustomDialog; import com.dayu.widgets.CustomDialog;
import com.umeng.analytics.MobclickAgent; import com.umeng.analytics.MobclickAgent;
import java.util.concurrent.TimeUnit;
import io.reactivex.Observable;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable; import io.reactivex.disposables.Disposable;
public class InitializeActivity extends DataBindingActivity<ActivityInitializeMainBinding> { public class InitializeActivity extends DataBindingActivity<ActivityInitializeMainBinding> {
...@@ -65,14 +61,16 @@ public class InitializeActivity extends DataBindingActivity<ActivityInitializeMa ...@@ -65,14 +61,16 @@ public class InitializeActivity extends DataBindingActivity<ActivityInitializeMa
} else { } else {
intent = new Intent(InitializeActivity.this, LoginActivity.class); intent = new Intent(InitializeActivity.this, LoginActivity.class);
} }
mDisposable = Observable.timer(1000, TimeUnit.MILLISECONDS)
.observeOn(AndroidSchedulers.mainThread())
.subscribe(
aLong -> {
startActivity(intent); startActivity(intent);
finish(); finish();
} // mDisposable = Observable.timer(1000, TimeUnit.MILLISECONDS)
); // .observeOn(AndroidSchedulers.mainThread())
// .subscribe(
// aLong -> {
// startActivity(intent);
// finish();
// }
// );
} }
public void showPerMissionDialog() { public void showPerMissionDialog() {
...@@ -112,9 +110,9 @@ public class InitializeActivity extends DataBindingActivity<ActivityInitializeMa ...@@ -112,9 +110,9 @@ public class InitializeActivity extends DataBindingActivity<ActivityInitializeMa
@Override @Override
protected void onDestroy() { protected void onDestroy() {
super.onDestroy(); super.onDestroy();
if (mDisposable != null) { // if (mDisposable != null) {
mDisposable.dispose(); // mDisposable.dispose();
} // }
} }
@TargetApi(23) @TargetApi(23)
......
baseSDK/src/main/java/com/dayu/common/Constants.java
...@@ -12,14 +12,14 @@ public class Constants { ...@@ -12,14 +12,14 @@ public class Constants {
/** /**
* 测试环境配置. * 测试环境配置.
*/ */
public static final int LOG_LEVEL = LogUtils.LEVEL_ALL; // public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
public static final String ENVIROMENT = "debug"; // public static final String ENVIROMENT = "debug";
public static final String BASE_URL = "http://47.94.101.239:3112"; // public static final String BASE_URL = "http://47.94.101.239:3112";
public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply"; // public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
public final static String WEB_SOP = "http://47.94.101.239:9004/#/sop"; // public final static String WEB_SOP = "http://47.94.101.239:9004/#/sop";
public final static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail"; // public final static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail";
public final static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail"; // public final static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail";
public static final boolean IS_DEBUG = true; // public static final boolean IS_DEBUG = true;
/** /**
* uat环境配置. * uat环境配置.
...@@ -36,14 +36,14 @@ public class Constants { ...@@ -36,14 +36,14 @@ public class Constants {
/** /**
* 正式环境. * 正式环境.
*/ */
// public static final String ENVIROMENT = "release"; public static final String ENVIROMENT = "release";
// public static final int LOG_LEVEL = LogUtils.LEVEL_OFF; public static final int LOG_LEVEL = LogUtils.LEVEL_OFF;
// public static final String BASE_URL = "https://mobile.kf.ai"; public static final String BASE_URL = "https://mobile.kf.ai";
// public final static String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply"; public final static String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
// public final static String WEB_SOP = "https://sop.kf.ai/#/sop"; public final static String WEB_SOP = "https://sop.kf.ai/#/sop";
// public final static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail"; public final static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail";
// public final static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail"; public final static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
// public static final boolean IS_DEBUG = false; public static final boolean IS_DEBUG = false;
/** /**
* 演示环境 * 演示环境
......
build.gradle
...@@ -5,11 +5,11 @@ buildscript { ...@@ -5,11 +5,11 @@ buildscript {
ext.build_tools_version = "27.0.2" ext.build_tools_version = "27.0.2"
ext.min_sdk_version = 16 ext.min_sdk_version = 16
ext.target_sdk_version = 23 ext.target_sdk_version = 23
ext.version_code = 8 ext.version_code = 9
ext.verson_name = "1.4.0" ext.verson_name = "1.5.0"
ext.gradle_version = '3.0.1' ext.gradle_version = '3.0.1'
ext.isReleaseMinify = true ext.isReleaseMinify = true
ext.isDebugMinify = false ext.isDebugMinify = true
ext.arouter_api_version = '1.3.1' ext.arouter_api_version = '1.3.1'
ext.arouter_compiler_version = '1.1.4' ext.arouter_compiler_version = '1.1.4'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment