Răsfoiți Sursa

完善sdk部分日志打印信息优化部分流程

slambb 1 lună în urmă
părinte
comite
767ce41078

+ 9 - 5
SmartBowSDK/BleWinHelper.cs

@@ -161,7 +161,11 @@ namespace SmartBowSDK
                             if (smartBowHelper.GetIsConnectName())
                             {
                                 //后续匹配名字 可以是多个设备
-                                Log($"发现设备{res.name},is fileters empty:{ string.IsNullOrEmpty(smartBowHelper.GetFilters())},name:{smartBowHelper.GetFilters()}");
+                                string _filters = string.IsNullOrEmpty(smartBowHelper.GetFilters())
+                              ? bluetoothAim.deviceConfig.deviceName
+                              : smartBowHelper.GetFilters();
+                                //如果有定制执行定制
+                                Log($"发现设备{res.name},is fileters empty:{ string.IsNullOrEmpty(smartBowHelper.GetFilters())},current filters:{smartBowHelper.GetFilters()}");
                             }
                             else
                             {
@@ -200,7 +204,7 @@ namespace SmartBowSDK
                                 {
                                     selectedDeviceId = res.id;
                                     StopDeviceScan();
-                                    Log($"Name匹配设备 {trimmedFilter}");
+                                    Log($"匹配设备名:{trimmedFilter}");
                                     break;
                                 }
                             }
@@ -220,7 +224,7 @@ namespace SmartBowSDK
                             {
                                 selectedDeviceId = res.id;
                                 StopDeviceScan();
-                                Log($"MAC匹配设备 {searchMac}");
+                                Log($"匹配设备 MAC:{searchMac}");
                             }
                         }
 
@@ -259,7 +263,7 @@ namespace SmartBowSDK
                     status = BleApi.PollCharacteristic(out res, false);
                     if (status == BleApi.ScanStatus.AVAILABLE)
                     {
-                        Log("res.userDescription:"+ res.userDescription+ ",res.uuid:" + res.uuid);
+                       // Log("res.userDescription:"+ res.userDescription+ ",res.uuid:" + res.uuid);
                         if (res.userDescription == "no description available" ||  //旧设备
                             res.userDescription == "SPP Write Channel" ||   //新设备
                             res.userDescription == "SPP Read Channel")
@@ -466,7 +470,7 @@ namespace SmartBowSDK
                 data.buf[i] = payload[i];
             // no error code available in non-blocking mode
             BleApi.SendData(in data, false);
-            Log("Write(" + text + ")");
+            //Log("Write(" + text + ")");
             return true;
         }
 

+ 1 - 1
SmartBowSDK/BluetoothAim_SDK.cs

@@ -371,10 +371,10 @@ namespace SmartBowSDK
             {
                 if (isConnectName)
                 {
-                    SmartBowLogger.Log(this, $"发现设备{device.DeviceName},is fileters empty:{ string.IsNullOrEmpty(filters)},name:{filters}");
                     //if (device.DeviceName == deviceConfig.deviceName)
                     //后续匹配名字 可以是多个设备
                     string _filters = string.IsNullOrEmpty(filters) ? deviceConfig.deviceName : filters;
+                    SmartBowLogger.Log(this, $"发现设备{device.DeviceName},is fileters empty:{ string.IsNullOrEmpty(filters)},current filters:{_filters}");
                     //if (_filters.Contains(device.DeviceName))
                     //{
                     //    _bluetoothHelper.setDeviceName(device.DeviceName);

+ 1 - 1
SmartBowSDK/o09AxisAfterXiaMenFromDll_SDK.cs

@@ -120,7 +120,7 @@ namespace o0.Bow
             }
 
             this.ShakeFrame = ShakeFrame;
-            Debug.Log("OnShot");/**/
+            Debug.Log("NotifyAxisOnShot");/**/
         }
         //public double diff = 0.001;
         public double diff = 0.0001;