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

Compare commits

base: bonus:master
Branches Tags
bonus:main
bonus:master
..
compare: bonus:main
Branches Tags
bonus:master
bonus:main

No commits in common. "master" and "main" have entirely different histories.
master ... main

5 changed files with 8 additions and 25 deletions
Show Stats Expand all files Collapse all files

2
app/libs/readme
View File

@ -1,2 +0,0 @@
1. TcpClient.java 修改ip
2. GlobalConst.java 修改STRING_WIFI_NAME

8
app/src/main/java/com/bonus/lidar/app/adapter/GridWithPointsAdapter.java
View File

@ -83,13 +83,11 @@ public class GridWithPointsAdapter extends RecyclerView.Adapter<GridWithPointsAd
params.height = ViewGroup.LayoutParams.MATCH_PARENT;
params.width = ViewGroup.LayoutParams.MATCH_PARENT;
} else if (itemCount == 2) {
holder.gridWithPointsView.setScaleFactor(15f);
params.height = recyclerViewHeight > 0 ? recyclerViewHeight / 2 - 25 : ViewGroup.LayoutParams.WRAP_CONTENT;
params.height = recyclerViewHeight > 0 ? recyclerViewHeight / 2 : ViewGroup.LayoutParams.WRAP_CONTENT;
params.width = ViewGroup.LayoutParams.MATCH_PARENT;
} else {
holder.gridWithPointsView.setScaleFactor(15f);
params.height = recyclerViewHeight > 0 ? recyclerViewHeight / 2 - 25 : ViewGroup.LayoutParams.WRAP_CONTENT;
params.width = recyclerViewWidth > 0 ? recyclerViewWidth / 2 - 30: ViewGroup.LayoutParams.MATCH_PARENT;
params.height = recyclerViewHeight > 0 ? recyclerViewHeight / 2 : ViewGroup.LayoutParams.WRAP_CONTENT;
params.width = recyclerViewWidth > 0 ? recyclerViewWidth / 2 : ViewGroup.LayoutParams.MATCH_PARENT;
}
holder.itemView.setLayoutParams(params);

4
app/src/main/java/com/bonus/lidar/app/fragment/MainFragment.java
View File

@ -310,9 +310,9 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
tabLayout.addOnTabSelectedListener(this);
viewPager.setAdapter(mPagerAdapter);
tabLayout.setupWithViewPager(viewPager);
//固件升级
//升级
tvUpdate.setOnClickListener(this);
// 扫描绑定设备
// 扫描
ivScan.setOnClickListener(this);
// 统一距离配置
layAllConfig.setOnClickListener(this);

2
app/src/main/java/com/bonus/lidar/app/service/TcpClient.java
View File

@ -46,7 +46,7 @@ public class TcpClient extends Service {
private boolean isRunning = true;
/** 服务器地址 */
private String host = "192.168.1.1";
// private String host = "192.168.2.182";
// private String host = "192.168.2.184";
private String fileurl = "http://192.168.2.84:1988/online/onlinefile/DataBase.accdb";
/** 端口 */
private int port = 8889;

17
app/src/main/java/com/bonus/lidar/app/util/GridWithPointsView.java
View File

@ -20,8 +20,6 @@ public class GridWithPointsView extends View {
private static final int POINT_RADIUS = 5;
/** 文本大小 */
private static final float TEXT_SIZE = 18;
/** 默认缩放因子 */
private static final float DEFAULT_SCALE_FACTOR = 36f;
private Paint gridPaint;
private Paint originPaint;
@ -31,8 +29,6 @@ public class GridWithPointsView extends View {
private List<Point> points;
/** 原点坐标 */
private float originX, originY;
/** 缩放因子，用于控制坐标系的缩放 */
private float scaleFactor = DEFAULT_SCALE_FACTOR;
@ -55,15 +51,6 @@ public class GridWithPointsView extends View {
invalidate();
}
/**
* 设置缩放因子
* @param scaleFactor 缩放因子，当有两个图时设置为2倍（74f）
*/
public void setScaleFactor(float scaleFactor) {
this.scaleFactor = scaleFactor;
invalidate();
}
private void init() {
// 初始化画笔
gridPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
@ -141,9 +128,9 @@ public class GridWithPointsView extends View {
double angle = point.getAngle();
// 注意：这里的sin和cos可能需要根据您的具体需求进行调整
float x = originX + (float) (distance * scaleFactor * Math.sin(Math.toRadians(angle)));
float x = originX + (float) (distance *37 * Math.sin(Math.toRadians(angle)));
// 减去是因为我们是从底部向上计算y坐标的
float y = originY - (float) (distance * scaleFactor * Math.cos(Math.toRadians(angle)));
float y = originY - (float) (distance *37 * Math.cos(Math.toRadians(angle)));
// 绘制点位
canvas.drawCircle(x, y, POINT_RADIUS, pointPaint);