Skip to content

android / dayu

Go to a project
Commit 1f943508 by mReturn
Options

v2.7.2

parent 2d91ffa0
Inline Side-by-side
Showing with 58 additions and 56 deletions
baseSDK/src/main/java/com/dayu/common/Constants.java
......@@ -60,19 +60,19 @@ public class Constants {
/**
* uat测试环境配置.
*/
public static String ENVIROMENT = "uat";
public static int LOG_LEVEL = LogUtils.LEVEL_ALL;
public static String BASE_URL = "http://47.95.223.6:3112";
public static String WEB_SOP = "http://47.95.223.6:9004/#/sop";
public static String WEB_SOP_DETAIL = "http://47.95.223.6:9004/#/sopdetail";
public static String WEB_ZHI_SHI = "http://47.95.223.6:9004/#/detail";
public static String CHECK_MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manyServiceResult";
public static String MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manySop";
public static final String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=test/video";
public static final boolean IS_DEBUG = false;
public static String VIDEO_SHARE_URL = "http://uat.kf.ai:9099/#/shareVideo?type=_type&id="; //uat 学习视频分享链接 type(课程: course 直播: live)
public static int XLR_PID = 14; //小绿人商家id
// public static String ENVIROMENT = "uat";
// public static int LOG_LEVEL = LogUtils.LEVEL_ALL;
// public static String BASE_URL = "http://47.95.223.6:3112";
// public static String WEB_SOP = "http://47.95.223.6:9004/#/sop";
// public static String WEB_SOP_DETAIL = "http://47.95.223.6:9004/#/sopdetail";
// public static String WEB_ZHI_SHI = "http://47.95.223.6:9004/#/detail";
// public static String CHECK_MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manyServiceResult";
// public static String MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manySop";
// public static final String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
// public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=test/video";
// public static final boolean IS_DEBUG = false;
// public static String VIDEO_SHARE_URL = "http://uat.kf.ai:9099/#/shareVideo?type=_type&id="; //uat 学习视频分享链接 type(课程: course 直播: live)
// public static int XLR_PID = 14; //小绿人商家id
......@@ -80,19 +80,19 @@ public class Constants {
/**
* 正式环境.
*/
// public static String ENVIROMENT = "release";
// public static int LOG_LEVEL = LogUtils.LEVEL_OFF;
// public static String BASE_URL = "https://mobile.kf.ai";
// public static String WEB_SOP = "https://sop.kf.ai/#/sop";
// public static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail";
// public static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
// public static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult";
// public static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop";
// public static final String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
// public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=online/video";
// public static final boolean IS_DEBUG = false;
// public static String VIDEO_SHARE_URL = "http://app.dl.kf.ai/ext/#/shareVideo?type=_type&id="; //学习视频分享链接 type(课程: course 直播: live)
// public static int XLR_PID = 1936; //小绿人商家id
public static String ENVIROMENT = "release";
public static int LOG_LEVEL = LogUtils.LEVEL_OFF;
public static String BASE_URL = "https://mobile.kf.ai";
public static String WEB_SOP = "https://sop.kf.ai/#/sop";
public static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail";
public static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
public static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult";
public static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop";
public static final String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=online/video";
public static final boolean IS_DEBUG = false;
public static String VIDEO_SHARE_URL = "http://app.dl.kf.ai/ext/#/shareVideo?type=_type&id="; //学习视频分享链接 type(课程: course 直播: live)
public static int XLR_PID = 1936; //小绿人商家id
......
build.gradle
......@@ -5,8 +5,8 @@ buildscript {
ext.build_tools_version = "27.0.3"
ext.min_sdk_version = 17
ext.target_sdk_version = 26
ext.version_code = 271
ext.verson_name = "2.7.1"
ext.version_code = 272
ext.verson_name = "2.7.2"
ext.gradle_version = '3.1.4'
ext.isReleaseMinify = false
ext.isDebugMinify = false
......@@ -15,11 +15,12 @@ buildscript {
// ext.kotlin_version = '1.2.50'
repositories {
// jcenter()
// google()
jcenter()
google()
mavenCentral()
maven { url 'https://jitpack.io' }
maven { url 'https://maven.google.com' }
maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'}
// maven { url 'https://maven.google.com' }
// maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'}
maven { url 'https://dl.bintray.com/umsdk/release' }
}
......@@ -32,12 +33,12 @@ buildscript {
allprojects {
repositories {
// jcenter()
// google()
jcenter()
google()
mavenCentral()
maven { url 'https://jitpack.io' }
maven { url 'https://maven.google.com' }
maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'}
// maven { url 'https://maven.google.com' }
// maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'}
maven { url 'https://dl.bintray.com/umsdk/release' }
}
}
......
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
......@@ -409,11 +409,11 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
if (mItem.getStatus() == 3) {
//小绿人工单师傅开始服务前必须开启定位开关
if (mItem.getCreateProviderId() == Constants.XLR_PID && !GpsUtil.isOPen(mContext)
&& mItem.getLatitude() != 0 && mItem.getLongitude() != 0) {
ToastUtils.showShortToast("请打开GPS定位开关");
return;
}
// if (mItem.getCreateProviderId() == Constants.XLR_PID && !GpsUtil.isOPen(mContext)
// && mItem.getLatitude() != 0 && mItem.getLongitude() != 0) {
// ToastUtils.showShortToast("请打开GPS定位开关");
// return;
// }
ProgressUtil.setCanDismiss(false);
ProgressUtil.startLoad(mContext);
LocationUtils.getCurrentLocation(new LocationUtils.MyLocationListener() {
......@@ -426,22 +426,23 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
longitude = location.getLongitude();
}
//小绿人工单师傅在目的地一公里内才能开始服务
if (mItem.getCreateProviderId() == Constants.XLR_PID && latitude != 0 &&
longitude != 0 && mItem.getLatitude() != 0 && mItem.getLongitude() != 0) {
double distance = LocationUtils.getDistance(latitude, longitude, mItem.getLatitude(), mItem.getLongitude());
// Log.e("startService: ",latitude+" "+longitude+" "+mItem.getLatitude()
// +" "+mItem.getLongitude()+" "+distance);
// if (distance > 1000) {
//添加容错距离，因为创建工单时的经纬度可能不太准确
if (distance > 3000) {
ToastUtils.showShortToast("未到达目的地，无法开始服务 ");
ProgressUtil.stopLoad();
return;
}
startFirstServe(latitude, longitude);
} else {
// if (mItem.getCreateProviderId() == Constants.XLR_PID && latitude != 0 &&
// longitude != 0 && mItem.getLatitude() != 0 && mItem.getLongitude() != 0) {
// double distance = LocationUtils.getDistance(latitude, longitude, mItem.getLatitude(), mItem.getLongitude());
//// Log.e("startService: ",latitude+" "+longitude+" "+mItem.getLatitude()
//// +" "+mItem.getLongitude()+" "+distance);
//// if (distance > 1000) {
// //添加容错距离，因为创建工单时的经纬度可能不太准确
// if (distance > 3000) {
// ToastUtils.showShortToast("未到达目的地，无法开始服务 ");
// ProgressUtil.stopLoad();
// return;
// }
// startFirstServe(latitude, longitude);
// } else {
// startFirstServe(latitude, longitude);
// }
startFirstServe(latitude, longitude);
}
// if (mItem.getSubStatus() == 1) {
......
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