Ver código fonte

打印调整

lvjincheng 3 anos atrás
pai
commit
9655c491be

+ 2 - 1
Assets/BowArrow/Scripts/Bluetooth/BluetoothAim.cs

@@ -229,6 +229,7 @@ public class BluetoothAim : MonoBehaviour
             };
             bluetoothHelper.OnCharacteristicChanged += (helper, value, characteristic) =>
             {
+                if (status != BluetoothStatusEnum.ConnectSuccess) return;
                 // logger.Log(String.Join(",", value));
                 if (!hasData) {
                     hasDataTime = JCUnityLib.TimeUtils.GetTimestamp();
@@ -559,7 +560,7 @@ public class BluetoothAim : MonoBehaviour
             LoginMgr.myUserInfo.mac = mac;
             UserComp.Instance.saveMac();
         } else {
-            SideTipView.ShowTip("Mac获取失败" + mac, Color.yellow);
+            SideTipView.ShowTip("Mac获取失败", Color.yellow);
         }
     }
 

+ 10 - 4
Assets/BowArrow/Scripts/Bluetooth/New/Axis9Handler.cs

@@ -108,8 +108,16 @@ public class Axis9Handler : AxisBaseHandler
             string record = attitudeJson.Stringify(_9Axis.Attitude);
             if (!string.IsNullOrEmpty(record))
             {
-                SideTipView.ShowTip($"九轴数据序列化完成(长度{record.Length})", Color.white);
+                SideTipView.ShowTip($"九轴数据序列化完成(长度{record.Length})\nGyrMeanLen:{_9Axis.Attitude.GyrCalibrater.Mean.Length}\nMagVariance:{_9Axis.Attitude.MagCalibrater.Variance}", Color.white);
                 Debug.Log("9轴数据序列化成功");
+                if (!IsGyrCompleted()) {
+                    SideTipView.ShowTip("陀螺仪未校准,因校准数据不完整无法上传!", Color.yellow);
+                    return;
+                }
+                if (!IsMagCompleted()) {
+                    SideTipView.ShowTip("地磁计未校准,因校准数据不完整无法上传!", Color.yellow);
+                    return;
+                }
                 UserComp.Instance.saveCalibrateRecord(record);
                 SideTipView.ShowTip("正在上传九轴数据", Color.white);
             }
@@ -128,9 +136,7 @@ public class Axis9Handler : AxisBaseHandler
             SideTipView.ShowTip($"成功加载服务端的九轴数据(长度{record.Length})", Color.white);
             _9Axis.Attitude = attitudeJson.Parse<o0.IMU._9AxisPreProcessor>(record);
             Debug.Log("9轴反序列化完成");
-            SideTipView.ShowTip("九轴数据恢复成功", Color.white);
-            SideTipView.ShowTip($"GyrMeanLen:{_9Axis.Attitude.GyrCalibrater.Mean.Length}", Color.white);
-            SideTipView.ShowTip($"MagVariance:{_9Axis.Attitude.MagCalibrater.Variance}", Color.white);
+            SideTipView.ShowTip($"九轴数据恢复成功\nGyrMeanLen:{_9Axis.Attitude.GyrCalibrater.Mean.Length}\nMagVariance:{_9Axis.Attitude.MagCalibrater.Variance}", Color.white);
             PrintAxisInfo();
             if (!IsAxisRight())
             {