From ac24f9542da365f295d36abaf684ebe32ef59ed9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E4=BA=AE?= Date: Thu, 5 Feb 2026 14:03:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=80=83=E5=8B=A4=E8=8C=83?= =?UTF-8?q?=E5=9B=B4=E4=B8=BA10km?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../index/attendance/AttendanceFragment.java | 5 +- .../attendance/ManageAttendanceFragment.java | 6 +- .../java/com/bonus/app/util/WorkConfig.java | 68 ++++++++++++------- 3 files changed, 53 insertions(+), 26 deletions(-) diff --git a/app/src/main/java/com/bonus/app/fragment/index/attendance/AttendanceFragment.java b/app/src/main/java/com/bonus/app/fragment/index/attendance/AttendanceFragment.java index c340359..26ee517 100644 --- a/app/src/main/java/com/bonus/app/fragment/index/attendance/AttendanceFragment.java +++ b/app/src/main/java/com/bonus/app/fragment/index/attendance/AttendanceFragment.java @@ -103,6 +103,9 @@ public class AttendanceFragment extends BaseFragment implements ClickUtils.OnCli Button myContentBtn; + //打卡范围设置后期改成从字典更新到本地字典，取出来 + public double attRange = 10000.0; + UserBean userBean; ProjectBean projectBean; UserDao userDao = new UserDao(myApplication.getDBHelper()); @@ -208,7 +211,7 @@ public class AttendanceFragment extends BaseFragment implements ClickUtils.OnCli GeodeticCurve distanceMeter = GeodesyUtil.getDistanceMeter(lat, lon, rangeLat, rangeLon); //两点距离 double distance = distanceMeter.getEllipsoidalDistance(); - if (distance <= 6000) { + if (distance <= attRange) { tf = true; subTeamBean = c; break; diff --git a/app/src/main/java/com/bonus/app/fragment/index/attendance/ManageAttendanceFragment.java b/app/src/main/java/com/bonus/app/fragment/index/attendance/ManageAttendanceFragment.java index c05083a..a84dbf2 100644 --- a/app/src/main/java/com/bonus/app/fragment/index/attendance/ManageAttendanceFragment.java +++ b/app/src/main/java/com/bonus/app/fragment/index/attendance/ManageAttendanceFragment.java @@ -96,6 +96,10 @@ public class ManageAttendanceFragment extends BaseFragment implements ClickUtils Boolean initDataTf = true; List manageList; + + //打卡范围设置后期改成从字典更新到本地字典，取出来 + public double attRange = 10000.0; + /** * 打卡状态 0-未打卡，1-上班打卡 */ @@ -218,7 +222,7 @@ public class ManageAttendanceFragment extends BaseFragment implements ClickUtils GeodeticCurve distanceMeter = GeodesyUtil.getDistanceMeter(lat, lon, rangeLat, rangeLon); //两点距离 double distance = distanceMeter.getEllipsoidalDistance(); - if(distance <= 6000){ + if(distance <= attRange){ tf = true; bean = c; continue; diff --git a/app/src/main/java/com/bonus/app/util/WorkConfig.java b/app/src/main/java/com/bonus/app/util/WorkConfig.java index 5ccb6cc..48bec22 100644 --- a/app/src/main/java/com/bonus/app/util/WorkConfig.java +++ b/app/src/main/java/com/bonus/app/util/WorkConfig.java @@ -13,31 +13,31 @@ import static com.bonus.app.base.BaseFragment.MEDIA_TYPE_JPG; public class WorkConfig { - //移动 - protected static final String appUrl = "http://192.168.0.14:1913/app/"; -// protected static final String appUrl = "http://172.20.10.2:1913/app/"; -// protected static final String appUrl = "http://112.29.103.165:14413/app/"; - //后台 - protected static final String bmwUrl = "http://192.168.0.14:1911/bmw/"; -// protected static final String bmwUrl = "http://172.20.10.2:1911/bmw/"; -// protected static final String bmwUrl = "http://112.29.103.165:14413/bmw/"; - //公共 - protected static final String systemUrl = "http://192.168.0.14:1910/"; -// protected static final String systemUrl = "http://172.20.10.2:1910/"; -// protected static final String systemUrl = "http://112.29.103.165:14413/system/"; - //登录 - protected static final String loginUrl = "http://192.168.0.14:9200/"; -// protected static final String loginUrl = "http://172.20.10.2:9200/"; -// protected static final String loginUrl = "http://112.29.103.165:14413/auth/"; -// 上传文件路径 - protected static final String fileUrl = "http://192.168.0.14:1909/file/"; -// protected static final String fileUrl = "http://172.20.10.2:1909/file/"; -// protected static final String fileUrl = "http://112.29.103.165:14413/file/"; - //作业计划路径 -// protected static final String zbhUrl = "http://112.29.103.165:14413/ynPlan"; - protected static final String zbhUrl = "http://192.168.0.14:1918/ynPlan"; - + /** + * 本地环境 + * 登录 auth + * 公共 system + * 后台 bmw + * 移动 app + * 上传文件路径 file + * 作业计划路径 ynPlan + */ + protected static final String appUrl = "http://192.168.0.14:39100/app/"; + protected static final String bmwUrl = "http://192.168.0.14:39100/bmw/"; + protected static final String systemUrl = "http://192.168.0.14:39100/system/"; + protected static final String loginUrl = "http://192.168.0.14:39100/auth/"; + protected static final String fileUrl = "http://192.168.0.14:39100/file/"; + protected static final String zbhUrl = "http://192.168.0.14:39100/ynPlan"; + /** + * 测试环境 + * 登录 auth + * 公共 system + * 后台 bmw + * 移动 app + * 上传文件路径 file + * 作业计划路径 ynPlan + */ // protected static final String appUrl = "http://192.168.0.15:1913/app/"; // protected static final String bmwUrl = "http://192.168.0.15:1911/bmw/"; // protected static final String systemUrl = "http://192.168.0.15:1910/"; @@ -46,6 +46,26 @@ public class WorkConfig { // protected static final String zbhUrl = "http://192.168.0.15:1918/ynPlan"; + /** + * 生产环境 + * 登录 auth + * 公共 system + * 后台 bmw + * 移动 app + * 上传文件路径 file + * 作业计划路径 ynPlan + */ +// protected static final String loginUrl = "http://112.29.103.165:14413/auth/"; +// protected static final String systemUrl = "http://112.29.103.165:14413/system/"; +// protected static final String bmwUrl = "http://112.29.103.165:14413/bmw/"; +// protected static final String appUrl = "http://112.29.103.165:14413/app/"; +// protected static final String fileUrl = "http://112.29.103.165:14413/file/"; +// protected static final String zbhUrl = "http://112.29.103.165:14413/ynPlan"; + + + + + //上传文件路径 protected static final String uploadFileUrl = fileUrl + "file/upload"; //破碎图片上传地址