From 69d4805ca6913cff425b5480a2f1b5ffb74427f6 Mon Sep 17 00:00:00 2001 From: "DESKTOP-B25GA9E\\W35" <1733709035@qq.com> Date: Mon, 6 Mar 2023 13:42:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=83=A8=E5=88=86=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/{DataClass.meta => DyExample.meta} | 0 .../BluetoothGateway.cs | 0 .../BluetoothGateway.cs.meta | 0 .../HttpServerExample.unity | 0 .../HttpServerExample.unity.meta | 0 .../Example/Scenes/BluetoothExample.unity | 298 ------------------ .../Scenes/BluetoothExample.unity.meta | 7 - .../Example/Script/HttpServerExample.cs | 2 +- .../src/ProtocolRulesExtention.cs | 16 +- 9 files changed, 14 insertions(+), 309 deletions(-) rename Assets/{DataClass.meta => DyExample.meta} (100%) rename Assets/{DataClass => DyExample}/BluetoothGateway.cs (100%) rename Assets/{DataClass => DyExample}/BluetoothGateway.cs.meta (100%) rename Assets/{MsgTransmitTools/Example/Scenes => DyExample}/HttpServerExample.unity (100%) rename Assets/{MsgTransmitTools/Example/Scenes => DyExample}/HttpServerExample.unity.meta (100%) delete mode 100644 Assets/MsgTransmitTools/Example/Scenes/BluetoothExample.unity delete mode 100644 Assets/MsgTransmitTools/Example/Scenes/BluetoothExample.unity.meta diff --git a/Assets/DataClass.meta b/Assets/DyExample.meta similarity index 100% rename from Assets/DataClass.meta rename to Assets/DyExample.meta diff --git a/Assets/DataClass/BluetoothGateway.cs b/Assets/DyExample/BluetoothGateway.cs similarity index 100% rename from Assets/DataClass/BluetoothGateway.cs rename to Assets/DyExample/BluetoothGateway.cs diff --git a/Assets/DataClass/BluetoothGateway.cs.meta b/Assets/DyExample/BluetoothGateway.cs.meta similarity index 100% rename from Assets/DataClass/BluetoothGateway.cs.meta rename to Assets/DyExample/BluetoothGateway.cs.meta diff --git a/Assets/MsgTransmitTools/Example/Scenes/HttpServerExample.unity b/Assets/DyExample/HttpServerExample.unity similarity index 100% rename from Assets/MsgTransmitTools/Example/Scenes/HttpServerExample.unity rename to Assets/DyExample/HttpServerExample.unity diff --git a/Assets/MsgTransmitTools/Example/Scenes/HttpServerExample.unity.meta b/Assets/DyExample/HttpServerExample.unity.meta similarity index 100% rename from Assets/MsgTransmitTools/Example/Scenes/HttpServerExample.unity.meta rename to Assets/DyExample/HttpServerExample.unity.meta diff --git a/Assets/MsgTransmitTools/Example/Scenes/BluetoothExample.unity b/Assets/MsgTransmitTools/Example/Scenes/BluetoothExample.unity deleted file mode 100644 index 46c7f96..0000000 --- a/Assets/MsgTransmitTools/Example/Scenes/BluetoothExample.unity +++ /dev/null @@ -1,298 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!29 &1 -OcclusionCullingSettings: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_OcclusionBakeSettings: - smallestOccluder: 5 - smallestHole: 0.25 - backfaceThreshold: 100 - m_SceneGUID: 00000000000000000000000000000000 - m_OcclusionCullingData: {fileID: 0} ---- !u!104 &2 -RenderSettings: - m_ObjectHideFlags: 0 - serializedVersion: 9 - m_Fog: 0 - m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - m_FogMode: 3 - m_FogDensity: 0.01 - m_LinearFogStart: 0 - m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} - m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} - m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} - m_AmbientIntensity: 1 - m_AmbientMode: 0 - m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} - m_HaloStrength: 0.5 - m_FlareStrength: 1 - m_FlareFadeSpeed: 3 - m_HaloTexture: {fileID: 0} - m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} - m_DefaultReflectionMode: 0 - m_DefaultReflectionResolution: 128 - m_ReflectionBounces: 1 - m_ReflectionIntensity: 1 - m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} - m_UseRadianceAmbientProbe: 0 ---- !u!157 &3 -LightmapSettings: - m_ObjectHideFlags: 0 - serializedVersion: 11 - m_GIWorkflowMode: 1 - m_GISettings: - serializedVersion: 2 - m_BounceScale: 1 - m_IndirectOutputScale: 1 - m_AlbedoBoost: 1 - m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 1 - m_EnableRealtimeLightmaps: 0 - m_LightmapEditorSettings: - serializedVersion: 12 - m_Resolution: 2 - m_BakeResolution: 40 - m_AtlasSize: 1024 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 0 - m_ExtractAmbientOcclusion: 0 - m_Padding: 2 - m_LightmapParameters: {fileID: 0} - m_LightmapsBakeMode: 1 - m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 - m_ReflectionCompression: 2 - m_MixedBakeMode: 2 - m_BakeBackend: 1 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 512 - m_PVRBounces: 2 - m_PVREnvironmentSampleCount: 256 - m_PVREnvironmentReferencePointCount: 2048 - m_PVRFilteringMode: 1 - m_PVRDenoiserTypeDirect: 1 - m_PVRDenoiserTypeIndirect: 1 - m_PVRDenoiserTypeAO: 1 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVREnvironmentMIS: 1 - m_PVRCulling: 1 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ExportTrainingData: 0 - m_TrainingDataDestination: TrainingData - m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 ---- !u!196 &4 -NavMeshSettings: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_BuildSettings: - serializedVersion: 2 - agentTypeID: 0 - agentRadius: 0.5 - agentHeight: 2 - agentSlope: 45 - agentClimb: 0.4 - ledgeDropHeight: 0 - maxJumpAcrossDistance: 0 - minRegionArea: 2 - manualCellSize: 0 - cellSize: 0.16666667 - manualTileSize: 0 - tileSize: 256 - accuratePlacement: 0 - debug: - m_Flags: 0 - m_NavMeshData: {fileID: 0} ---- !u!1 &869775610 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 869775612} - - component: {fileID: 869775611} - m_Layer: 0 - m_Name: Directional Light - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!108 &869775611 -Light: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 869775610} - m_Enabled: 1 - serializedVersion: 10 - m_Type: 1 - m_Shape: 0 - m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} - m_Intensity: 1 - m_Range: 10 - m_SpotAngle: 30 - m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 - m_Shadows: - m_Type: 2 - m_Resolution: -1 - m_CustomResolution: -1 - m_Strength: 1 - m_Bias: 0.05 - m_NormalBias: 0.4 - m_NearPlane: 0.2 - m_CullingMatrixOverride: - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_UseCullingMatrixOverride: 0 - m_Cookie: {fileID: 0} - m_DrawHalo: 0 - m_Flare: {fileID: 0} - m_RenderMode: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingLayerMask: 1 - m_Lightmapping: 4 - m_LightShadowCasterMode: 0 - m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 1 - m_ColorTemperature: 6570 - m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} - m_UseBoundingSphereOverride: 0 - m_ShadowRadius: 0 - m_ShadowAngle: 0 ---- !u!4 &869775612 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 869775610} - m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} - m_LocalPosition: {x: 0, y: 3, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1 &1737617990 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1737617993} - - component: {fileID: 1737617992} - - component: {fileID: 1737617991} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &1737617991 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1737617990} - m_Enabled: 1 ---- !u!20 &1737617992 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1737617990} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &1737617993 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1737617990} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/MsgTransmitTools/Example/Scenes/BluetoothExample.unity.meta b/Assets/MsgTransmitTools/Example/Scenes/BluetoothExample.unity.meta deleted file mode 100644 index 5b3fcab..0000000 --- a/Assets/MsgTransmitTools/Example/Scenes/BluetoothExample.unity.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: d000104a028ff4d4db87a75d5df5babf -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MsgTransmitTools/Example/Script/HttpServerExample.cs b/Assets/MsgTransmitTools/Example/Script/HttpServerExample.cs index 9b41ebd..10b759a 100644 --- a/Assets/MsgTransmitTools/Example/Script/HttpServerExample.cs +++ b/Assets/MsgTransmitTools/Example/Script/HttpServerExample.cs @@ -11,7 +11,7 @@ public class HttpServerExample : MonoBehaviour,IHttpServer //接收指定数据后回调 this.RegisterMessageEvent(e => { string watchData = "myWatchData:"; - byte[] result = e.findDataByMac("535708030130").toByteArray(); + byte[] result = e.findDataByMac("535708030130").toByteArrayByHex(); watchData += "\nHeartRate："+ result[result.Length - 5] + "\nBloodOxygen:"+ result[result.Length - 4] + "\nBodyTempreture:"+ (result[result.Length - 2]+ result[result.Length - 3]*256) + "\nSos:"+ result[result.Length - 1]; Debug.Log(watchData); }); diff --git a/Assets/MsgTransmitTools/src/ProtocolRulesExtention.cs b/Assets/MsgTransmitTools/src/ProtocolRulesExtention.cs index 27c8e4d..8267f89 100644 --- a/Assets/MsgTransmitTools/src/ProtocolRulesExtention.cs +++ b/Assets/MsgTransmitTools/src/ProtocolRulesExtention.cs @@ -9,13 +9,13 @@ namespace JXSoft { public static class ProtocolRulesExtention { /// - /// 根据Byte类型数据获取对应的值。 + /// Hex数据（字符串）转Byte数组，用于Hex类通讯协议 /// - /// 只能包含A-F，0-9 + /// 只能包含A-F，0-9,hex /// 起始位置 /// 长度 /// - public static byte[] toByteArray(this string self) { + public static byte[] toByteArrayByHex(this string self) { int hexlen = self.Length; byte[] result; if (hexlen % 2 == 1) @@ -38,5 +38,15 @@ namespace JXSoft { } return result; } + + /// + /// Json数据转对象 + /// + /// 数据类型 + /// + /// + public static TObject toObjectByJson(this string self) { + return JsonMapper.ToObject(self); + } } }