1

2025-03-19 17:37:24 +08:00 · 2025-03-19 17:37:24 +08:00 · cb94fe7ce9
parent 7224851a8b
commit cb94fe7ce9
8 changed files with 107 additions and 12 deletions
--- a/Assets/GameAssets/Texture/BG/bg.png.meta
+++ b/Assets/GameAssets/Texture/BG/bg.png.meta
@ -42,7 +42,7 @@ TextureImporter:
  nPOTScale: 0
  lightmap: 0
  compressionQuality: 50
-  spriteMode: 1
+  spriteMode: 2
  spriteExtrude: 1
  spriteMeshType: 1
  alignment: 0
@ -91,7 +91,28 @@ TextureImporter:
    forceMaximumCompressionQuality_BC6H_BC7: 0
  spriteSheet:
    serializedVersion: 2
-    sprites: []
+    sprites:
+    - serializedVersion: 2
+      name: bg_0
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 300
+        height: 107
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 39, y: 18, z: 19, w: 27}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: d229d5a36de95ae45bb295a63979a1a8
+      internalID: 539220221
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
    outline: []
    physicsShape: []
    bones: []
@ -102,7 +123,8 @@ TextureImporter:
    edges: []
    weights: []
    secondaryTextures: []
-    nameFileIdTable: {}
+    nameFileIdTable:
+      bg_0: 539220221
  spritePackingTag: 
  pSDRemoveMatte: 0
  pSDShowRemoveMatteOption: 0
--- a/Assets/GameAssets/Texture/BG/bg@2x.png.meta
+++ b/Assets/GameAssets/Texture/BG/bg@2x.png.meta
@ -42,7 +42,7 @@ TextureImporter:
  nPOTScale: 0
  lightmap: 0
  compressionQuality: 50
-  spriteMode: 1
+  spriteMode: 2
  spriteExtrude: 1
  spriteMeshType: 1
  alignment: 0
@ -91,7 +91,28 @@ TextureImporter:
    forceMaximumCompressionQuality_BC6H_BC7: 0
  spriteSheet:
    serializedVersion: 2
-    sprites: []
+    sprites:
+    - serializedVersion: 2
+      name: bg@2x_0
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 600
+        height: 214
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 78, y: 33, z: 34, w: 54}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 9802b1db0bb27da43a1a6e2cc7374177
+      internalID: 1018816198
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
    outline: []
    physicsShape: []
    bones: []
@ -102,7 +123,8 @@ TextureImporter:
    edges: []
    weights: []
    secondaryTextures: []
-    nameFileIdTable: {}
+    nameFileIdTable:
+      bg@2x_0: 1018816198
  spritePackingTag: 
  pSDRemoveMatte: 0
  pSDShowRemoveMatteOption: 0
--- a/Assets/Resources/UI/UIPanel/UI_MiddleTipPanel.prefab
+++ b/Assets/Resources/UI/UIPanel/UI_MiddleTipPanel.prefab
@ -391,8 +391,8 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: e4e77253dafe10b47b0992a7a97cbc49, type: 3}
-  m_Type: 0
+  m_Sprite: {fileID: 539220221, guid: 463f0eafdd51b3e4ba621f38d4b3cfc3, type: 3}
+  m_Type: 1
  m_PreserveAspect: 0
  m_FillCenter: 1
  m_FillMethod: 4
--- a/Assets/Scripts/ChangeObjMat.cs
+++ b/Assets/Scripts/ChangeObjMat.cs
@ -45,6 +45,9 @@ public class ChangeObjMat : MonoBehaviour
    /// 预约均衡
    /// </summary>
    public GameObject m_JHJCObj;
+    /// <summary>
+    /// 电池高亮
+    /// </summary>
    public HighlightEffect m_HighlightEffect;
    void Start()
    {
@ -236,6 +239,7 @@ public class ChangeObjMat : MonoBehaviour
        {
            p.Init($"5.深度检测报告已生成，请扫描屏幕右下角的二维码获取！", 30);
        });
+        UI_BGPanel.btn_h51.gameObject.SetActive(true);
        yield return new WaitForSeconds(31);
        #endregion
        #region 预约均衡
@ -253,11 +257,12 @@ public class ChangeObjMat : MonoBehaviour
        #region 均衡报告
        if (Bootstrap.UIMgr != null) Bootstrap.UIMgr.ShowPanel<UI_MiddleTipPanel>(this, E_UI_Layer.Top, (p) =>
        {
-            p.Init($"电池均衡操作已完成，请扫描屏幕右下角的二维码获取均衡报告！感谢您的支持和配合，祝您一路平安！", 0);
+            p.Init($"电池均衡操作已完成，请扫描屏幕右下角的二维码获取\n均衡报告！感谢您的支持和配合，祝您一路平安！", 0);
        });
        Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.AudioPlay, $"电池诊所检测及均衡全流程已完成");
        m_XKObj.SetActive(false);
        m_Obj.SetActive(true);
