修改连接设备界面;修改大地图在panel上缩放大地图也缩放的问题

Assets/Scripts/UI/Prefab/Device/DeviceItem.cs

@@ -10,7 +10,9 @@ public class DeviceItem : Selectable, IEventSystemHandler, IPointerClickHandler
 {
     private bool isOn;
     private Text mText;
-    private Text mType;
+    private Image network;
+    private Image signal;
+    private float timer = 0f;
     public AbstractDevice DeviceInfo
     {
         get;set;
@@ -19,7 +21,8 @@ public class DeviceItem : Selectable, IEventSystemHandler, IPointerClickHandler
     protected override void Awake()
     {
         mText = this.transform.Find("Name").GetComponent<Text>();
-        mType = this.transform.Find("Type").GetComponent<Text>();
+        network = this.transform.Find("Network").GetComponent<Image>();
+        signal = this.transform.Find("Signal").GetComponent<Image>();
     }
 
     // Start is called before the first frame update
@@ -37,10 +40,41 @@ public class DeviceItem : Selectable, IEventSystemHandler, IPointerClickHandler
         //    this.SetSelectedStyle();
         }
 
-        mType.text = DeviceInfo.Network.ToString();
+        if(DeviceInfo.Network == NetworkType.BLE)
+        {
+            network.sprite = Resources.Load<Sprite>("Images/link_bluetooth_2");
+        }
+        else
+        {
+            signal.enabled = false;
+        }
+        SetSignal();
     }
 
 
+    private void SetSignal()
+    {
+        if(DeviceInfo == null)
+        {
+            return;
+        }
+        //Debug.Log(DeviceInfo.SignalStrength);
+
+        var signalValue = DeviceInfo.SignalStrength * -1;
+        if (signalValue >= 0 && signalValue <= 30)
+        {
+            signal.sprite = Resources.Load<Sprite>("Images/Signal_1");
+        }
+        else if (signalValue > 30 && signalValue <= 70)
+        {
+            signal.sprite = Resources.Load<Sprite>("Images/Signal_2");
+        }
+        else if (signalValue > 70 && signalValue <= 97)
+        {
+            signal.sprite = Resources.Load<Sprite>("Images/Signal_3");
+        }
+    }
+
     public override void OnPointerEnter(PointerEventData eventData)
     {
         //base.OnPointerEnter(eventData);
@@ -59,6 +93,8 @@ public class DeviceItem : Selectable, IEventSystemHandler, IPointerClickHandler
         shadow.enabled = true;
         ColorUtility.TryParseHtmlString("#F93086", out Color color1);
         shadow.effectColor = color1;
+
+        network.color = color1;
     }
 
     public override void Select()
@@ -82,7 +118,15 @@ public class DeviceItem : Selectable, IEventSystemHandler, IPointerClickHandler
     // Update is called once per frame
     void Update()
     {
-        
+        if (timer >= 2)
+        {
+            timer = 0f;
+
+            SetSignal();
+
+            return;
+        }
+        timer += Time.deltaTime;
     }
 
     public void OnPointerClick(PointerEventData eventData)
@@ -110,6 +154,7 @@ public class DeviceItem : Selectable, IEventSystemHandler, IPointerClickHandler
         else
         {
             mText.color = Color.white;
+            network.color = Color.white;
             var shadow = mText.gameObject.GetComponent<Shadow>();
             if (shadow != null)
             {

Assets/Scripts/UI/Prefab/Device/DeviceView.cs

@@ -252,8 +252,17 @@ public class DeviceView : MonoBehaviour
             logo.sprite = sprite1;
 
             title.text = connectedDevice.Name;
-            noDevice.text = connectedDevice.DeviceNumber.ToString();
+            if (connectedDevice.Network == NetworkType.BLE)
+            {
+                noDevice.enabled = false;
+            }
+            else
+            {
+                noDevice.enabled = true;
+                noDevice.text = connectedDevice.DeviceNumber.ToString();
+            }
             searchState.text = "Connecting...";
+
         }
         else if (connectedDevice.State == DeviceState.Connected)
         {

Assets/Scripts/UI/Prefab/Panel/BigMapController.cs

@@ -99,6 +99,17 @@ public class BigMapController : PFUIPanel
         var panel = canvas.transform.Find("Panel");
         base.SetRounded(panel, 30f);
 
+
+        var qtcm = this.transform.Find("Map").GetComponent<QuadTreeCameraMovement>();
+        UIManager.AddEvent(panel.gameObject, EventTriggerType.PointerEnter, (e) =>
+        {             
+            qtcm.enabled = false;
+        });
+        UIManager.AddEvent(panel.gameObject, EventTriggerType.PointerExit, (e) =>
+        {
+            qtcm.enabled = true;
+        });
+
         content = panel.Find("Scroll View").Find("Viewport").Find("Content").gameObject;
         var input = panel.Find("InputField");
         base.SetRounded(input, 20f);