bonus
/
lp_smz_app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改考勤范围为10km

This commit is contained in:
方亮 2026-02-05 14:03:11 +08:00
parent ac43e73361
commit ac24f9542d
3 changed files with 53 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/bonus/app/fragment/index/attendance/AttendanceFragment.java
View File

@ -103,6 +103,9 @@ public class AttendanceFragment extends BaseFragment implements ClickUtils.OnCli
Button myContentBtn; Button myContentBtn;
//打卡范围设置后期改成从字典更新到本地字典，取出来
public double attRange = 10000.0;
UserBean userBean; UserBean userBean;
ProjectBean projectBean; ProjectBean projectBean;
UserDao userDao = new UserDao(myApplication.getDBHelper()); 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); GeodeticCurve distanceMeter = GeodesyUtil.getDistanceMeter(lat, lon, rangeLat, rangeLon);
//两点距离 //两点距离
double distance = distanceMeter.getEllipsoidalDistance(); double distance = distanceMeter.getEllipsoidalDistance();
if (distance <= 6000) { if (distance <= attRange) {
tf = true; tf = true;
subTeamBean = c; subTeamBean = c;
break; break;

6
app/src/main/java/com/bonus/app/fragment/index/attendance/ManageAttendanceFragment.java
View File

@ -96,6 +96,10 @@ public class ManageAttendanceFragment extends BaseFragment implements ClickUtils
Boolean initDataTf = true; Boolean initDataTf = true;
List<ManageAttendanceBean> manageList; List<ManageAttendanceBean> manageList;
//打卡范围设置后期改成从字典更新到本地字典，取出来
public double attRange = 10000.0;
/** /**
* 打卡状态 0-未打卡，1-上班打卡 * 打卡状态 0-未打卡，1-上班打卡
*/ */
@ -218,7 +222,7 @@ public class ManageAttendanceFragment extends BaseFragment implements ClickUtils
GeodeticCurve distanceMeter = GeodesyUtil.getDistanceMeter(lat, lon, rangeLat, rangeLon); GeodeticCurve distanceMeter = GeodesyUtil.getDistanceMeter(lat, lon, rangeLat, rangeLon);
//两点距离 //两点距离
double distance = distanceMeter.getEllipsoidalDistance(); double distance = distanceMeter.getEllipsoidalDistance();
if(distance <= 6000){ if(distance <= attRange){
tf = true; tf = true;
bean = c; bean = c;
continue; continue;

68
app/src/main/java/com/bonus/app/util/WorkConfig.java
View File

@ -13,31 +13,31 @@ import static com.bonus.app.base.BaseFragment.MEDIA_TYPE_JPG;
public class WorkConfig { 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/"; * 登录 auth
// protected static final String appUrl = "http://112.29.103.165:14413/app/"; * 公共 system
//后台 * 后台 bmw
protected static final String bmwUrl = "http://192.168.0.14:1911/bmw/"; * 移动 app
// protected static final String bmwUrl = "http://172.20.10.2:1911/bmw/"; * 上传文件路径 file
// protected static final String bmwUrl = "http://112.29.103.165:14413/bmw/"; * 作业计划路径 ynPlan
//公共 */
protected static final String systemUrl = "http://192.168.0.14:1910/"; protected static final String appUrl = "http://192.168.0.14:39100/app/";
// protected static final String systemUrl = "http://172.20.10.2:1910/"; protected static final String bmwUrl = "http://192.168.0.14:39100/bmw/";
// protected static final String systemUrl = "http://112.29.103.165:14413/system/"; 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 loginUrl = "http://192.168.0.14:9200/"; protected static final String fileUrl = "http://192.168.0.14:39100/file/";
// protected static final String loginUrl = "http://172.20.10.2:9200/"; protected static final String zbhUrl = "http://192.168.0.14:39100/ynPlan";
// 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.15:1913/app/"; // 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 bmwUrl = "http://192.168.0.15:1911/bmw/";
// protected static final String systemUrl = "http://192.168.0.15:1910/"; // 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"; // 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"; protected static final String uploadFileUrl = fileUrl + "file/upload";
//破碎图片上传地址 //破碎图片上传地址