Commit d3c66e52 by 罗翻

android v1.10

parent 30a8da14
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":5},"path":"app-release.apk","properties":{"packageId":"com.dayu.bigfish","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
...@@ -20,16 +20,16 @@ public class Constants { ...@@ -20,16 +20,16 @@ public class Constants {
public static final String BASE_COUNT = "https://47.94.101.239:7500/"; public static final String BASE_COUNT = "https://47.94.101.239:7500/";
/***********************测试环境配置**********************************/ /***********************测试环境配置**********************************/
public static final int DEBUGLEVEL = LogUtils.LEVEL_ALL; // public static final int DEBUGLEVEL = LogUtils.LEVEL_ALL;
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 static final int DEBUGLEVEL = LogUtils.LEVEL_OFF; public static final int DEBUGLEVEL = LogUtils.LEVEL_ALL;
// public static final String BASE_URL = "https://mobile.dayu.ai"; public static final String BASE_URL = "https://mobile.dayu.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 static final String LOGIN_URL = "/check"; public static final String LOGIN_URL = "/check";
//登录时发送验证码的URL //登录时发送验证码的URL
......
...@@ -35,7 +35,7 @@ import retrofit2.converter.gson.GsonConverterFactory; ...@@ -35,7 +35,7 @@ import retrofit2.converter.gson.GsonConverterFactory;
public class Api { public class Api {
private static APIService service; private static APIService service;
private static Retrofit retrofit; private static Retrofit retrofit;
private static final int DEFAULT_TIMEOUT = 20; private static final int DEFAULT_TIMEOUT = 60;
private static Retrofit downloadRetrofit; private static Retrofit downloadRetrofit;
public static APIService getService() { public static APIService getService() {
...@@ -54,6 +54,8 @@ public class Api { ...@@ -54,6 +54,8 @@ public class Api {
OkHttpClient okHttpClient = new OkHttpClient.Builder() OkHttpClient okHttpClient = new OkHttpClient.Builder()
.addInterceptor(httpLoggingInterceptor) .addInterceptor(httpLoggingInterceptor)
.addInterceptor(tokenInterceptord) .addInterceptor(tokenInterceptord)
.readTimeout(DEFAULT_TIMEOUT, TimeUnit.SECONDS)
.writeTimeout(DEFAULT_TIMEOUT, TimeUnit.SECONDS)
.connectTimeout(DEFAULT_TIMEOUT, TimeUnit.SECONDS) .connectTimeout(DEFAULT_TIMEOUT, TimeUnit.SECONDS)
.build(); .build();
retrofit = new Retrofit.Builder() retrofit = new Retrofit.Builder()
......
...@@ -161,10 +161,10 @@ public class ProcessOrderActivity extends BaseActivity<ProcessOrderPresenter, Ac ...@@ -161,10 +161,10 @@ public class ProcessOrderActivity extends BaseActivity<ProcessOrderPresenter, Ac
.previewImage(true)// 是否可预览图片 true or false .previewImage(true)// 是否可预览图片 true or false
.isCamera(true)// 是否显示拍照按钮 true or false .isCamera(true)// 是否显示拍照按钮 true or false
.isZoomAnim(true)// 图片列表点击 缩放效果 默认true .isZoomAnim(true)// 图片列表点击 缩放效果 默认true
.sizeMultiplier(0.5f)// glide 加coose载图片大小 0~1之间 如设置 .glideOverride()无效 .sizeMultiplier(0.1f)// glide 加载图片大小 0~1之间 如设置 .glideOverride()无效
.setOutputCameraPath("/CustomPath")// 自定义拍照保存路径,可不填 .setOutputCameraPath("/CustomPath")// 自定义拍照保存路径,可不填
.compress(true)// 是否压缩 true or false .compress(true)// 是否压缩 true or false
.glideOverride(200, 200)// int glide 加载宽高,越小图片列表越流畅,但会影响列表图片浏览的清晰度 .glideOverride(300, 500)// int glide 加载宽高,越小图片列表越流畅,但会影响列表图片浏览的清晰度
.hideBottomControls(true)// 是否显示uCrop工具栏,默认不显示 true or false .hideBottomControls(true)// 是否显示uCrop工具栏,默认不显示 true or false
.compressSavePath(getPath())//压缩图片保存地址 .compressSavePath(getPath())//压缩图片保存地址
.previewEggs(true)// 预览图片时 是否增强左右滑动图片体验(图片滑动一半即可看到上一张是否选中) true or false .previewEggs(true)// 预览图片时 是否增强左右滑动图片体验(图片滑动一半即可看到上一张是否选中) true or false
......
...@@ -39,7 +39,7 @@ public class LocationUtils { ...@@ -39,7 +39,7 @@ public class LocationUtils {
// mLocationOption.setInterval(2000); // mLocationOption.setInterval(2000);
mLocationOption.setOnceLocation(true); mLocationOption.setOnceLocation(true);
mLocationOption.setOnceLocationLatest(true); mLocationOption.setOnceLocationLatest(true);
mLocationOption.setHttpTimeOut(5000); mLocationOption.setHttpTimeOut(20000);
// 设置定位参数、、 // 设置定位参数、、
mlocationClient.setLocationOption(mLocationOption); mlocationClient.setLocationOption(mLocationOption);
} }
...@@ -78,7 +78,7 @@ public class LocationUtils { ...@@ -78,7 +78,7 @@ public class LocationUtils {
mDisposable = Observable.timer(8000, TimeUnit.MILLISECONDS) mDisposable = Observable.timer(8000, TimeUnit.MILLISECONDS)
.subscribe(aLong -> { .subscribe(aLong -> {
if (flag) { if (flag) {
ToastUtils.showShortToast("获取定位失败"); // ToastUtils.showShortToast("获取定位失败");
listener.result(null); listener.result(null);
flag = false; flag = false;
mlocationClient.stopLocation(); mlocationClient.stopLocation();
...@@ -98,7 +98,7 @@ public class LocationUtils { ...@@ -98,7 +98,7 @@ public class LocationUtils {
flag = false; flag = false;
mlocationClient.stopLocation(); mlocationClient.stopLocation();
listener.result(location); listener.result(location);
ToastUtils.showShortToast("定位失败了"); // ToastUtils.showShortToast("定位失败了");
} }
} }
}); });
......
...@@ -5,6 +5,7 @@ import android.text.TextUtils; ...@@ -5,6 +5,7 @@ import android.text.TextUtils;
import com.dayu.bigfish.bean.UserInfo; import com.dayu.bigfish.bean.UserInfo;
import com.dayu.bigfish.utils.SPUtils; import com.dayu.bigfish.utils.SPUtils;
import com.google.gson.Gson;
/** /**
* 主要管理用户信息 * 主要管理用户信息
...@@ -56,6 +57,12 @@ public class UserManager { ...@@ -56,6 +57,12 @@ public class UserManager {
SPUtils.put(context, "IMAGE_URL", imageUrl); SPUtils.put(context, "IMAGE_URL", imageUrl);
} }
public void saveUser(Context context, UserInfo info) {
if (info != null) {
SPUtils.put(context, "USER_INFO", new Gson().toJson(info));
}
}
public void saveUserInfo(Context context, UserInfo info) { public void saveUserInfo(Context context, UserInfo info) {
if (!TextUtils.isEmpty(info.getToken())) { if (!TextUtils.isEmpty(info.getToken())) {
SPUtils.put(context, "ACCESS_TOKEN", info.getToken()); SPUtils.put(context, "ACCESS_TOKEN", info.getToken());
......
<resources> <resources>
<string name="tv_dayu">大鱼师傅</string> <string name="tv_dayu">大鱼工程师</string>
<string name="tv_start_page_text">©&#160;2017&#160;大鱼智能&#160;版权所有</string> <string name="tv_start_page_text">©&#160;2017&#160;大鱼智能&#160;版权所有</string>
<string name="tv_login_title">大鱼工程师</string> <string name="tv_login_title">大鱼工程师</string>
<string name="tv_fonts">fonts/DIN Alternate Bold.ttf</string> <string name="tv_fonts">fonts/DIN Alternate Bold.ttf</string>
......
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