From cdccd786024625e914bc636dae1a3aaa11282590 Mon Sep 17 00:00:00 2001 From: lishuo Date: Tue, 31 Aug 2021 16:27:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E8=BF=9E=E6=8E=A5=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/Images/Devices/Mobile.meta | 8 + .../Images/Devices/Mobile/已连接.png | Bin 0 -> 1219 bytes .../Images/Devices/Mobile/已连接.png.meta | 128 ++ .../Resources/Images/Devices/Mobile/搜索.png | Bin 0 -> 954 bytes .../Images/Devices/Mobile/搜索.png.meta | 128 ++ .../Images/Devices/Mobile/未连接.png | Bin 0 -> 1334 bytes .../Images/Devices/Mobile/未连接.png.meta | 128 ++ .../Device/Mobile/ConnectDeviceModal.prefab | 58 +- .../UI/Prefab/Panel/Mobile/DevicePanel.prefab | 1803 ++++++++++++----- Assets/Scripts/Devices/MainDeviceAdapter.cs | 4 +- Assets/Scripts/UI/Prefab/Device/DeviceView.cs | 14 + 11 files changed, 1754 insertions(+), 517 deletions(-) create mode 100644 Assets/Resources/Images/Devices/Mobile.meta create mode 100644 Assets/Resources/Images/Devices/Mobile/已连接.png create mode 100644 Assets/Resources/Images/Devices/Mobile/已连接.png.meta create mode 100644 Assets/Resources/Images/Devices/Mobile/搜索.png create mode 100644 Assets/Resources/Images/Devices/Mobile/搜索.png.meta create mode 100644 Assets/Resources/Images/Devices/Mobile/未连接.png create mode 100644 Assets/Resources/Images/Devices/Mobile/未连接.png.meta diff --git a/Assets/Resources/Images/Devices/Mobile.meta b/Assets/Resources/Images/Devices/Mobile.meta new file mode 100644 index 00000000..d3783f69 --- /dev/null +++ b/Assets/Resources/Images/Devices/Mobile.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4a45086f0adfd5a4a9c2a60543866ea4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Images/Devices/Mobile/已连接.png b/Assets/Resources/Images/Devices/Mobile/已连接.png new file mode 100644 index 0000000000000000000000000000000000000000..ed8f91bd22d4d0c0e94300d7638c69fd85580c2c GIT binary patch literal 1219 zcmV;!1U&nRP)DL;L}1 zBuFHPXcGeu8jT4Lw`d!+eKA2yG#XiW({h5Y z*TBpK)sRI%PJ_nt=DOqN{XjPQ#?)GiNo zep0wn1QWeci?O9$-Ja4PUp1I9${RMej7?)ZzzI)i1gzB_2>#nYWlN59t~WLY!2eB)+}uX-I`&wijR1^M!7pk`LMBp4Vh=lR;ZyO=RIU>5$Jj(gy+ z+i2-LsNKhas+ksy>gPaxbsX+f?3j_i{3T;9^nqVNX$f)14M2Gsdf$mcb3CRJj)bm{ zaKowh);_4gVTk3|L2i8z@D%j<9Mqm;aG&Gy^0*yD$lHFva_Hu`S%W2~>>#5T;XbX?&vG)41DBQ&<<#7i#}W(EKXiP#bU!r$1+;-1?BsPJMC&ZaXJbJfAFVBA{r! z&9AdVLvYvgVpmPU*2M zoD3FN;nSLIHRWMyQofpj`_eABYqtTTmjbQCebjeN>Ub$cQ8`+OonH^Kst0;@=`*U98bl!{9wnw;~eGl)`eh`D1j5h8qMg~im zXF*g!_n)>br|tHr2#^ADQwC1UGCMX++k0^*yd8%@mE~|Y+!tSSnPae=4Rv=l@_b35 zmOgqGB6AC9#r2>WDK3li0K1qLbKz&3AR6aG^A(g|$1yW9Cet@Hw?1#nUf|-m)g(hedM6KE=mX#7g1ulYCQJPSx`RD;AW*-`=ev({?tcglqPE|NnemU86RC2gsFx^-^#}b*`Jj*!YWd3Kp$*}`G_72&gQPlxMbid?_>#RM?F%6+PM&8*9ibv2PK3*~jBFDO; za*RtYSl?-^NX_?hHfr3`36dNS&+!saX$~l3H8AamdOr&J=q+SRC*N0O(Ra#R-nrCw z$J6dSc+Z!CQWF+HdPphR5XIS$`wL)QdywgkE=!9Xin5z}WBzuM- z?{q+Q4FgGWprR~zDtCaARzZ#b#B9Y)VB(ikm>?bX(o9j^q+?O9iAT)6lX@o!@ZWBS z|4JKR$slJvOizOM+F^*?G|09dSk)mV7mC$0ejJ1&nKpV(>@;M&GeW9xF380wp%a8fHnoTEEC{T6N1$GOG8$2u8)R`Fx)LHY*?6dKeP(oY+wzIy%5y?*2mNcm~o zTGyZyjs^!`&NzhhSwE~Z&0%4P&?va!39~Fiq23I^I^6^{I05;j+c5%j{r4ZR;8u>i zE5{{8QOO+4W$JLQl_Osi<1Y$DzCgQZ7k+GcO^wdQ6(A+wTRQ cO1ApH0kRBUBukhc1^@s607*qoM6N<$f|f#_J^%m! literal 0 HcmV?d00001 diff --git a/Assets/Resources/Images/Devices/Mobile/搜索.png.meta b/Assets/Resources/Images/Devices/Mobile/搜索.png.meta new file mode 100644 index 00000000..bd084e13 --- /dev/null +++ b/Assets/Resources/Images/Devices/Mobile/搜索.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: a38e5e467140caa4d9bd38fd08291bf7 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Images/Devices/Mobile/未连接.png b/Assets/Resources/Images/Devices/Mobile/未连接.png new file mode 100644 index 0000000000000000000000000000000000000000..019fddd61d49335be36f8aea567982b178b7215c GIT binary patch literal 1334 zcmV-61ef zlW9zZ&7~A@r6lOosL{LK;FXt4OuXUFnBD2!{(xP0q0^h;_-LDF*48oRCsg)b}{O3KL{5xHk8+XQn7BI!?8tv8fR@s}0Fy z0+DDGw{PD;B9X{{O*+%|Hha5PTKeMq#K2GUJ&x8`EEagqpGRwJD@se5yaHyk1(lVR za5x;;ipLSBpKjSUHxj>V%`J{E$nc8JC`C;(;nmZp<(mtUmO2I)@On{EQGxaK2*$?8 zF+Dwvxj9afKwX_34Gj%gTwK83o~|ks>}gHS&Mzrar4e9PS0_3;PNBB82BA<0B_$;i zj6uWUFoBI>dwW}MO{G#;U0sD{(okPtkAi{%EH5wX!YV~77qw2C6=!B<5R1iNx7#U& zZ^(39fvvX3euCB__v%pxU<2uOB&JM1RjKJgZpr)o4Jv}|} zP57|AlQab5pgTK%lPyizFteDm7)#C37zmoCVRCX3QDR_qRTX-BdnjFn2A&71s!AJF zRYhzoX6SP)pv7W_x4$2KeZ83c`4>qNW+Ll~i;MFDYMP2SIy+O?Sh(w~856)*yIsb-$T+}^oH_FP& zu(Z5{2|Bk_Dvka9eTT~gM+wp_b%=)+y@hgNydaaYB3gF zx>(UWL?1<^s-vSrZ=xF0&`qgyI-Q^^2PTsVH*ZcN7!1l6JbUI$-kywtv9y*JM;9q_ zn)k-W1{`z~)Ya9&L=5Ei#^=WEirLF-Owe^SLS2Y$yp|t4fS^`)Yvxvd)0Q5xwf&^H zTyK9sW5u_Jy6j&Q-E-&OJcq) adapters = new List(); public MainDeviceAdapter() { -#if UNITY_IOS || UNITY_TVOS || UNITY_ANDROID +#if UNITY_IOS || UNITY_ANDROID this.CreateBleAdapter(); #else this.CreateBleAdapter(); @@ -30,7 +30,7 @@ namespace Assets.Scripts.Devices private void CreateBleAdapter() { -#if UNITY_IOS || UNITY_TVOS || UNITY_ANDROID +#if UNITY_IOS || UNITY_ANDROID adapters.Add(new BleDeviceAdapter(BleMobileInterface.GetInterface())); #else adapters.Add(new BleDeviceAdapter(BleWinHwInterface.GetInterface())); diff --git a/Assets/Scripts/UI/Prefab/Device/DeviceView.cs b/Assets/Scripts/UI/Prefab/Device/DeviceView.cs index fcb139fd..eeb96732 100644 --- a/Assets/Scripts/UI/Prefab/Device/DeviceView.cs +++ b/Assets/Scripts/UI/Prefab/Device/DeviceView.cs @@ -125,7 +125,12 @@ public class DeviceView : MonoBehaviour { if (deviceModal == null) { + +#if UNITY_IOS || UNITY_ANDROID + var obj = Resources.Load("UI/Prefab/Device/Mobile/ConnectDeviceModal"); +#else var obj = Resources.Load("UI/Prefab/Device/ConnectDeviceModal"); +#endif GameObject gameObject = (GameObject)Instantiate(obj); deviceModal = gameObject.GetComponent(); } @@ -140,7 +145,11 @@ public class DeviceView : MonoBehaviour // device.Disconnect(); //} +#if UNITY_IOS || UNITY_ANDROID + var obj = Resources.Load("UI/Prefab/Device/Mobile/ConnectDeviceModal"); +#else var obj = Resources.Load("UI/Prefab/Device/ConnectDeviceModal"); +#endif GameObject gameObject = (GameObject)Instantiate(obj); deviceModal = gameObject.GetComponent(); deviceModal.SensorType = this.SensorType; @@ -234,13 +243,18 @@ public class DeviceView : MonoBehaviour { mSearchButton.SetActive(false); mPairButton.SetActive(true); +#if UNITY_IOS || UNITY_ANDROID + searchState.gameObject.SetActive(false); +#endif logo.sprite = sprite1; //App.MainDeviceAdapter.GetDevices().First(d => d.Sensor == SensorType).Connect(); } else { +#if !(UNITY_IOS || UNITY_ANDROID) mSearchButton.SetActive(true); +#endif mPairButton.SetActive(false); } }