+        UI_BGPanel.btn_h52.gameObject.SetActive(true);
        #endregion
    }
    private void OnDisable()
--- a/Assets/Scripts/UI/UIPanel/UI_BGPanel.cs
+++ b/Assets/Scripts/UI/UIPanel/UI_BGPanel.cs
@ -15,6 +15,8 @@ public class UI_BGPanel : BasePanel
    public FFmpegPlayerBasicRawImage mediaPlayerHW;
    public FFmpegPlayerBasicRawImage mediaPlayerZW;
    private LiveUrlData liveUrlData;
+    public RTSPUrlInfo rtspUrlInfo = new RTSPUrlInfo();
+    string liveurl1;
    protected override void Awake()
    {
        base.Awake();
@ -52,8 +54,24 @@ public class UI_BGPanel : BasePanel
    }
    private void OnLoadVideo()
    {
-        mediaPlayer1.UseTcp = true;
-        mediaPlayer1.OpenPlayUrl(liveUrlData.LiveUrl1);
+        var filePath = Path.Combine(Application.streamingAssetsPath, "StateTrendConfig/RTSPUrlInfo.json");
+        if (File.Exists(filePath))
+        {
+            var jsonStr = File.ReadAllText(filePath);
+            var config = JsonConvert.DeserializeObject<RTSPUrlInfo>(jsonStr);
+            rtspUrlInfo = config;
+            liveurl1 = "rtsp://" + rtspUrlInfo.Username + ":" + rtspUrlInfo.Password + "@" + rtspUrlInfo.IP + ":" + rtspUrlInfo.Port + "/cam/realmonitor?channel=19&subtype=0&proto=Private3";
+            mediaPlayer1.UseTcp = true;
+            mediaPlayer1.OpenPlayUrl(liveurl1);
+        }
+        else
+        {
+            Debug.Log("RTSPUrlInfo.json not found");
+        }
+
+
+        //mediaPlayer1.UseTcp = true;
+        //mediaPlayer1.OpenPlayUrl(liveurl1);

        mediaPlayer2.UseTcp = true;
        mediaPlayer2.OpenPlayUrl(liveUrlData.LiveUrl2);
@ -97,3 +115,18 @@ public class LiveUrlData
    [JsonProperty("liveUrZW")]
    public string LiveUrlZW { get; set; }
 }
+
+public class RTSPUrlInfo
+{
+    [JsonProperty("username")]
+    public string Username { get; set; }
+
+    [JsonProperty("passward")]
+    public string Password { get; set; }
+
+    [JsonProperty("ip")]
+    public string IP { get; set; }
+
+    [JsonProperty("port")]
+    public string Port { get; set; }
+}
--- a/Assets/Scripts/UI/UIPanel/UI_MiddleTipPanel.cs
+++ b/Assets/Scripts/UI/UIPanel/UI_MiddleTipPanel.cs
@ -64,7 +64,7 @@ public class UI_MiddleTipPanel : BasePanel
        float preferredWidth = contentText.preferredWidth;
        float preferredHeight = contentText.preferredHeight;
        _bg.sizeDelta = new Vector2(preferredWidth + (contentText.text == "" ? 0 : width), _bg.sizeDelta.y);
-        //_bg.sizeDelta = new Vector2(preferredWidth + (contentText.text == "" ? 0 : width), preferredHeight + (contentText.text == "" ? 0 : height)+40);
+        //_bg.sizeDelta = new Vector2(preferredWidth + (contentText.text == "" ? 0 : width), preferredHeight + (contentText.text == "" ? 0 : height)+20);
        //contentText.GetComponent<RectTransform>().sizeDelta = new Vector2(preferredWidth + (contentText.text == "" ? 0 : width), height);
    }
 }
--- a/Assets/StreamingAssets/StateTrendConfig/RTSPUrlInfo.json
+++ b/Assets/StreamingAssets/StateTrendConfig/RTSPUrlInfo.json
@ -0,0 +1,6 @@
+{
+  "username": "admin", //admin
+  "passward": "pyss2017", //Hik12345
+  "ip": "221.214.127.18", //192.168.1.64
+  "port": "8200" //554
+}
--- a/Assets/StreamingAssets/StateTrendConfig/RTSPUrlInfo.json.meta
+++ b/Assets/StreamingAssets/StateTrendConfig/RTSPUrlInfo.json.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 713493119d050a14382f2375dc33ee49
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: