diff --git a/app/src/main/java/com/bonus/wrjtest/MainActivity.kt b/app/src/main/java/com/bonus/wrjtest/MainActivity.kt
index abf5798..fc633ef 100644
--- a/app/src/main/java/com/bonus/wrjtest/MainActivity.kt
+++ b/app/src/main/java/com/bonus/wrjtest/MainActivity.kt
@@ -7,25 +7,23 @@ import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
+import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
-import android.widget.EditText
-import android.widget.Toast
+import android.widget.*
 import androidx.appcompat.app.AppCompatActivity
 import com.bonus.wrjtest.db.MeasureDataDao
 import com.bonus.wrjtest.entity.Coordinate
 import com.bonus.wrjtest.entity.RadarPointBean
 import com.bonus.wrjtest.entity.SensorDataBean
-import com.bonus.wrjtest.utils.ArithUtil
-import com.bonus.wrjtest.utils.ByteUtil
 import com.bonus.wrjtest.utils.MultipointSagMeasure.calculate
-import com.bonus.wrjtest.utils.RadarMathUtil
 
 import kotlinx.coroutines.Job
 import kotlin.math.cos
 import kotlin.math.sin
 import androidx.lifecycle.lifecycleScope
-import com.bonus.wrjtest.utils.KotlinLogger
+import com.bonus.wrjtest.db.MeasurementDataDao
+import com.bonus.wrjtest.entity.MeasurementDataBean
+import com.bonus.wrjtest.utils.*
 import com.skydroid.rcsdk.PipelineManager
 import com.skydroid.rcsdk.comm.CommListener
 import com.skydroid.rcsdk.common.error.SkyException
@@ -46,26 +44,57 @@ class MainActivity : AppCompatActivity() {
     private var job: Job? = null
 
     lateinit var pipeline: Pipeline
-    lateinit var radar1: EditText
-    lateinit var radar2: EditText
-    lateinit var radar3: EditText
-    lateinit var radar4: EditText
-    lateinit var gps: EditText
-    lateinit var gpsMode: EditText
-    lateinit var pitchAngle: EditText
-    lateinit var rollAngle: EditText
-    lateinit var azimuthAngle: EditText
+    lateinit var radar1: TextView
+    lateinit var radar2: TextView
+    lateinit var radar3: TextView
+    lateinit var radar4: TextView
+    lateinit var gps: TextView
+    lateinit var gpsMode: TextView
+    lateinit var pitchAngle: TextView
+    lateinit var rollAngle: TextView
+    lateinit var azimuthAngle: TextView
     lateinit var returnData: EditText
-    lateinit var sagEditText: EditText
+    lateinit var sagEditText: TextView
     lateinit var hAngleText: EditText
     lateinit var vAngleText: EditText
-    lateinit var positionText: EditText
+    lateinit var positionText: TextView
     lateinit var spanText: EditText
+    lateinit var distance:TextView
+    lateinit var height:TextView
+    lateinit var circuitTypeGroup: RadioGroup
+    lateinit var singleCircuitOptions:LinearLayout
+    lateinit var doubleCircuitOptions:LinearLayout
+
+    /** 分裂类型 */
+    lateinit var radioGroupSplitType: RadioGroup
+
+    //单选框
+    lateinit var singlePhaseGroup:RadioGroup
+    lateinit var doublePhaseGroup: RadioGroup
+    lateinit var doubleBottomPhaseGroup: RadioGroup
+
+    /** 按钮控件 */
+    /** 按钮--保存数据 */
+    lateinit var poll: Button
+    /** 按钮--清除数据 */
+    lateinit var clear: Button
+    /** 按钮--计算弧垂 */
+    lateinit var measure: Button
+    /** 按钮--发送数据 */
+    lateinit var send1: Button
+    /** 按钮--开始测量 */
+    lateinit var send2: Button
+    /** 按钮--视频 */
+    lateinit var video: Button
+    /** 按钮--测量距离 */
+    lateinit var measureDistance: Button
+    /** 按钮--数据记录 */
+    lateinit var record: Button
+
     var handler: Handler = Handler(Looper.getMainLooper())
 
     val resultDataSb = StringBuilder()
 
-    // 声明 kotlinLogger 作为 Activity 的一个属性
     private lateinit var logger: KotlinLogger
 
     var coordinatesList: ArrayList<MutableList<Coordinate>> = ArrayList()
@@ -73,23 +102,50 @@ class MainActivity : AppCompatActivity() {
     var coordinates: MutableList<Coordinate> = ArrayList()
     var sensorDataBean: SensorDataBean = SensorDataBean()
     private lateinit var measureDataDao: MeasureDataDao
-//    val measureDataDao = MeasureDataDao((application as MyApplication).getDbHelper())
+    private lateinit var measurementDataDao: MeasurementDataDao
 
-    private var splitType = "02"
+    /** 分裂类型 */
+    private var splitType = "01"
+    /** 档距 */
     private var span = 48.209
-    private var h = 4.136
+    /** 高差 */
+    private var h = 0.139
 
     private var methodNum = 6
 
+    /**
+     * 是否保存日志
+     * 0-不保存，1-保存
+     */
     private var isPrint=0;
 
+    /**
+     * 测量位置
+     * 大号在左，大号在右
+     */
     private var position="大号在右"
-    // 定义一个全局的 ProgressDialog 变量
+
+    /** 定义一个全局的 ProgressDialog 变量 */
     private var progressDialog: ProgressDialog? = null
 
-    //GPS与雷达位置偏移常量切换
-//    var gpsDistance = 0.28
-//    var gpsAngle = 0.0
+    /** 定义一个标志位，用于防止循环调用 */
+    var isClearing = false
+
+    /**
+     * 测量位置
+     * 单回路： 1-左地线/光缆, 2-右地线/光缆, 3-左相, 4-中相, 5-右相
+     * 双回路： 6-左地线/光缆, 7-地线/光缆, 8-左上相, 9-左中相,10-左下相,11-右上相, 12-右中相,13-右下相
+     */
+    private var positionType=1
+
+    /** 是否保存配置 */
+    private var isConfig = 0;
+
+    /**
+     * 是否记录悬停数据
+     * 0-不记录，1-记录
+     */
+    private var isRecord = 0;
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -99,6 +155,156 @@ class MainActivity : AppCompatActivity() {
         // 在 Activity 或其他有 Context 的地方
         logger = KotlinLogger.getInstance(this)
         measureDataDao = MeasureDataDao(myApplication.getDbHelper())
+        measurementDataDao = MeasurementDataDao(myApplication.getDbHelper())
+        //初始化视图
+        initView()
+        //创建通道
+        createChannel()
+
+        // 统一设置点击事件
+        setButtonClickListeners(send1, send2, poll, clear, measure, video,measureDistance, record)
+
+        //点击事件
+        initClick()
+
+    }
+
+    /**
+     * 初始化点击事件
+     */
+    private fun initClick() {
+        // 设置回路类型选择监听
+        circuitTypeGroup.setOnCheckedChangeListener { group, checkedId ->
+            when (checkedId) {
+                R.id.singleCircuit -> {
+                    singleCircuitOptions.visibility = View.VISIBLE
+                    doubleCircuitOptions.visibility = View.GONE
+                    positionType=1;
+                }
+                R.id.doubleCircuit -> {
+                    singleCircuitOptions.visibility = View.GONE
+                    doubleCircuitOptions.visibility = View.VISIBLE
+                    positionType=6;
+                }
+            }
+        }
+
+        //单回路
+        singlePhaseGroup.setOnCheckedChangeListener { group, checkedId ->
+            when (checkedId) {
+                R.id.leftGroundWire -> {
+                    positionType=1;
+                }
+                R.id.rightGroundWire -> {
+                    positionType=2;
+                }
+                R.id.leftPhase -> {
+                    positionType=3;
+                }
+                R.id.middlePhase -> {
+                    positionType=4;
+                }
+                R.id.rightPhase -> {
+                    positionType=5;
+                }
+            }
+        }
+
+        doublePhaseGroup.setOnCheckedChangeListener { group, checkedId ->
+            // 如果当前正在清除操作，则直接返回
+            if (isClearing) return@setOnCheckedChangeListener
+
+            // 当 doublePhaseGroup 中有选项被选中时，清空 doubleBottomPhaseGroup 的选中状态
+            if (checkedId != -1) {
+                isClearing = true // 设置标志位
+                doubleBottomPhaseGroup.clearCheck()
+                isClearing = false // 清除标志位
+            }
+            when (checkedId) {
+                R.id.dLeftGroundWire -> {
+                    positionType=6;
+                }
+                R.id.dRightGroundWire -> {
+                    positionType=7;
+                }
+                R.id.leftTopPhase -> {
+                    positionType=8;
+                }
+                R.id.leftMiddlePhase -> {
+                    positionType=9;
+                }
+                R.id.leftBottomPhase -> {
+                    positionType=10;
+                }
+
+            }
+        }
+
+        doubleBottomPhaseGroup.setOnCheckedChangeListener { group, checkedId ->
+            // 如果当前正在清除操作，则直接返回
+            if (isClearing) return@setOnCheckedChangeListener
+
+            // 当 doubleBottomPhaseGroup 中有选项被选中时，清空 doublePhaseGroup 的选中状态
+            if (checkedId != -1) {
+                isClearing = true // 设置标志位
+                doublePhaseGroup.clearCheck()
+                isClearing = false // 清除标志位
+            }
+
+            when (checkedId) {
+                R.id.rightTopPhase -> {
+                    positionType=11;
+                }
+                R.id.rightMiddlePhase -> {
+                    positionType=12;
+                }
+                R.id.rightBottomPhase -> {
+                    positionType=13;
+                }
+            }
+        }
+
+        //分裂类型
+        radioGroupSplitType.setOnCheckedChangeListener { group, checkedId ->
+            when (checkedId) {
+                R.id.radioButtonSingleSplit -> {
+                    splitType = "01"
+                    h = 0.139
+                    Toast.makeText(this, "单分裂", Toast.LENGTH_SHORT).show()
+                }
+                R.id.radioButtonDoubleSplit -> {
+                    splitType = "02"
+                    h = 4.136
+                    Toast.makeText(this, "双分裂", Toast.LENGTH_SHORT).show()
+                }
+                R.id.radioButtonQuadSplit -> {
+                    splitType = "04"
+                    h = 4.125
+                    Toast.makeText(this, "四分裂", Toast.LENGTH_SHORT).show()
+                }
+            }
+            coordinatesList.clear()
+            sensorDataList.clear()
+        }
+
+        positionText.setOnClickListener {
+            if (position.equals("大号在右")) {
+                position = "大号在左"
+                positionText.setText("大号在左")
+            } else {
+                position = "大号在右"
+                positionText.setText("大号在右")
+            }
+            Toast.makeText(this, "切换测量位置为：" + position, Toast.LENGTH_LONG).show()
+            sendMsg(4)
+        }
+
+    }
+
+    /**
+     * 初始化视图
+     */
+    private fun initView() {
         radar1 = findViewById(R.id.radar1)
         radar2 = findViewById(R.id.radar2)
         radar3 = findViewById(R.id.radar3)
@@ -115,138 +321,155 @@ class MainActivity : AppCompatActivity() {
         vAngleText = findViewById(R.id.vAngle)
         positionText = findViewById(R.id.position)
         spanText = findViewById(R.id.span)
-        //创建通道
-        createChannel()
+        distance = findViewById(R.id.distance)
+        height = findViewById(R.id.height)
+        circuitTypeGroup = findViewById(R.id.circuitTypeGroup)
+        singleCircuitOptions = findViewById(R.id.singleCircuitOptions)
+        doubleCircuitOptions = findViewById(R.id.doubleCircuitOptions)
 
+        //按钮
+        send1 = findViewById(R.id.send1)
+        send2 = findViewById(R.id.send2)
+        poll = findViewById(R.id.poll)
+        measure = findViewById(R.id.measure)
+        clear = findViewById(R.id.clear)
+        video = findViewById(R.id.video)
+        measureDistance = findViewById(R.id.measureDistance)
+        record = findViewById(R.id.record)
 
+        //单选框
+        singlePhaseGroup = findViewById(R.id.singlePhaseGroup)
+        doublePhaseGroup = findViewById(R.id.doublePhaseGroup)
+        doubleBottomPhaseGroup = findViewById(R.id.doubleBottomPhaseGroup)
 
-        findViewById<Button>(R.id.switchType).setOnClickListener {
-            if (splitType == "01") {
-                splitType = "02"
-//                span = 48.209
-                h = 4.136
-                Toast.makeText(this, "切换至二分裂数据", Toast.LENGTH_LONG).show()
-            } else if (splitType == "02") {
-                splitType = "04"
-//                span = 47.991
-//                span = 45.23
-                h = 4.125
-                Toast.makeText(this, "切换至四分裂数据", Toast.LENGTH_LONG).show()
-            } else {
-                splitType = "01"
-//                span = 45.23
-                h = 0.139
-                Toast.makeText(this, "切换至单分裂数据", Toast.LENGTH_LONG).show()
-            }
-            coordinatesList.clear()
-            sensorDataList.clear()
-        }
+        //分裂类型
+        radioGroupSplitType = findViewById(R.id.radioGroupSplitType)
+    }
 
-//        findViewById<Button>(R.id.poll).setOnClickListener {
-//            if (sensorDataBean.rollAngle>2 || sensorDataBean.rollAngle<-2){
-//                Toast.makeText(this, "横滚角过大，请稳定后再保存", Toast.LENGTH_LONG).show()
-//                return@setOnClickListener
-//            }
-//            Toast.makeText(this, "数据记录中。。。。。", Toast.LENGTH_LONG).show()
-//            sensorDataList.add(sensorDataBean)
-//            coordinatesList.add(coordinates)
-//
-//            logger.log(sensorDataBean.toString(),isPrint)
-//            for (coordinate in coordinates) {
-//                logger.log(coordinate.toString(),isPrint)
-//            }
-//
-//            // 使用 Handler 计时一秒后执行
-//            Handler(Looper.getMainLooper()).postDelayed({
-//                if (sensorDataBean.rollAngle>2 || sensorDataBean.rollAngle<-2){
-//                    Toast.makeText(this, "横滚角过大，请稳定后再保存", Toast.LENGTH_LONG).show()
-//                    return@postDelayed
-//                }
-//                if (job != null) {
-//                    // 取消之前的任务
-//                    job?.cancel()
-//                }
-//                // 计时结束后执行的逻辑
-//                sensorDataList.add(sensorDataBean)
-//                coordinatesList.add(coordinates)
-//
-//                logger.log(sensorDataBean.toString(), isPrint)
-//                for (coordinate in coordinates) {
-//                    logger.log(coordinate.toString(), isPrint)
-//                }
-//
-//                Toast.makeText(this, "已保存数据", Toast.LENGTH_LONG).show()
-//                isPrint = 0
-//                sendMsg(3)
-//                // 延迟 1000 毫秒（1 秒）
-//            }, 3000)
-//        }
+    /**
+     * 统一处理点击事件
+     */
+    private fun setButtonClickListeners(vararg buttons: Button) {
+        for (button in buttons) {
+            button.setOnClickListener {
+                when (it.id) {
+                    // 基础数据
+                    R.id.send1 -> {
+                        if (spanText.getText().toString().isNotEmpty()) {
+                            span = spanText.getText().toString().toDouble()
+                            sendMsg(1)
+                            //清空测量数据表
+                            measurementDataDao.clearTable()
+                        } else {
+                            Toast.makeText(this, "请输入档距", Toast.LENGTH_LONG).show()
+                        }
+                    }
+                    // 开始测量
+                    R.id.send2 -> {
+                        if (isConfig==1){
+                            isPrint=1;
+                            if (job != null) {
+                                job?.cancel()
+                            }
+                            clearAllEditTexts()
+                            job = lifecycleScope.launch {
+                                while (isActive) {
+                                    // Simulate a request being sent
+                                    sendMsg(2)
+                                    // Wait for 2 seconds before sending the next request
+                                    delay(1000L)
+                                }
+                            }
+                        } else{
+                            Toast.makeText(this, "请先保存配置", Toast.LENGTH_LONG).show()
+                        }
+                    }
+                    // 保存数据
+                    R.id.poll -> {
+                        // 显示加载提示
+                        showLoadingDialog()
+                        // 调用方法检查横滚角是否满足条件
+                        waitForRollAngleCondition()
+                    }
+                    // 计算弧垂
+                    R.id.measure -> {
+                        isPrint=1;
+                        if (job != null) {
+                            job?.cancel()
+                        }
+                        Toast.makeText(this, "计算弧垂", Toast.LENGTH_LONG).show()
+//                        getSag()
+                        getMeasurementData()
+                    }
+                    // 清除数据
+                    R.id.clear -> {
+                        if (job != null) {
+                            job?.cancel()
+                        }
+                        clearAllEditTexts()
+                        coordinatesList.clear()
+                        sensorDataList.clear()
+                        isConfig=0;
+                        Toast.makeText(this, "清除数据", Toast.LENGTH_LONG).show()
+                    }
+                    // 视频界面
+                    R.id.video -> {
+                        val intent = Intent(this, Video::class.java);
+                        startActivity(intent)
+                    }
+                    // 测量距离
+                    R.id.measureDistance -> {
+                        //查询测量数据最后一条，与现在的数据，计算距离
+                        var measurementDataBean: MeasurementDataBean = MeasurementDataBean()
+                        measurementDataBean = measurementDataDao.getLastRadarData()
+                        if (measurementDataBean.radarLongitude != null && measurementDataBean.radarLatitude != null && measurementDataBean.radarLongitude != 0.0) {
+                            var coordinatess: MutableList<Coordinate> = ArrayList()
+                            coordinatess=coordinates;
+                            val lastCoordinate: Coordinate? = if (coordinatess.isNotEmpty()) {
+                                coordinatess[coordinatess.size - 1]
+                            } else {
+                                null
+                            }
+                            if (lastCoordinate != null) {
+                                //用两组经纬度高程，计算距离与高差
+                                val calculator = DistanceCalculator()
+                                var calculate = calculator.calculate(
+                                    measurementDataBean.radarLatitude,
+                                    measurementDataBean.radarLongitude,
+                                    lastCoordinate.lat,
+                                    lastCoordinate.lon,
+                                    1
+                                )
+                                distance.setText(calculate.toString())
+                                //计算高差
+                                var d = measurementDataBean.radarElevation - lastCoordinate.h
+                                height.setText(d.toString())
 
-        findViewById<Button>(R.id.poll).setOnClickListener {
-            // 显示加载提示
-            showLoadingDialog()
-            // 调用方法检查横滚角是否满足条件
-            waitForRollAngleCondition()
-        }
+                            } else {
+                                distance.setText("")
+                                height.setText("")
+                                println("列表为空，没有数据")
+                            }
 
-        findViewById<Button>(R.id.clear).setOnClickListener {
-            if (job != null) {
-                job?.cancel()
-            }
-            clearAllEditTexts()
-            coordinatesList.clear()
-            sensorDataList.clear()
-            Toast.makeText(this, "清除数据", Toast.LENGTH_LONG).show()
-        }
-        findViewById<Button>(R.id.measure).setOnClickListener {
-            isPrint=1;
-            if (job != null) {
-                job?.cancel()
-            }
-            Toast.makeText(this, "计算弧垂", Toast.LENGTH_LONG).show()
-            getSag()
-        }
-        findViewById<Button>(R.id.switchMethod).setOnClickListener {
-            if (position.equals("大号在右")) {
-                position = "大号在左"
-                positionText.setText("大号在左")
-            } else {
-                position = "大号在右"
-                positionText.setText("大号在右")
-            }
-            Toast.makeText(this, "切换测量位置为：" + position, Toast.LENGTH_LONG).show()
-            sendMsg(4)
-        }
-        findViewById<Button>(R.id.send1).setOnClickListener {
-            if (spanText.getText().toString().isNotEmpty()) {
-                span = spanText.getText().toString().toDouble()
-                Toast.makeText(this, "基础发送信息", Toast.LENGTH_LONG).show()
-                sendMsg(1)
-            } else {
-                Toast.makeText(this, "请输入档距", Toast.LENGTH_LONG).show()
-            }
-
-        }
-        findViewById<Button>(R.id.send2).setOnClickListener {
-            isPrint=1;
-            if (job != null) {
-                job?.cancel()
-            }
-            clearAllEditTexts()
-            job = lifecycleScope.launch {
-                while (isActive) {
-                    // Simulate a request being sent
-                    sendMsg(2)
-                    // Wait for 2 seconds before sending the next request
-                    delay(1000L)
+                        } else {
+                            Toast.makeText(this, "没有上测点数据", Toast.LENGTH_LONG).show()
+                            distance.setText("")
+                            height.setText("")
+                        }
+                    }
+                    // 记录无人机悬停数据
+                    R.id.record -> {
+                        if (isRecord==0){
+                            isRecord=1;
+                            record.setText("停止")
+                        } else{
+                            isRecord=0;
+                            record.setText("记录")
+                        }
+                        sendMsg(5)
+                    }
                 }
             }
-
-        }
-
-        findViewById<Button>(R.id.video).setOnClickListener {
-            val intent = Intent(this, Video::class.java);
-            startActivity(intent)
         }
     }
 
@@ -264,22 +487,67 @@ class MainActivity : AppCompatActivity() {
 
         // 横滚角满足条件后，执行后续逻辑
 //        Toast.makeText(this, "数据记录中。。。。。", Toast.LENGTH_LONG).show()
-        sensorDataList.add(sensorDataBean)
-        coordinatesList.add(coordinates)
+//        sensorDataList.add(sensorDataBean)
+//        coordinatesList.add(coordinates)
 
         logger.log(sensorDataBean.toString(), isPrint)
-        println(sensorDataBean.toString())
+//        println(sensorDataBean.toString())
         for (coordinate in coordinates) {
             logger.log(coordinate.toString(), isPrint)
-            println(coordinate.toString())
+//            println(coordinate.toString())
         }
 
+        //保存数据
+        saveMeasurementData(sensorDataBean,coordinates);
+
         // 延迟 3 秒后再次检查横滚角
         Handler(Looper.getMainLooper()).postDelayed({
             checkRollAngleAndSave()
         }, 2000)
     }
 
+    /**
+     * 保存测量数据
+     */
+    private fun saveMeasurementData(sensorDataBean: SensorDataBean, coordinates: MutableList<Coordinate>) {
+        var measurementDataBean: MeasurementDataBean = MeasurementDataBean()
+        measurementDataBean.splitType=splitType
+        measurementDataBean.span=span
+        measurementDataBean.h=h
+        if (positionType>5){
+            measurementDataBean.loopType=2
+        } else {
+            measurementDataBean.loopType=1
+        }
+        measurementDataBean.wirePosition=positionType
+        measurementDataBean.wirePositionName=getLinePositionDescription(positionType)
+        measurementDataBean.rollAngle=sensorDataBean.rollAngle
+        measurementDataBean.pitchAngle=sensorDataBean.pitchAngle
+        measurementDataBean.yawAngle=sensorDataBean.azimuthAngle
+        measurementDataBean.radarLongitude=sensorDataBean.lon
+        measurementDataBean.radarLatitude=sensorDataBean.lat
+        measurementDataBean.radarElevation=sensorDataBean.h
+
+        // 将 coordinates 中的 lon, lat, h 拼接并赋值给 wire1Data, wire2Data, wire3Data, wire4Data
+        // 最多处理前四个坐标
+        for (i in 0 until minOf(coordinates.size, 4)) {
+            val coordinate = coordinates[i]
+            val dataString = "${coordinate.lon},${coordinate.lat},${coordinate.h}"
+
+            when (i) {
+                0 -> measurementDataBean.wire1Data = dataString
+                1 -> measurementDataBean.wire2Data = dataString
+                2 -> measurementDataBean.wire3Data = dataString
+                3 -> measurementDataBean.wire4Data = dataString
+            }
+        }
+        measurementDataBean.time=DateTimeHelper.getNowDate()
+
+        // 插入或更新测量数据到数据库
+        measurementDataDao.insertData(measurementDataBean)
+
+    }
+
     /**
      * 定义一个方法用于检查横滚角并保存数据
      */
@@ -291,16 +559,19 @@ class MainActivity : AppCompatActivity() {
             }, 1000)
             return
         }
-
+        if (job != null) {
+            job?.cancel()
+        }
         // 满足条件后保存数据
-        sensorDataList.add(sensorDataBean)
-        coordinatesList.add(coordinates)
-        println(sensorDataBean.toString())
+//        sensorDataList.add(sensorDataBean)
+//        coordinatesList.add(coordinates)
+//        println(sensorDataBean.toString())
         logger.log(sensorDataBean.toString(), isPrint)
         for (coordinate in coordinates) {
             logger.log(coordinate.toString(), isPrint)
-            println(coordinate.toString())
+//            println(coordinate.toString())
         }
+        saveMeasurementData(sensorDataBean,coordinates)
 
 
         isPrint = 0
@@ -310,7 +581,9 @@ class MainActivity : AppCompatActivity() {
         hideLoadingDialog()
     }
 
-    // 显示加载提示的方法
+    /**
+     * 显示加载提示的方法
+     */
     private fun showLoadingDialog() {
         progressDialog = ProgressDialog(this).apply {
             setMessage("数据获取中，请稍候...")
@@ -319,7 +592,9 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    // 隐藏加载提示的方法
+    /**
+     * 隐藏加载提示的方法
+     */
     private fun hideLoadingDialog() {
         progressDialog?.dismiss()
         progressDialog = null
@@ -356,20 +631,14 @@ class MainActivity : AppCompatActivity() {
                                 when (message) {
                                     "F00000F0" -> {
                                         resultDataSb.clear()
+                                        isConfig=1;
                                         // 需要传递 Context 的引用，例如使用 applicationContext
-                                        Toast.makeText(
-                                            applicationContext,
-                                            "基础数据保存成功",
-                                            Toast.LENGTH_SHORT
-                                        ).show()
+                                        Toast.makeText(applicationContext,"保存配置成功",Toast.LENGTH_SHORT).show()
                                     }
                                     "F0000001" -> {
                                         resultDataSb.clear()
-                                        Toast.makeText(
-                                            applicationContext,
-                                            "测量数据保存失败",
-                                            Toast.LENGTH_SHORT
-                                        ).show()
+                                        isConfig=0;
+                                        Toast.makeText(applicationContext,"保存配置失败",Toast.LENGTH_SHORT).show()
                                     }
                                     "F0000002" -> {
                                         resultDataSb.clear()
@@ -447,10 +716,6 @@ class MainActivity : AppCompatActivity() {
                                             // 解析俯仰角和横滚角
                                             var pitchAngle2: Double = ByteUtil.hexToSignedDecimalInt(pitchAngle1).toDouble() / 100.0
                                             var rollAngle2: Double = ByteUtil.hexToSignedDecimalInt(rollAngle1).toDouble() / 100.0
-//                                            var pitchAngle2: Double =
-//                                                ByteUtil.hexToDecimalInt(pitchAngle1).toDouble() / 100.0
-//                                            var rollAngle2: Double =
-//                                                ByteUtil.hexToDecimalInt(rollAngle1).toDouble() / 100.0
                                             var azimuthAngle2: Double =
                                                 ByteUtil.hexToDecimalInt(azimuthAngle1).toDouble() / 100.0
 
@@ -459,40 +724,6 @@ class MainActivity : AppCompatActivity() {
                                             var h2: Double = ByteUtil.hexToDecimalInt(h).toDouble() / 10000.0
 
 
-//                                        handler.post {
-//                                            Toast.makeText(
-//                                                applicationContext,
-//                                                "返回数据解析完成",
-//                                                Toast.LENGTH_SHORT
-//                                            ).show()
-//
-//                                            radar1.setText("${radarDistance1}m, ${radarAngle1}°")
-//                                            radar2.setText("${radarDistance2}m, ${radarAngle2}°")
-//                                            radar3.setText("${radarDistance3}m, ${radarAngle3}°")
-//                                            radar4.setText("${radarDistance4}m, ${radarAngle4}°")
-//
-//                                            pitchAngle.setText("${pitchAngle2}°")
-//                                            rollAngle.setText("${rollAngle2}°")
-//                                            azimuthAngle.setText("${azimuthAngle2}°")
-//                                            gps.setText("经度：${lon2}°，纬度：${lat2}°，高度：${h2}m")
-//                                            if (qual == "01") {
-//                                                gpsMode.setText("单点定位")
-//                                            } else if (qual == "02") {
-//                                                gpsMode.setText("差分定位")
-//                                            } else if (qual == "03") {
-//                                                gpsMode.setText("GPS PPS 模式")
-//                                            } else if (qual == "04") {
-//                                                gpsMode.setText("RTK Int")
-//                                            } else if (qual == "05") {
-//                                                gpsMode.setText("= RTK Float")
-//                                            } else if (qual == "06") {
-//                                                gpsMode.setText("惯导模式")
-//                                            } else if (qual == "07") {
-//                                                gpsMode.setText("手动输入模式")
-//                                            } else {
-//                                                gpsMode.setText("定位不可用或无效")
-//                                            }
-//                                        }
                                             //是不是已经变成新对象了
                                             coordinates = ArrayList()
                                             sensorDataBean = SensorDataBean()
@@ -501,14 +732,6 @@ class MainActivity : AppCompatActivity() {
                                             sensorDataBean.rollAngle = rollAngle2
                                             sensorDataBean.azimuthAngle = azimuthAngle2
 
-//                                            val (latB, lonB, hB) =
-//                                                calculateNewCoordinates(lat2, lon2, h2, gpsAngle, gpsDistance)
-
-//                                            Toast.makeText(
-//                                                applicationContext,
-//                                                "返回数据解析完成",
-//                                                Toast.LENGTH_SHORT
-//                                            ).show()
                                             //展示是水平方向的夹角
                                             radar1.setText("${radarDistance1}m, ${radarAngle1-pitchAngle2}°")
                                             radar2.setText("${radarDistance2}m, ${radarAngle2-pitchAngle2}°")
@@ -548,22 +771,6 @@ class MainActivity : AppCompatActivity() {
                                             } else {
                                                 gpsMode.setText("定位不可用或无效")
                                             }
-//                                        var bean = MeasureDataBean()
-//                                        bean.divisionType = splitType
-//                                        bean.pointType= methodNum.toString()
-//                                        bean.line1 = "${radarDistance1}m, ${radarAngle1}°"
-//                                        bean.line2 = "${radarDistance2}m, ${radarAngle2}°"
-//                                        bean.line3 = "${radarDistance3}m, ${radarAngle3}°"
-//                                        bean.line4 = "${radarDistance4}m, ${radarAngle4}°"
-//                                        bean.bdLocation= "经度：${lon2}°，纬度：${lat2}°，高度：${h2}m"
-//                                        bean.pyLocation= "经度：${lonB}°，纬度：${latB}°，高度：${hB}m"
-//                                        bean.positioningMode = gpsMode.text.toString()
-//                                        bean.pitchAngle = pitchAngle.text.toString()
-//                                        bean.rollAngle = rollAngle.text.toString()
-//                                        bean.azimuthAngle = azimuthAngle.text.toString()
-//                                        bean.sag = sagEditText.text.toString()
-//                                        bean.time=DateTimeHelper.getNowDate()
-//                                        measureDataDao.insertValue(bean)
                                         sensorDataBean.lon = lon2
                                         sensorDataBean.lat = lat2
                                         sensorDataBean.h = h2
@@ -605,7 +812,10 @@ class MainActivity : AppCompatActivity() {
     }
 
 
-    //hay   四分裂--3点/6点
+    /**
+     * 手动输入数据，计算弧垂
+     * 四分裂--3点/6点
+     */
     private fun dealWithDatas() {
 
         var sensor1 = SensorDataBean()
@@ -628,24 +838,24 @@ class MainActivity : AppCompatActivity() {
             coordinate1.add(coordinate)
         }
 
-////        var sensor2 = SensorDataBean()
-////        sensor2.pitchAngle = 0.01
-////        sensor2.rollAngle = 1.01
-////        sensor2.azimuthAngle = 110.11
-////        sensor2.lon = 117.16295435
-////        sensor2.lat = 31.78569556
-////        sensor2.h = 40.25136
-////        var radarPoint2: MutableList<RadarPointBean> = ArrayList()
-////        radarPoint2.add(RadarPointBean(170.35, 5.867))
-////        radarPoint2.add(RadarPointBean(171.0, 6.323))
-////        radarPoint2.add(RadarPointBean(166.65, 6.373))
-////        radarPoint2.add(RadarPointBean(166.05, 5.935))
-////        var coordinate2 :MutableList<Coordinate> = ArrayList()
-////        for (radarPointBean in radarPoint2) {
-////            val coordinate = RadarMathUtil.transferPoint2(radarPointBean, sensor2)
-////            coordinate.radarPoint = radarPointBean
-////            coordinate2.add(coordinate)
-////        }
+        var sensor2 = SensorDataBean()
+        sensor2.pitchAngle = 0.01
+        sensor2.rollAngle = 1.01
+        sensor2.azimuthAngle = 110.11
+        sensor2.lon = 117.16295435
+        sensor2.lat = 31.78569556
+        sensor2.h = 40.25136
+        var radarPoint2: MutableList<RadarPointBean> = ArrayList()
+        radarPoint2.add(RadarPointBean(170.35, 5.867))
+        radarPoint2.add(RadarPointBean(171.0, 6.323))
+        radarPoint2.add(RadarPointBean(166.65, 6.373))
+        radarPoint2.add(RadarPointBean(166.05, 5.935))
+        var coordinate2 :MutableList<Coordinate> = ArrayList()
+        for (radarPointBean in radarPoint2) {
+            val coordinate = RadarMathUtil.transferPoint2(radarPointBean, sensor2)
+            coordinate.radarPoint = radarPointBean
+            coordinate2.add(coordinate)
+        }
 //
         var sensor3 = SensorDataBean()
         sensor3.pitchAngle = 3.0353
@@ -666,24 +876,24 @@ class MainActivity : AppCompatActivity() {
             coordinate3.add(coordinate)
         }
 
-////        var sensor4 = SensorDataBean()
-////        sensor4.pitchAngle = 1.01
-////        sensor4.rollAngle = 0.01
-////        sensor4.azimuthAngle = 120.21
-////        sensor4.lon = 117.16296837
-////        sensor4.lat = 31.78568228
-////        sensor4.h = 41.37936
-////        var radarPoint4: MutableList<RadarPointBean> = ArrayList()
-////        radarPoint4.add(RadarPointBean(157.9, 6.581))
-////        radarPoint4.add(RadarPointBean(159.15, 7.005))
-////        radarPoint4.add(RadarPointBean(155.55, 7.155))
-////        radarPoint4.add(RadarPointBean(154.35, 7.766))
-////        var coordinate4 :MutableList<Coordinate> = ArrayList()
-////        for (radarPointBean in radarPoint4) {
-////            val coordinate = RadarMathUtil.transferPoint2(radarPointBean, sensor4)
-////            coordinate.radarPoint = radarPointBean
-////            coordinate4.add(coordinate)
-////        }
+        var sensor4 = SensorDataBean()
+        sensor4.pitchAngle = 1.01
+        sensor4.rollAngle = 0.01
+        sensor4.azimuthAngle = 120.21
+        sensor4.lon = 117.16296837
+        sensor4.lat = 31.78568228
+        sensor4.h = 41.37936
+        var radarPoint4: MutableList<RadarPointBean> = ArrayList()
+        radarPoint4.add(RadarPointBean(157.9, 6.581))
+        radarPoint4.add(RadarPointBean(159.15, 7.005))
+        radarPoint4.add(RadarPointBean(155.55, 7.155))
+        radarPoint4.add(RadarPointBean(154.35, 7.766))
+        var coordinate4 :MutableList<Coordinate> = ArrayList()
+        for (radarPointBean in radarPoint4) {
+            val coordinate = RadarMathUtil.transferPoint2(radarPointBean, sensor4)
+            coordinate.radarPoint = radarPointBean
+            coordinate4.add(coordinate)
+        }
 //
         var sensor5 = SensorDataBean()
         sensor5.pitchAngle = 2.0295
@@ -704,37 +914,37 @@ class MainActivity : AppCompatActivity() {
             coordinate5.add(coordinate)
         }
 
-////        var sensor6 = SensorDataBean()
-////        sensor6.pitchAngle = 0.0
-////        sensor6.rollAngle = 3.04
-////        sensor6.azimuthAngle = 119.2
-////        sensor6.lon = 117.16281242
-////        sensor6.lat = 31.78569027
-////        sensor6.h = 41.61336
-////        var radarPoint6: MutableList<RadarPointBean> = ArrayList()
-////        radarPoint6.add(RadarPointBean(160.05, 5.774))
-////        radarPoint6.add(RadarPointBean(161.55, 6.197))
-////        radarPoint6.add(RadarPointBean(157.8, 6.359))
-////        radarPoint6.add(RadarPointBean(156.1, 5.973))
-////        var coordinate6 :MutableList<Coordinate> = ArrayList()
-////        for (radarPointBean in radarPoint6) {
-////            val coordinate = RadarMathUtil.transferPoint2(radarPointBean, sensor6)
-////            coordinate.radarPoint = radarPointBean
-////            coordinate6.add(coordinate)
-////        }
+        var sensor6 = SensorDataBean()
+        sensor6.pitchAngle = 0.0
+        sensor6.rollAngle = 3.04
+        sensor6.azimuthAngle = 119.2
+        sensor6.lon = 117.16281242
+        sensor6.lat = 31.78569027
+        sensor6.h = 41.61336
+        var radarPoint6: MutableList<RadarPointBean> = ArrayList()
+        radarPoint6.add(RadarPointBean(160.05, 5.774))
+        radarPoint6.add(RadarPointBean(161.55, 6.197))
+        radarPoint6.add(RadarPointBean(157.8, 6.359))
+        radarPoint6.add(RadarPointBean(156.1, 5.973))
+        var coordinate6 :MutableList<Coordinate> = ArrayList()
+        for (radarPointBean in radarPoint6) {
+            val coordinate = RadarMathUtil.transferPoint2(radarPointBean, sensor6)
+            coordinate.radarPoint = radarPointBean
+            coordinate6.add(coordinate)
+        }
 //
         sensorDataList.add(sensor1)
-////        sensorDataList.add(sensor2)
+        sensorDataList.add(sensor2)
         sensorDataList.add(sensor3)
         coordinatesList.add(coordinate1)
-////        coordinatesList.add(coordinate2)
+        coordinatesList.add(coordinate2)
         coordinatesList.add(coordinate3)
-////        sensorDataList.add(sensor4)
+        sensorDataList.add(sensor4)
         sensorDataList.add(sensor5)
-////        sensorDataList.add(sensor6)
-////        coordinatesList.add(coordinate4)
+        sensorDataList.add(sensor6)
+        coordinatesList.add(coordinate4)
         coordinatesList.add(coordinate5)
-////        coordinatesList.add(coordinate6)
+        coordinatesList.add(coordinate6)
 
 
 //        var sensor1 = SensorDataBean()
@@ -909,6 +1119,115 @@ class MainActivity : AppCompatActivity() {
 
     }
 
+    private fun getMeasurementData() {
+        //查询测量数据表的数据
+        //1、先根据导线位置（wirePosition）分组，查看对应数据条数，不满足6条，则跳过该组数据
+        val measurementDataList: List<MeasurementDataBean> = measurementDataDao.getWirePositionCount()
+        for (measurementData in measurementDataList) {
+            if (measurementData.num >= 6) {
+                var coordinatesList: ArrayList<MutableList<Coordinate>> = ArrayList()
+                // 查询所有 wirePosition=measurementData.wirePosition 的数据
+                val measurementDataList2: List<MeasurementDataBean> = measurementDataDao.getDataByWirePosition(measurementData.wirePosition)
+                for (data in measurementDataList2) {
+                    var coordinate1: MutableList<Coordinate> = ArrayList()
+                    if (!StringHelper.isEmptyAndNull(data.wire1Data)) {
+                        // 将 data.wire1Data 的数据用逗号分隔
+                        val wire1DataList = data.wire1Data.split(",")
+                        if (wire1DataList.size >= 3) {
+                            val coordinate = Coordinate(wire1DataList[0].toDouble(), wire1DataList[1].toDouble(), wire1DataList[2].toDouble())
+                            coordinate1.add(coordinate)
+                        }
+                    }
+                    if (!StringHelper.isEmptyAndNull(data.wire2Data)) {
+                        // 将 data.wire2Data 的数据用逗号分隔
+                        val wire2DataList = data.wire2Data.split(",")
+                        if (wire2DataList.size >= 3) {
+                            val coordinate = Coordinate(wire2DataList[0].toDouble(), wire2DataList[1].toDouble(), wire2DataList[2].toDouble())
+                            coordinate1.add(coordinate)
+                        }
+                    }
+                    if (!StringHelper.isEmptyAndNull(data.wire3Data)) {
+                        // 将 data.wire3Data 的数据用逗号分隔
+                        val wire3DataList = data.wire3Data.split(",")
+                        if (wire3DataList.size >= 3) {
+                            val coordinate = Coordinate(wire3DataList[0].toDouble(), wire3DataList[1].toDouble(), wire3DataList[2].toDouble())
+                            coordinate1.add(coordinate)
+                        }
+                    }
+                    if (!StringHelper.isEmptyAndNull(data.wire4Data)) {
+                        // 将 data.wire4Data 的数据用逗号分隔
+                        val wire4DataList = data.wire4Data.split(",")
+                        if (wire4DataList.size >= 3) {
+                            val coordinate = Coordinate(wire4DataList[0].toDouble(), wire4DataList[1].toDouble(), wire4DataList[2].toDouble())
+                            coordinate1.add(coordinate)
+                        }
+                    }
+                    coordinatesList.add(coordinate1)
+                }
+
+                //计算弧垂
+                var sag2 = getSag2(coordinatesList, measurementDataList2[0].span)
+                //将弧垂数据存入对应的数据库表中
+                measurementDataDao.updateSagValueByWirePosition(measurementData.wirePosition, sag2)
+            }
+        }
+
+        //待所有弧垂计算结束，统计各位置导线弧垂情况
+        val measurementDataList3: List<MeasurementDataBean> = measurementDataDao.getWirePositionWithSagValue()
+        // 格式化数据
+        val formattedText = StringBuilder()
+        for (data in measurementDataList3) {
+            formattedText.append("${data.wirePositionName}：${data.sagValue}\n")
+        }
+        sagEditText.text = formattedText.toString().trim()
+    }
+
+    private fun getSag2( coordinatesList: ArrayList<MutableList<Coordinate>>,span: Double): String? {
+        var pointNum = 6
+        if (coordinatesList.size >= pointNum) {
+            var point1: MutableList<Coordinate> = ArrayList()
+            var point2: MutableList<Coordinate> = ArrayList()
+            var point3: MutableList<Coordinate> = ArrayList()
+            var point4: MutableList<Coordinate> = ArrayList()
+            var point5: MutableList<Coordinate> = ArrayList()
+            var point6: MutableList<Coordinate> = ArrayList()
+            // 遍历 ArrayList 中的前三个 MutableList
+            // 计数器
+            var count = 0
+            for (list in coordinatesList) {
+                // 遍历每个 MutableList 中的 Coordinate
+                when (count) {
+                    0 -> point1 = list
+                    1 -> point2 = list
+                    2 -> point3 = list
+                    3 -> point4 = list
+                    4 -> point5 = list
+                    5 -> point6 = list
+                }
+                count++
+                if (count == pointNum) {
+                    break
+                }
+            }
+            val sb = StringBuilder()
+            for (i in point1.indices) {
+                // 遍历每个 MutableList 中的 Coordinate
+                var lineAllPoint: MutableList<Coordinate> = ArrayList()
+                lineAllPoint.add(point1[i])
+                lineAllPoint.add(point2[i])
+                lineAllPoint.add(point3[i])
+                lineAllPoint.add(point4[i])
+                lineAllPoint.add(point5[i])
+                lineAllPoint.add(point6[i])
+                sb.append(calculate(span, lineAllPoint, pointNum)).append(",")
+            }
+            return sb.toString()
+//            sagEditText.setText(sb.toString())
+//            logger.log("六点计算弧垂："+sb.toString(),isPrint)
+        }
+        return ""
+    }
+
     private fun getSag() {
 //        dealWithDatas();
         if (methodNum == 3) {
@@ -934,7 +1253,6 @@ class MainActivity : AppCompatActivity() {
                 val sb = StringBuilder()
                 for (i in point1.indices) {
                     // 遍历每个 MutableList 中的 Coordinate
-//                sb.append(ArithUtil.round(getSag(point1[i], point2[i], point3[i], span),2)).append(",")
                     var lineAllPoint: MutableList<Coordinate> = ArrayList()
                     lineAllPoint.add(point1[i])
                     lineAllPoint.add(point2[i])
@@ -997,14 +1315,11 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun sendMsg(i: Int) {
-//        Toast.makeText(this, "测量发送信息", Toast.LENGTH_LONG).show()
         pipeline.let {
             val sb = StringBuilder()
             if (i == 1) {
                 sb.append("0F0100")
-
                 sb.append(splitType)
-
                 val hexSpanStr = ByteUtil.decIntToHexStr((ArithUtil.round(span, 2) * 100).toInt(), 3)
                 sb.append(hexSpanStr)
                 val hexHStr = ByteUtil.decIntToHexStr((ArithUtil.round(h, 2) * 100).toInt(), 2)
@@ -1012,14 +1327,21 @@ class MainActivity : AppCompatActivity() {
                 sb.append("01")
                 sb.append("02")
                 sb.append("01")
-
-
                 val sum16 = ByteUtil.getSum16(sb.toString())
                 sb.append(sum16)
                 //保存基础数据
             } else if (i == 2) {
-                //获取测量数据
-                sb.append("0F020000000011")
+                sb.append("0F02")
+                //传测量位置，以及导线位置
+                val wirePosition =ByteUtil.decIntToHexStr((positionType * 100), 2)
+                sb.append(wirePosition)
+                if (position.equals("大号在右")) {
+                    sb.append("0100")
+                } else if (position.equals("大号在左")) {
+                    sb.append("0200")
+                }
+                val sum16 = ByteUtil.getSum16(sb.toString())
+                sb.append(sum16)
             } else if (i == 3) {
                 //保存数据
                 sb.append("0F030000000012")
@@ -1030,6 +1352,14 @@ class MainActivity : AppCompatActivity() {
                 } else if (position.equals("大号在左")) {
                     sb.append("0F040200000015")
                 }
+            } else if (i == 5) {
+                if (isRecord==0){
+                    sb.append("0F050100000015")
+                    Toast.makeText(this, "停止记录", Toast.LENGTH_SHORT).show()
+                }else{
+                    sb.append("0F050200000016")
+                    Toast.makeText(this, "开始记录", Toast.LENGTH_SHORT).show()
+                }
             }
             it.writeData(ByteUtil.hex2byte(sb.toString()))
         }
@@ -1042,26 +1372,6 @@ class MainActivity : AppCompatActivity() {
         Log.e(this::class.java.toString(), obj.toString())
     }
 
-    fun calculateNewCoordinates(
-        latA: Double,
-        lonA: Double,
-        hA: Double,
-        angle: Double,
-        distance: Double
-    ): Triple<Double, Double, Double> {
-        val R = 6371393 // 地球半径（米）
-        // 计算竖直和水平距离
-        val h = distance * cos(Math.toRadians(angle)) // 垂直方向的高度变化
-        val r = distance * sin(Math.toRadians(angle)) // 水平方向的距离
-        // 更新高程
-        val hB = hA - h
-        // 更新纬度
-        val latB = latA + (r / R) * (180 / Math.PI)
-        // 更新经度
-        val lonB = lonA + (r / (R * cos(Math.toRadians(latA)))) * (180 / Math.PI)
-        return Triple(latB, lonB, hB)
-    }
-
     fun clearAllEditTexts() {
         radar1.setText("")
         radar2.setText("")
@@ -1075,15 +1385,33 @@ class MainActivity : AppCompatActivity() {
         sagEditText.setText("")
         hAngleText.setText("")
         vAngleText.setText("")
+        distance.setText("")
+        height.setText("")
     }
 
-    fun getCurrentTimeAsString(): String {
-        // 获取当前时间
-        val currentTime = LocalTime.now()
-        // 定义格式化模式
-        val formatter = DateTimeFormatter.ofPattern("HH:mm:ss")
-        // 格式化当前时间
-        return currentTime.format(formatter)
+    /**
+     * 根据传入的数字返回对应的导线位置描述
+     *
+     * @param linePosition 导线位置编号
+     * @return 对应的文字描述，如果编号无效，则返回"未知位置"
+     */
+    fun getLinePositionDescription(linePosition: Int): String? {
+        return when (linePosition) {
+            1 -> "左地线/光缆"
+            2 -> "右地线/光缆"
+            3 -> "左相"
+            4 -> "中相"
+            5 -> "右相"
+            6 -> "左地线/光缆"
+            7 -> "地线/光缆"
+            8 -> "左上相"
+            9 -> "左中相"
+            10 -> "左下相"
+            11 -> "右上相"
+            12 -> "右中相"
+            13 -> "右下相"
+            else -> "未知位置"
+        }
     }
 
     override fun onDestroy() {
diff --git a/app/src/main/java/com/bonus/wrjtest/db/DBHelper.java b/app/src/main/java/com/bonus/wrjtest/db/DBHelper.java
index dd42f73..c29589b 100644
--- a/app/src/main/java/com/bonus/wrjtest/db/DBHelper.java
+++ b/app/src/main/java/com/bonus/wrjtest/db/DBHelper.java
@@ -10,11 +10,17 @@ import android.util.Log;
 
 public class DBHelper extends SQLiteOpenHelper {
 
-    private static final String DB_NAME = "wrj.db"; // 数据库名称
+    /**
+     * 数据库名称
+     */
+    private static final String DB_NAME = "wrj.db";
 
-    private static final int version = 1; // 数据库版本
+    /**
+     * 数据库版本
+     */
+    private static final int version = 1;
 
-    private final String[] CREATABLE = new String[]{MeasureDataDao.CREATE_TABLE};
+    private final String[] CREATABLE = new String[]{MeasureDataDao.CREATE_TABLE, MeasurementDataDao.CREATE_TABLE};
 
     public DBHelper(Context context) {
         super(context, DB_NAME, null, version);
diff --git a/app/src/main/java/com/bonus/wrjtest/db/MeasurementDataDao.java b/app/src/main/java/com/bonus/wrjtest/db/MeasurementDataDao.java
new file mode 100644
index 0000000..29d0ab3
--- /dev/null
+++ b/app/src/main/java/com/bonus/wrjtest/db/MeasurementDataDao.java
@@ -0,0 +1,352 @@
+package com.bonus.wrjtest.db;
+
+import android.database.Cursor;
+import android.util.Log;
+
+
+import com.bonus.wrjtest.entity.MeasurementDataBean;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MeasurementDataDao {
+    private static final String TAG = "MeasurementDataDao";
+
+    private DBHelper dbHelper;
+
+    public MeasurementDataDao(DBHelper dbHelper) {
+        this.dbHelper = dbHelper;
+    }
+
+    // 创建测量数据表的SQL语句
+    public static final String CREATE_TABLE = "CREATE TABLE `bm_measurement_data` (" +
+            "`id` INTEGER PRIMARY KEY AUTOINCREMENT," +
+            "`splitType` varchar(100)," +
+            "`span` varchar(100)," +
+            "`h` varchar(100)," +
+            "`loopType` INTEGER," +
+            "`wirePosition` INTEGER," +
+            "`wirePositionName` varchar(100)," +
+            "`rollAngle` varchar(100)," +
+            "`pitchAngle` varchar(100)," +
+            "`yawAngle` varchar(100)," +
+            "`radarLongitude` varchar(100)," +
+            "`radarLatitude` varchar(100)," +
+            "`radarElevation` varchar(100)," +
+            "`wire1Data` varchar(100)," +
+            "`wire2Data` varchar(100)," +
+            "`wire3Data` varchar(100)," +
+            "`wire4Data` varchar(100)," +
+            "`sagValue` varchar(100)," +
+            "`time` varchar(100)" +
+            ")";
+
+    /**
+     * 新增或更新测量数据
+     *
+     * @param measurementData 测量数据对象
+     * @return 是否成功
+     */
+    public boolean insertData(MeasurementDataBean measurementData) {
+        String sql = "INSERT OR REPLACE INTO `bm_measurement_data` (" +
+                "`splitType`,`span`,`h`,`loopType`, `wirePosition`, `wirePositionName`, `rollAngle`, `pitchAngle`, `yawAngle`, " +
+                "`radarLongitude`, `radarLatitude`, `radarElevation`, `wire1Data`, `wire2Data`, `wire3Data`, " +
+                "`wire4Data`, `sagValue`, `time`) " +
+                "VALUES (?, ?, ?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+        try {
+            this.dbHelper.execSQL(sql, new Object[]{
+                    measurementData.getSplitType(),
+                    measurementData.getSpan(),
+                    measurementData.getH(),
+                    measurementData.getLoopType(),
+                    measurementData.getWirePosition(),
+                    measurementData.getWirePositionName(),
+                    measurementData.getRollAngle(),
+                    measurementData.getPitchAngle(),
+                    measurementData.getYawAngle(),
+                    measurementData.getRadarLongitude(),
+                    measurementData.getRadarLatitude(),
+                    measurementData.getRadarElevation(),
+                    measurementData.getWire1Data(),
+                    measurementData.getWire2Data(),
+                    measurementData.getWire3Data(),
+                    measurementData.getWire4Data(),
+                    measurementData.getSagValue(),
+                    measurementData.getTime()
+            });
+            return true;
+        } catch (Exception e) {
+            Log.e(TAG, "Insert failed: " + e.toString());
+            return false;
+        }
+    }
+
+    /**
+     * 查询所有测量数据
+     *
+     * @return 测量数据列表
+     */
+    public List<MeasurementDataBean> selectAll() {
+        String sql = "SELECT * FROM bm_measurement_data";
+        Cursor cr = null;
+        List<MeasurementDataBean> dataList = new ArrayList<>();
+        try {
+            cr = this.dbHelper.query(sql, new String[]{});
+            while (cr.moveToNext()) {
+                MeasurementDataBean data = new MeasurementDataBean();
+                data.setId(cr.getInt(cr.getColumnIndex("id")));
+                data.setSplitType(cr.getString(cr.getColumnIndex("splitType")));
+                data.setSpan(Double.parseDouble(cr.getString(cr.getColumnIndex("span"))));
+                data.setH(Double.parseDouble(cr.getString(cr.getColumnIndex("h"))));
+                data.setLoopType(cr.getInt(cr.getColumnIndex("loopType")));
+                data.setWirePosition(cr.getInt(cr.getColumnIndex("wirePosition")));
+                data.setWirePositionName(cr.getString(cr.getColumnIndex("wirePositionName")));
+                data.setRollAngle(Double.parseDouble(cr.getString(cr.getColumnIndex("rollAngle"))));
+                data.setPitchAngle(Double.parseDouble(cr.getString(cr.getColumnIndex("pitchAngle"))));
+                data.setYawAngle(Double.parseDouble(cr.getString(cr.getColumnIndex("yawAngle"))));
+                data.setRadarLongitude(Double.parseDouble(cr.getString(cr.getColumnIndex("radarLongitude"))));
+                data.setRadarLatitude(Double.parseDouble(cr.getString(cr.getColumnIndex("radarLatitude"))));
+                data.setRadarElevation(Double.parseDouble(cr.getString(cr.getColumnIndex("radarElevation"))));
+                data.setWire1Data(cr.getString(cr.getColumnIndex("wire1Data")));
+                data.setWire2Data(cr.getString(cr.getColumnIndex("wire2Data")));
+                data.setWire3Data(cr.getString(cr.getColumnIndex("wire3Data")));
+                data.setWire4Data(cr.getString(cr.getColumnIndex("wire4Data")));
+                data.setSagValue(cr.getString(cr.getColumnIndex("sagValue")));
+                data.setTime(cr.getString(cr.getColumnIndex("time")));
+                dataList.add(data);
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "Select all failed: " + e.toString());
+        } finally {
+            if (cr != null) {
+                cr.close();
+            }
+        }
+        return dataList;
+    }
+
+    /**
+     * 根据ID查询单条记录
+     *
+     * @param id 主键ID
+     * @return 测量数据对象
+     */
+    public MeasurementDataBean selectById(int id) {
+        String sql = "SELECT * FROM bm_measurement_data WHERE id = ?";
+        Cursor cr = null;
+        MeasurementDataBean data = null;
+        try {
+            cr = this.dbHelper.query(sql, new String[]{String.valueOf(id)});
+            if (cr.moveToFirst()) {
+                data = new MeasurementDataBean();
+                data.setId(cr.getInt(cr.getColumnIndex("id")));
+                data.setSplitType(cr.getString(cr.getColumnIndex("splitType")));
+                data.setSpan(Double.parseDouble(cr.getString(cr.getColumnIndex("span"))));
+                data.setH(Double.parseDouble(cr.getString(cr.getColumnIndex("h"))));
+                data.setLoopType(cr.getInt(cr.getColumnIndex("loopType")));
+                data.setWirePosition(cr.getInt(cr.getColumnIndex("wirePosition")));
+                data.setWirePositionName(cr.getString(cr.getColumnIndex("wirePositionName")));
+                data.setRollAngle(Double.parseDouble(cr.getString(cr.getColumnIndex("rollAngle"))));
+                data.setPitchAngle(Double.parseDouble(cr.getString(cr.getColumnIndex("pitchAngle"))));
+                data.setYawAngle(Double.parseDouble(cr.getString(cr.getColumnIndex("yawAngle"))));
+                data.setRadarLongitude(Double.parseDouble(cr.getString(cr.getColumnIndex("radarLongitude"))));
+                data.setRadarLatitude(Double.parseDouble(cr.getString(cr.getColumnIndex("radarLatitude"))));
+                data.setRadarElevation(Double.parseDouble(cr.getString(cr.getColumnIndex("radarElevation"))));
+                data.setWire1Data(cr.getString(cr.getColumnIndex("wire1Data")));
+                data.setWire2Data(cr.getString(cr.getColumnIndex("wire2Data")));
+                data.setWire3Data(cr.getString(cr.getColumnIndex("wire3Data")));
+                data.setWire4Data(cr.getString(cr.getColumnIndex("wire4Data")));
+                data.setSagValue(cr.getString(cr.getColumnIndex("sagValue")));
+                data.setTime(cr.getString(cr.getColumnIndex("time")));
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "Select by ID failed: " + e.toString());
+        } finally {
+            if (cr != null) {
+                cr.close();
+            }
+        }
+        return data;
+    }
+
+    /**
+     * 根据导线位置（wirePosition）分组，统计每组数据条数
+     *
+     * @return Map<wirePosition, count> 导线位置与对应数据条数的映射
+     */
+    public List<MeasurementDataBean> getWirePositionCount() {
+        String sql = "SELECT wirePosition, COUNT(*) AS num FROM bm_measurement_data GROUP BY wirePosition";
+        Cursor cr = null;
+        List<MeasurementDataBean> dataList = new ArrayList<>();
+        try {
+            cr = this.dbHelper.query(sql, new String[]{});
+            while (cr.moveToNext()) {
+                MeasurementDataBean data = new MeasurementDataBean();
+                data.setWirePosition(cr.getInt(cr.getColumnIndex("wirePosition")));
+                data.setNum(cr.getInt(cr.getColumnIndex("num")));
+                dataList.add(data);
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "Get wire position count failed: " + e.toString());
+        } finally {
+            if (cr != null) {
+                cr.close();
+            }
+        }
+        return dataList;
+    }
+
+    /**
+     * 根据 wirePosition 查询数据，并按时间正序排序
+     *
+     * @param wirePosition 导线位置
+     * @return 满足条件的数据列表
+     */
+    public List<MeasurementDataBean> getDataByWirePosition(int wirePosition) {
+        String sql = "SELECT * FROM bm_measurement_data WHERE wirePosition = ? ORDER BY time ASC";
+        Cursor cr = null;
+        List<MeasurementDataBean> dataList = new ArrayList<>();
+        try {
+            cr = this.dbHelper.query(sql, new String[]{String.valueOf(wirePosition)});
+            while (cr.moveToNext()) {
+                MeasurementDataBean data = new MeasurementDataBean();
+                data.setSplitType(cr.getString(cr.getColumnIndex("splitType")));
+                data.setSpan(Double.parseDouble(cr.getString(cr.getColumnIndex("span"))));
+                data.setH(Double.parseDouble(cr.getString(cr.getColumnIndex("h"))));
+                data.setLoopType(cr.getInt(cr.getColumnIndex("loopType")));
+                data.setWirePosition(cr.getInt(cr.getColumnIndex("wirePosition")));
+                data.setWirePositionName(cr.getString(cr.getColumnIndex("wirePositionName")));
+                data.setRollAngle(Double.parseDouble(cr.getString(cr.getColumnIndex("rollAngle"))));
+                data.setPitchAngle(Double.parseDouble(cr.getString(cr.getColumnIndex("pitchAngle"))));
+                data.setYawAngle(Double.parseDouble(cr.getString(cr.getColumnIndex("yawAngle"))));
+                data.setRadarLongitude(Double.parseDouble(cr.getString(cr.getColumnIndex("radarLongitude"))));
+                data.setRadarLatitude(Double.parseDouble(cr.getString(cr.getColumnIndex("radarLatitude"))));
+                data.setRadarElevation(Double.parseDouble(cr.getString(cr.getColumnIndex("radarElevation"))));
+                data.setWire1Data(cr.getString(cr.getColumnIndex("wire1Data")));
+                data.setWire2Data(cr.getString(cr.getColumnIndex("wire2Data")));
+                data.setWire3Data(cr.getString(cr.getColumnIndex("wire3Data")));
+                data.setWire4Data(cr.getString(cr.getColumnIndex("wire4Data")));
+                data.setSagValue(cr.getString(cr.getColumnIndex("sagValue")));
+                data.setTime(cr.getString(cr.getColumnIndex("time")));
+                // 根据实际字段补充其他 setter 方法
+                dataList.add(data);
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "Get data by wire position failed: " + e.toString());
+        } finally {
+            if (cr != null) {
+                cr.close();
+            }
+        }
+        return dataList;
+    }
+
+    /**
+     * 根据 wirePosition 分组，查询 wirePositionName 和 sagValue 的值，
+     * 并且保证 sagValue 的值不为空字符串或 null
+     *
+     * @return 查询结果列表
+     */
+    public List<MeasurementDataBean> getWirePositionWithSagValue() {
+        String sql = "SELECT wirePosition, wirePositionName, sagValue " +
+                "FROM bm_measurement_data " +
+                "WHERE sagValue IS NOT NULL AND sagValue != '' " +
+                "GROUP BY wirePosition";
+        Cursor cursor = null;
+        List<MeasurementDataBean> dataList = new ArrayList<>();
+
+        try {
+            cursor = dbHelper.query(sql, new String[]{});
+            while (cursor.moveToNext()) {
+                MeasurementDataBean data = new MeasurementDataBean();
+                data.setWirePosition(cursor.getInt(cursor.getColumnIndex("wirePosition")));
+                data.setWirePositionName(cursor.getString(cursor.getColumnIndex("wirePositionName")));
+                data.setSagValue(cursor.getString(cursor.getColumnIndex("sagValue")));
+                dataList.add(data);
+            }
+        } catch (Exception e) {
+            Log.e("MeasurementDataDao", "Get wire position with sag value failed: " + e.toString());
+        } finally {
+            if (cursor != null) {
+                cursor.close();
+            }
+        }
+
+        return dataList;
+    }
+
+    /**
+     * 按照时间降序查询最后一条的雷达经纬度和高度
+     *
+     * @return 雷达数据对象（包含经度、纬度和高度），如果没有数据则返回 null
+     */
+    public MeasurementDataBean getLastRadarData() {
+        String sql = "SELECT radarLongitude, radarLatitude, radarElevation " +
+                "FROM bm_measurement_data " +
+                "ORDER BY time DESC " +
+                "LIMIT 1";
+        Cursor cursor = null;
+        MeasurementDataBean radarData = new MeasurementDataBean();
+
+        try {
+            cursor = dbHelper.query(sql, new String[]{});
+            if (cursor.moveToFirst()) {
+                radarData = new MeasurementDataBean();
+                radarData.setRadarLongitude(cursor.getDouble(cursor.getColumnIndex("radarLongitude")));
+                radarData.setRadarLatitude(cursor.getDouble(cursor.getColumnIndex("radarLatitude")));
+                radarData.setRadarElevation(cursor.getDouble(cursor.getColumnIndex("radarElevation")));
+            }
+        } catch (Exception e) {
+            Log.e("RadarDataDao", "Get last radar data failed: " + e.toString());
+        } finally {
+            if (cursor != null) {
+                cursor.close();
+            }
+        }
+
+        return radarData;
+    }
+
+    /**
+     * 根据 wirePosition 修改所有满足条件的数据的 sagValue 值
+     *
+     * @param wirePosition 导线位置
+     * @param sagValue     新的 sagValue 值
+     * @return 受影响的行数
+     */
+    public void updateSagValueByWirePosition(int wirePosition, String sagValue) {
+        String sql = "UPDATE bm_measurement_data SET sagValue = ? WHERE wirePosition = ?";
+        try {
+            this.dbHelper.execSQL(sql, new Object[]{sagValue, wirePosition});
+        } catch (Exception e) {
+            Log.e(TAG, "Update sag value by wire position failed: " + e.toString());
+            // 返回受影响行数为 0 表示失败
+        }
+    }
+
+    /**
+     * 清空测量数据表
+     */
+    public void clearTable() {
+        String sql = "DELETE FROM bm_measurement_data";
+        try {
+            this.dbHelper.execSQL(sql, new Object[]{});
+        } catch (Exception e) {
+            Log.e(TAG, "Clear table failed: " + e.toString());
+        }
+    }
+
+    /**
+     * 删除指定ID的记录
+     *
+     * @param id 主键ID
+     */
+    public void deleteById(int id) {
+        String sql = "DELETE FROM bm_measurement_data WHERE id = ?";
+        try {
+            this.dbHelper.execSQL(sql, new Object[]{id});
+        } catch (Exception e) {
+            Log.e(TAG, "Delete by ID failed: " + e.toString());
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bonus/wrjtest/entity/MeasurementDataBean.java b/app/src/main/java/com/bonus/wrjtest/entity/MeasurementDataBean.java
new file mode 100644
index 0000000..0d2b0f6
--- /dev/null
+++ b/app/src/main/java/com/bonus/wrjtest/entity/MeasurementDataBean.java
@@ -0,0 +1,263 @@
+package com.bonus.wrjtest.entity;
+
+public class MeasurementDataBean {
+
+    /**
+     * 主键ID，自增
+     */
+    private int id;
+
+    /**
+     * 分裂类型
+     */
+    private String splitType;
+
+    /**
+     * 档距
+     */
+    private double span;
+
+    /**
+     * 高差
+     */
+    private double h;
+
+    /**
+     * 回路类型（1表示单回路，2表示双回路）
+     */
+    private int loopType;
+
+    /**
+     * 导线位置编号（如1-左地线/光缆，2-右地线/光缆等）
+     */
+    private int wirePosition;
+
+    /**
+     * 导线位置描述（如"左地线/光缆"，"右相"等）
+     */
+    private String wirePositionName;
+
+    /**
+     * 横滚角（单位：度）
+     */
+    private double rollAngle;
+
+    /**
+     * 俯仰角（单位：度）
+     */
+    private double pitchAngle;
+
+    /**
+     * 方位角（单位：度）
+     */
+    private double yawAngle;
+
+    /**
+     * 雷达点经度（单位：度）
+     */
+    private double radarLongitude;
+
+    /**
+     * 雷达点纬度（单位：度）
+     */
+    private double radarLatitude;
+
+    /**
+     * 雷达点高程（单位：米）
+     */
+    private double radarElevation;
+
+    /**
+     * 1号线经纬度高程
+     */
+    private String wire1Data;
+
+
+    /**
+     * 2号线经纬度高程
+     */
+    private String wire2Data;
+
+    /**
+     * 3号线经纬度高程
+     */
+    private String wire3Data;
+
+    /**
+     * 4号线经纬度高程
+     */
+    private String wire4Data;
+
+
+    /**
+     * 弧垂值（单位：米）
+     */
+    private String sagValue;
+
+    /**
+     * 时间
+     */
+    private String time;
+
+    private int num;
+
+    public int getNum() {
+        return num;
+    }
+
+    public void setNum(int num) {
+        this.num = num;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public int getLoopType() {
+        return loopType;
+    }
+
+    public void setLoopType(int loopType) {
+        this.loopType = loopType;
+    }
+
+    public int getWirePosition() {
+        return wirePosition;
+    }
+
+    public void setWirePosition(int wirePosition) {
+        this.wirePosition = wirePosition;
+    }
+
+    public String getWirePositionName() {
+        return wirePositionName;
+    }
+
+    public void setWirePositionName(String wirePositionName) {
+        this.wirePositionName = wirePositionName;
+    }
+
+    public double getRollAngle() {
+        return rollAngle;
+    }
+
+    public void setRollAngle(double rollAngle) {
+        this.rollAngle = rollAngle;
+    }
+
+    public double getPitchAngle() {
+        return pitchAngle;
+    }
+
+    public void setPitchAngle(double pitchAngle) {
+        this.pitchAngle = pitchAngle;
+    }
+
+    public double getYawAngle() {
+        return yawAngle;
+    }
+
+    public void setYawAngle(double yawAngle) {
+        this.yawAngle = yawAngle;
+    }
+
+    public double getRadarLongitude() {
+        return radarLongitude;
+    }
+
+    public void setRadarLongitude(double radarLongitude) {
+        this.radarLongitude = radarLongitude;
+    }
+
+    public double getRadarLatitude() {
+        return radarLatitude;
+    }
+
+    public void setRadarLatitude(double radarLatitude) {
+        this.radarLatitude = radarLatitude;
+    }
+
+    public double getRadarElevation() {
+        return radarElevation;
+    }
+
+    public void setRadarElevation(double radarElevation) {
+        this.radarElevation = radarElevation;
+    }
+
+    public String getWire1Data() {
+        return wire1Data;
+    }
+
+    public void setWire1Data(String wire1Data) {
+        this.wire1Data = wire1Data;
+    }
+
+    public String getWire2Data() {
+        return wire2Data;
+    }
+
+    public void setWire2Data(String wire2Data) {
+        this.wire2Data = wire2Data;
+    }
+
+    public String getWire3Data() {
+        return wire3Data;
+    }
+
+    public void setWire3Data(String wire3Data) {
+        this.wire3Data = wire3Data;
+    }
+
+    public String getWire4Data() {
+        return wire4Data;
+    }
+
+    public void setWire4Data(String wire4Data) {
+        this.wire4Data = wire4Data;
+    }
+
+    public String getSagValue() {
+        return sagValue;
+    }
+
+    public void setSagValue(String sagValue) {
+        this.sagValue = sagValue;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+
+    public String getSplitType() {
+        return splitType;
+    }
+
+    public void setSplitType(String splitType) {
+        this.splitType = splitType;
+    }
+
+    public double getSpan() {
+        return span;
+    }
+
+    public void setSpan(double span) {
+        this.span = span;
+    }
+
+    public double getH() {
+        return h;
+    }
+
+    public void setH(double h) {
+        this.h = h;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bonus/wrjtest/utils/StringHelper.java b/app/src/main/java/com/bonus/wrjtest/utils/StringHelper.java
new file mode 100644
index 0000000..c14c656
--- /dev/null
+++ b/app/src/main/java/com/bonus/wrjtest/utils/StringHelper.java
@@ -0,0 +1,167 @@
+package com.bonus.wrjtest.utils;
+
+import android.util.Log;
+
+import java.math.BigDecimal;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.UUID;
+
+public class StringHelper {
+
+	public static boolean isEmpty(String str) {
+		if (str == null || str.trim().equals("") || str.trim().equals("null")) {
+			return true;
+		}
+		return false;
+	}
+	/**
+	 * 判断字符串 不为空
+	 */
+	public static boolean isEmptyAndOrder(String str) {
+		if (str == null || str.trim().equals("") || str.trim().equals("null") || str.trim().equals("-.--")) {
+			return true;
+		}
+		return false;
+	}
+
+	public static boolean isEmptyAndNull(String str) {
+		if (str == null || str.trim().equals("") || str.trim().equals("null")) {
+			return true;
+		}
+		return false;
+	}
+
+	public static String fillPrefixZero(int v, int len) {
+		String vStr = v + "";
+		while (vStr.length() < len) {
+			vStr = "0" + vStr;
+		}
+		return vStr;
+	}
+
+	/**
+	 * 获取32位uuid
+	 * @return
+	 */
+	public static String getUUID() {
+		String uuid = UUID.randomUUID().toString();  //转化为String对象
+		uuid = uuid.replace("-", "");
+		return uuid;
+	}
+	private static final char[] hexCode = "0123456789ABCDEF".toCharArray();
+
+	/**
+	 * md5加密
+	 * @param input
+	 * @return
+	 * @throws NoSuchAlgorithmException
+	 */
+	public static String md5(String input){
+		try {
+			byte[] bytes = MessageDigest.getInstance("MD5").digest(input.getBytes());
+			return printHexBinary(bytes);
+		}catch (NoSuchAlgorithmException e){
+			Log.e("StringHelper",e.toString());
+		}
+		return null;
+	}
+
+	public static String printHexBinary(byte[] data) {
+		StringBuilder r = new StringBuilder(data.length * 2);
+		for (byte b : data) {
+			r.append(hexCode[(b >> 4) & 0xF]);
+			r.append(hexCode[(b & 0xF)]);
+		}
+		return r.toString();
+	}
+
+	/**
+	 * String 转数字
+	 * @param
+	 * @return
+	 */
+	public static int strToInt(String str) {
+		if(isEmptyAndNull(str)){
+			return 0;
+		}else if("/".equals(str) || "\\".equals(str)){
+			return 0;
+		}else{
+			return Integer.parseInt(str);
+		}
+	}
+	public static double strToDouble(String str) {
+		if(isEmptyAndNull(str)){
+			return 0.0;
+		}else if("/".equals(str) || "\\".equals(str)){
+			return 0.0;
+		}else{
+			double parseDouble;
+			try{
+				parseDouble = Double.parseDouble(str);
+				return parseDouble;
+			}catch (Exception e){
+				return 0.0;
+			}
+		}
+	}
+
+	/**
+	 * 返回double型 保留两位
+	 */
+	public static Double roundDouble(double d) {
+		d = (double) Math.round(d * 100) / 100;
+		return d;
+	}
+
+	/**
+	 * 返回double型 保留两位
+	 */
+	public static int roundInt(double d) {
+		int i = Integer.parseInt(new java.text.DecimalFormat("0").format(d));
+		return i;
+	}
+
+	/**
+	 *
+	 * @param d 数据
+	 * @param i 1 四舍五入 2 五舍六入 3 直接舍去
+	 * @return
+	 */
+	public static Double roundDouble(double d,int i) {
+		BigDecimal b = new BigDecimal(d);
+		if(i == 1){
+			d = b.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+		}else if(i == 2){
+			d = b.setScale(2, BigDecimal.ROUND_HALF_DOWN).doubleValue();
+		}else if(i == 3){
+			d = b.setScale(2, BigDecimal.ROUND_UP).doubleValue();
+		}
+
+		return d;
+	}
+
+	/**
+	 * 保留有效数字
+	 *
+	 * @param f
+	 * @param size 保留几位
+	 * @return
+	 */
+	public static Double keepDouble(Double f, int size) {
+		/*1.先判断当前数据是否为0*/
+		int zeroRe = 0;
+		if (f == 0.0) {
+			zeroRe = 1;
+		}
+		switch (zeroRe) {
+			case 1: /*数据为0，直接将数据保留小数点后一位*/
+				return new BigDecimal(f).setScale(1, BigDecimal.ROUND_HALF_UP).doubleValue();
+			default: /*数据不为0，将数据保留至有效位数*/
+				return new BigDecimal(f).setScale(size, BigDecimal.ROUND_HALF_UP).doubleValue();
+		}
+
+	}
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v24/edittext_bg.xml b/app/src/main/res/drawable-v24/edittext_bg.xml
new file mode 100644
index 0000000..1b7dee4
--- /dev/null
+++ b/app/src/main/res/drawable-v24/edittext_bg.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="#FFFFFF" /> <!-- 白色背景 -->
+    <corners android:radius="4dp" /> <!-- 圆角 -->
+    <stroke
+        android:width="1dp"
+        android:color="#BDBDBD" /> <!-- 边框颜色 -->
+
+    <!-- 添加一点内边距 -->
+    <padding
+        android:left="4dp"
+        android:top="4dp"
+        android:right="4dp"
+        android:bottom="4dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/test.xml b/app/src/main/res/layout/test.xml
index b4bfa97..c9cc3b1 100644
--- a/app/src/main/res/layout/test.xml
+++ b/app/src/main/res/layout/test.xml
@@ -1,502 +1,872 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="horizontal"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
-
-    <!-- 左侧按钮布局 -->
-    <ScrollView
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
-
-        <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center">
-
-            <Button
-                    android:id="@+id/send1"
-                    android:layout_width="wrap_content"
-                    android:layout_height="40dp"
-                    android:textSize="12sp"
-                    android:text="1.基础数据"/>
-
-            <Button
-                    android:id="@+id/send2"
-                    android:layout_width="wrap_content"
-                    android:layout_height="40dp"
-                    android:textSize="12sp"
-                    android:text="2.开始测量"/>
-
-<!--            <Button-->
-<!--                    android:id="@+id/stop"-->
-<!--                    android:layout_width="wrap_content"-->
-<!--                    android:layout_height="40dp"-->
-<!--                    android:textSize="12sp"-->
-<!--                    android:text="停止测量"/>-->
-
-            <Button
-                    android:id="@+id/poll"
-                    android:layout_width="wrap_content"
-                    android:layout_height="40dp"
-                    android:textSize="12sp"
-                    android:text="3.保存数据"/>
-
-
-            <Button
-                    android:id="@+id/measure"
-                    android:layout_width="wrap_content"
-                    android:layout_height="40dp"
-                    android:textSize="12sp"
-                    android:text="4.计算弧垂"/>
-
-            <Button
-                    android:id="@+id/switchType"
-                    android:layout_width="wrap_content"
-                    android:layout_height="40dp"
-                    android:textSize="12sp"
-                    android:text="5.切换类型"/>
-
-            <Button
-                    android:id="@+id/switchMethod"
-                    android:layout_width="wrap_content"
-                    android:layout_height="40dp"
-                    android:textSize="12sp"
-                    android:text="6.测量位置"/>
-
-            <Button
-                    android:id="@+id/clear"
-                    android:layout_width="wrap_content"
-                    android:layout_height="40dp"
-                    android:textSize="12sp"
-                    android:text="7.清空数据"/>
-
-            <Button
-                    android:id="@+id/video"
-                    android:layout_width="wrap_content"
-                    android:layout_height="40dp"
-                    android:textSize="12sp"
-                    android:text="8.视频界面"/>
-
-
-        </LinearLayout>
-    </ScrollView>
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="#f5f5f5">
 
     <!-- 右侧 TextView 和 EditText 布局 -->
     <ScrollView
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="4.5">
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:padding="6dp">
 
         <LinearLayout
-                android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <!-- 第一行：1号线和2号线 -->
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-            <!-- 动态生成的 TextView 和 EditText 列表 -->
-            <LinearLayout
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
+                android:orientation="horizontal">
 
                 <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal">
-                    <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="1号线:"
-                            android:textSize="12sp"
-                            android:layout_gravity="center_vertical"/>
-
-                    <EditText
-                            android:id="@+id/radar1"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:textSize="12sp"
-                            android:inputType="text"/>
-
-                </LinearLayout>
-
-                <LinearLayout
-                        android:orientation="horizontal"
-                        android:layout_width="0dp"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content">
-
-                    <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="2号线:"
-                            android:textSize="12sp"
-                            android:layout_gravity="center_vertical"/>
-
-                    <EditText
-                            android:id="@+id/radar2"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:textSize="12sp"
-                            android:inputType="text"/>
-                </LinearLayout>
-
-
-
-            </LinearLayout>
-
-            <!-- 其余7对 TextView 和 EditText 同样方式创建，替换 Label 文字即可 -->
-            <!-- TextView 和 EditText 组合 -->
-
-
-            <LinearLayout
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal">
-
-                    <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="3号线:"
-                            android:textSize="12sp"
-                            android:layout_gravity="center_vertical"/>
-
-                    <EditText
-                            android:id="@+id/radar3"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:textSize="12sp"
-                            android:inputType="text"/>
-
-                </LinearLayout>
-
-                <LinearLayout
-                        android:orientation="horizontal"
-                        android:layout_width="0dp"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content">
-
-                    <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="4号线:"
-                            android:textSize="12sp"
-                            android:layout_gravity="center_vertical"/>
-
-                    <EditText
-                            android:id="@+id/radar4"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:textSize="12sp"
-                            android:inputType="text"/>
-                </LinearLayout>
-
-
-            </LinearLayout>
-
-
-
-            <LinearLayout
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    >
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="55dp"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:text="1号线:"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
+
+                    <TextView
+                        android:id="@+id/radar1"
+                        android:layout_width="0dp"
+                        android:layout_height="29dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/edittext_bg"
+                        android:inputType="text"
+                        android:padding="6dp"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="8dp"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="55dp"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:text="2号线:"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
+
+                    <TextView
+                        android:id="@+id/radar2"
+                        android:layout_width="0dp"
+                        android:layout_height="29dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/edittext_bg"
+                        android:inputType="text"
+                        android:padding="6dp"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
+                </LinearLayout>
+            </LinearLayout>
+
+            <!-- 第二行：3号线和4号线（与第一行严格对齐） -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="55dp"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:text="3号线:"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
+
+                    <TextView
+                        android:id="@+id/radar3"
+                        android:layout_width="0dp"
+                        android:layout_height="29dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/edittext_bg"
+                        android:inputType="text"
+                        android:padding="6dp"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="8dp"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="55dp"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:text="4号线:"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
+
+                    <TextView
+                        android:id="@+id/radar4"
+                        android:layout_width="0dp"
+                        android:layout_height="29dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/edittext_bg"
+                        android:inputType="text"
+                        android:padding="6dp"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
+                </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
+                android:orientation="horizontal">
 
                 <TextView
+                    android:layout_width="55dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:text="雷达位置:"
+                    android:textColor="#333333"
+                    android:textSize="11sp" />
+
+                <TextView
+                    android:id="@+id/gps"
+                    android:layout_width="0dp"
+                    android:layout_height="29dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/edittext_bg"
+                    android:inputType="text"
+                    android:padding="6dp"
+                    android:textColor="#333333"
+                    android:textSize="11sp" />
+            </LinearLayout>
+
+            <!-- 分裂类型选择 -->
+            <LinearLayout
+                android:id="@+id/linearLayoutSplitType"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewSplitTypeLabel"
+                    android:layout_width="55dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:text="分裂类型:"
+                    android:textColor="#333333"
+                    android:textSize="11sp" />
+
+                <RadioGroup
+                    android:id="@+id/radioGroupSplitType"
+                    android:layout_width="0dp"
+                    android:layout_height="29dp"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
+
+                    <RadioButton
+                        android:id="@+id/radioButtonSingleSplit"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="北斗定位:"
-                        android:textSize="12sp"
-                        android:layout_gravity="center_vertical"/>
+                        android:layout_marginRight="16dp"
+                        android:text="单分裂"
+                        android:checked="true"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
 
-                <EditText
-                        android:id="@+id/gps"
-                        android:layout_width="0dp"
+                    <RadioButton
+                        android:id="@+id/radioButtonDoubleSplit"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:textSize="12sp"
-                        android:inputType="text"/>
+                        android:layout_marginRight="16dp"
+                        android:text="双分裂"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
+
+                    <RadioButton
+                        android:id="@+id/radioButtonQuadSplit"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="四分裂"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
+                </RadioGroup>
+            </LinearLayout>
+
+            <!-- 回路类型选择 -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="55dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:text="回路类型:"
+                    android:textColor="#333333"
+                    android:textSize="11sp" />
+
+                <RadioGroup
+                    android:id="@+id/circuitTypeGroup"
+                    android:layout_width="0dp"
+                    android:layout_height="29dp"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
+
+                    <RadioButton
+                        android:id="@+id/singleCircuit"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="16dp"
+                        android:text="单回路"
+                        android:checked="true"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
+
+                    <RadioButton
+                        android:id="@+id/doubleCircuit"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="双回路"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
+                </RadioGroup>
+            </LinearLayout>
+
+            <!-- 单回路相别选项 (默认显示) -->
+            <LinearLayout
+                android:id="@+id/singleCircuitOptions"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
+                android:orientation="vertical"
+                android:visibility="visible">
+
+                <RadioGroup
+                    android:id="@+id/singlePhaseGroup"
+                    android:layout_width="match_parent"
+                    android:layout_height="29dp"
+                    android:orientation="horizontal">
+
+                    <RadioButton
+                        android:id="@+id/leftGroundWire"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="8dp"
+                        android:text="左地线/光缆"
+                        android:checked="true"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
+
+                    <RadioButton
+                        android:id="@+id/rightGroundWire"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="8dp"
+                        android:text="右地线/光缆"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
+
+                    <RadioButton
+                        android:id="@+id/leftPhase"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="8dp"
+                        android:text="左相"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
+
+                    <RadioButton
+                        android:id="@+id/middlePhase"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="8dp"
+                        android:text="中相"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
+
+                    <RadioButton
+                        android:id="@+id/rightPhase"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="右相"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
+                </RadioGroup>
+            </LinearLayout>
+
+            <!-- 双回路相别选项 (默认隐藏) -->
+            <LinearLayout
+                android:id="@+id/doubleCircuitOptions"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
+                android:orientation="vertical"
+                android:visibility="gone">
+
+                <RadioGroup
+                    android:id="@+id/doublePhaseGroup"
+                    android:layout_width="match_parent"
+                    android:layout_height="29dp"
+                    android:orientation="horizontal"
+                    android:paddingTop="4dp">
+
+                    <RadioButton
+                        android:id="@+id/dLeftGroundWire"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="8dp"
+                        android:text="左地线/光缆"
+                        android:checked="true"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
+
+                    <RadioButton
+                        android:id="@+id/dRightGroundWire"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="8dp"
+                        android:text="右地线/光缆"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
+
+                    <RadioButton
+                        android:id="@+id/leftTopPhase"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="8dp"
+                        android:text="左上相"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
+
+                    <RadioButton
+                        android:id="@+id/leftMiddlePhase"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="8dp"
+                        android:text="左中相"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
+
+                    <RadioButton
+                        android:id="@+id/leftBottomPhase"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="8dp"
+                        android:text="左下相"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
+                </RadioGroup>
+
+                <RadioGroup
+                    android:id="@+id/doubleBottomPhaseGroup"
+                    android:layout_width="match_parent"
+                    android:layout_height="29dp"
+                    android:orientation="horizontal"
+                    android:paddingTop="4dp">
+
+                    <RadioButton
+                        android:id="@+id/rightTopPhase"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="8dp"
+                        android:text="右上相"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
+
+                    <RadioButton
+                        android:id="@+id/rightMiddlePhase"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="8dp"
+                        android:text="右中相"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
+
+                    <RadioButton
+                        android:id="@+id/rightBottomPhase"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="右下相"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
+                </RadioGroup>
             </LinearLayout>
 
             <LinearLayout
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    >
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
+                android:orientation="horizontal">
 
                 <LinearLayout
-                    android:orientation="horizontal"
                     android:layout_width="0dp"
-                    android:layout_weight="1"
                     android:layout_height="wrap_content"
-                    >
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
 
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="55dp"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
                         android:text="定位模式:"
-                        android:textSize="12sp"
-                        android:layout_gravity="center_vertical"/>
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
 
-                    <EditText
+                    <TextView
                         android:id="@+id/gpsMode"
                         android:layout_width="0dp"
-                        android:layout_height="wrap_content"
+                        android:layout_height="29dp"
                         android:layout_weight="1"
-                        android:textSize="12sp"
-                        android:inputType="text"/>
+                        android:background="@drawable/edittext_bg"
+                        android:inputType="text"
+                        android:padding="6dp"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
                 </LinearLayout>
 
                 <LinearLayout
-                    android:orientation="horizontal"
                     android:layout_width="0dp"
-                    android:layout_weight="1"
                     android:layout_height="wrap_content"
-                    >
+                    android:layout_marginLeft="8dp"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
 
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="55dp"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
                         android:text="测量位置:"
-                        android:textSize="12sp"
-                        android:layout_gravity="center_vertical"/>
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
 
-                    <EditText
+                    <TextView
                         android:id="@+id/position"
                         android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:textSize="12sp"
+                        android:layout_height="29dp"
+                        android:layout_weight="0.8"
+                        android:background="@drawable/edittext_bg"
+                        android:padding="6dp"
                         android:text="大号在右"
-                        android:inputType="none"
-                        android:focusable="false"
-                        android:clickable="false"/>
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
                 </LinearLayout>
 
-
-            </LinearLayout>
-
-
-
-
-            <LinearLayout
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    >
-
                 <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content">
-                    <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="俯仰角:"
-                            android:textSize="12sp"
-                            android:layout_gravity="center_vertical"/>
-
-                    <EditText
-                            android:id="@+id/pitchAngle"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:textSize="12sp"
-                            android:inputType="text"/>
-            </LinearLayout>
-
-                <LinearLayout
-                        android:orientation="horizontal"
-                        android:layout_width="0dp"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content"
-                >
-
-                    <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="横滚角:"
-                            android:textSize="12sp"
-                            android:layout_gravity="center_vertical"/>
-
-                    <EditText
-                            android:id="@+id/rollAngle"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:textSize="12sp"
-                            android:inputType="text"/>
-                </LinearLayout>
-
-
-            </LinearLayout>
-
-
-            <LinearLayout
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    >
-
-                <LinearLayout
-                    android:orientation="horizontal"
                     android:layout_width="0dp"
-                    android:layout_weight="1"
                     android:layout_height="wrap_content"
-                    >
+                    android:layout_marginLeft="8dp"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
 
                     <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="航向角:"
-                        android:textSize="12sp"
-                        android:layout_gravity="center_vertical"/>
-
-                    <EditText
-                        android:id="@+id/azimuthAngle"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:textSize="12sp"
-                        android:inputType="text"/>
-                </LinearLayout>
-
-                <LinearLayout
-                    android:orientation="horizontal"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="wrap_content"
-                    >
-
-                    <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="40dp"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
                         android:text="档距:"
-                        android:textSize="12sp"
-                        android:layout_gravity="center_vertical"/>
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
 
                     <EditText
                         android:id="@+id/span"
                         android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:textSize="12sp"
+                        android:layout_height="29dp"
+                        android:layout_weight="0.8"
+                        android:background="@drawable/edittext_bg"
+                        android:inputType="text"
+                        android:padding="6dp"
                         android:text="48.209"
-                        android:inputType="text"/>
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="8dp"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="75dp"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:text="与上测点距离:"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
+
+                    <TextView
+                        android:id="@+id/distance"
+                        android:layout_width="0dp"
+                        android:layout_height="29dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/edittext_bg"
+                        android:inputType="text"
+                        android:padding="6dp"
+                        android:text=""
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
                 </LinearLayout>
             </LinearLayout>
 
-
-
-
             <LinearLayout
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-            >
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
 
-                <TextView
-                        android:layout_width="wrap_content"
+                    <TextView
+                        android:layout_width="55dp"
                         android:layout_height="wrap_content"
-                        android:text="数据返回状态:"
-                        android:textSize="12sp"
-                        android:layout_gravity="center_vertical"/>
+                        android:layout_gravity="center_vertical"
+                        android:text="俯仰角:"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
 
-                <EditText
-                        android:id="@+id/return_data"
+                    <TextView
+                        android:id="@+id/pitchAngle"
                         android:layout_width="0dp"
-                        android:layout_height="wrap_content"
+                        android:layout_height="29dp"
                         android:layout_weight="1"
-                        android:textSize="12sp"
-                        android:inputType="text"/>
+                        android:background="@drawable/edittext_bg"
+                        android:inputType="text"
+                        android:padding="6dp"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="8dp"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="55dp"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:text="横滚角:"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
+
+                    <TextView
+                        android:id="@+id/rollAngle"
+                        android:layout_width="0dp"
+                        android:layout_height="29dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/edittext_bg"
+                        android:inputType="text"
+                        android:padding="6dp"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="8dp"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="40dp"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:text="航向角:"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
+
+                    <TextView
+                        android:id="@+id/azimuthAngle"
+                        android:layout_width="0dp"
+                        android:layout_height="29dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/edittext_bg"
+                        android:inputType="text"
+                        android:padding="6dp"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="8dp"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="75dp"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:text="与上测点高差:"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
+
+                    <TextView
+                        android:id="@+id/height"
+                        android:layout_width="0dp"
+                        android:layout_height="29dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/edittext_bg"
+                        android:inputType="text"
+                        android:padding="6dp"
+                        android:text=""
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
+                </LinearLayout>
             </LinearLayout>
 
             <LinearLayout
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    >
+                    android:layout_weight="1"
+                    android:visibility="gone"
+                    android:orientation="horizontal">
 
-                <TextView
-                        android:layout_width="wrap_content"
+                    <TextView
+                        android:layout_width="55dp"
                         android:layout_height="wrap_content"
-                        android:text="弧垂:"
-                        android:textSize="12sp"
-                        android:layout_gravity="center_vertical"/>
+                        android:layout_gravity="center_vertical"
+                        android:text="数据状态:"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
 
-                <EditText
+                    <EditText
+                        android:id="@+id/return_data"
+                        android:layout_width="0dp"
+                        android:layout_height="29dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/edittext_bg"
+                        android:inputType="text"
+                        android:padding="6dp"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="8dp"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="50dp"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:text="弧垂:"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
+
+                    <TextView
                         android:id="@+id/sag"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:textSize="12sp"
-                        android:inputType="text"/>
+                        android:background="@drawable/edittext_bg"
+                        android:inputType="textMultiLine"
+                        android:maxLines="10"
+                        android:padding="6dp"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
+                </LinearLayout>
             </LinearLayout>
 
-            <!-- 动态生成的 TextView 和 EditText 列表 -->
             <LinearLayout
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:visibility="gone">
 
                 <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_weight="1"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="55dp"
                         android:layout_height="wrap_content"
-                        android:orientation="horizontal">
-                    <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="水平角:"
-                            android:textSize="12sp"
-                            android:layout_gravity="center_vertical"/>
+                        android:layout_gravity="center_vertical"
+                        android:text="水平角:"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
 
                     <EditText
-                            android:id="@+id/hAngle"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:textSize="12sp"
-                            android:inputType="text"/>
-
+                        android:id="@+id/hAngle"
+                        android:layout_width="0dp"
+                        android:layout_height="29dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/edittext_bg"
+                        android:inputType="text"
+                        android:padding="6dp"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
                 </LinearLayout>
 
                 <LinearLayout
-                        android:orientation="horizontal"
-                        android:layout_width="0dp"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content">
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="8dp"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
 
                     <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="垂直角:"
-                            android:textSize="12sp"
-                            android:layout_gravity="center_vertical"/>
+                        android:layout_width="50dp"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:text="垂直角:"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
 
                     <EditText
-                            android:id="@+id/vAngle"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:textSize="12sp"
-                            android:inputType="text"/>
+                        android:id="@+id/vAngle"
+                        android:layout_width="0dp"
+                        android:layout_height="29dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/edittext_bg"
+                        android:inputType="text"
+                        android:padding="6dp"
+                        android:textColor="#333333"
+                        android:textSize="11sp" />
                 </LinearLayout>
-
             </LinearLayout>
-
         </LinearLayout>
     </ScrollView>
-</LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <Button
+                android:id="@+id/send1"
+                android:layout_width="0dp"
+                android:layout_height="40dp"
+                android:layout_marginLeft="2dp"
+                android:layout_marginRight="2dp"
+                android:layout_weight="0.85"
+                android:text="保存配置"
+                android:textSize="9sp" />
+
+            <Button
+                android:id="@+id/send2"
+                android:layout_width="0dp"
+                android:layout_height="40dp"
+                android:layout_marginLeft="2dp"
+                android:layout_marginRight="2dp"
+                android:layout_weight="0.85"
+                android:text="开始测量"
+                android:textSize="9sp" />
+
+            <Button
+                android:id="@+id/poll"
+                android:layout_width="0dp"
+                android:layout_height="40dp"
+                android:layout_marginLeft="2dp"
+                android:layout_marginRight="2dp"
+                android:layout_weight="0.85"
+                android:text="保存数据"
+                android:textSize="9sp" />
+
+            <Button
+                android:id="@+id/measure"
+                android:layout_width="0dp"
+                android:layout_height="40dp"
+                android:layout_marginLeft="3dp"
+                android:layout_marginRight="3dp"
+                android:layout_weight="0.85"
+                android:text="计算弧垂"
+                android:textSize="9sp" />
+
+            <Button
+                android:id="@+id/clear"
+                android:layout_width="0dp"
+                android:layout_height="40dp"
+                android:layout_marginLeft="2dp"
+                android:layout_marginRight="2dp"
+                android:layout_weight="0.85"
+                android:text="清空数据"
+                android:textSize="9sp" />
+
+            <Button
+                android:id="@+id/video"
+                android:layout_width="0dp"
+                android:layout_height="40dp"
+                android:layout_marginLeft="2dp"
+                android:layout_marginRight="2dp"
+                android:layout_weight="0.65"
+                android:text="视频"
+                android:textSize="9sp" />
+
+            <Button
+                android:id="@+id/measureDistance"
+                android:layout_width="0dp"
+                android:layout_height="40dp"
+                android:layout_marginLeft="2dp"
+                android:layout_marginRight="2dp"
+                android:layout_weight="0.65"
+                android:text="测距"
+                android:textSize="9sp" />
+
+            <Button
+                android:id="@+id/record"
+                android:layout_width="0dp"
+                android:layout_height="40dp"
+                android:layout_marginLeft="2dp"
+                android:layout_marginRight="2dp"
+                android:layout_weight="0.65"
+                android:text="记录"
+                android:textSize="9sp" />
+
+
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file