修改bug

Assets/AdvancedImageViewer.cs

@@ -0,0 +1,276 @@
+using UnityEngine;
+using UnityEngine.UI;
+using UnityEngine.EventSystems;
+#if UNITY_EDITOR
+using UnityEditor;
+#endif
+
+public class AdvancedImageViewer : MonoBehaviour, 
+    IBeginDragHandler, IDragHandler, IEndDragHandler, 
+    IScrollHandler, IPointerClickHandler
+{
+    [Header("Zoom Settings")]
+    [Range(0.1f, 0.5f)] public float minZoom = 0.3f;
+    [Range(2f, 10f)] public float maxZoom = 4f;
+    [Range(0.01f, 0.2f)] public float zoomSpeed = 0.1f;
+    [Range(0.001f, 0.05f)] public float touchZoomSpeed = 0.01f;
+    
+    [Header("Move Settings")]
+    [Range(0.5f, 2f)] public float moveSpeed = 1f;
+    [Range(0.01f, 0.3f)] public float elasticFactor = 0.1f;
+    
+    [Header("References")]
+    public RectTransform imageRect;
+    public RectTransform contentRect;
+    
+    private Vector2 lastDragPosition;
+    private float currentZoom = 1f;
+    private Vector2 initialAnchoredPosition;
+    private Vector2 initialSizeDelta;
+    
+    private float lastTapTime;
+    private const float DoubleTapTime = 0.3f;
+    private bool isDragging;
+    private Vector2 velocity;
+    private const float friction = 0.95f;
+
+    private void OnEnable()
+    {
+
+        Screen.orientation = ScreenOrientation.LandscapeLeft;
+        Screen.autorotateToLandscapeLeft = false;
+        Screen.autorotateToLandscapeRight = false;
+        Screen.autorotateToPortrait = false;
+        Screen.autorotateToPortraitUpsideDown = false;
+        Initialize();
+    }
+    private void OnDisable()
+    {
+        // 强制横屏并禁止自动旋转
+        Screen.orientation = ScreenOrientation.Portrait;
+        Screen.autorotateToLandscapeLeft = false;
+        Screen.autorotateToLandscapeRight = false;
+        Screen.autorotateToPortrait = false;
+        Screen.autorotateToPortraitUpsideDown = false;
+    }
+
+    private void Initialize()
+    {
+        if (imageRect == null) imageRect = GetComponent<RectTransform>();
+        if (contentRect == null) contentRect = transform.parent.GetComponent<RectTransform>();
+        
+        initialAnchoredPosition = imageRect.anchoredPosition;
+        initialSizeDelta = imageRect.sizeDelta;
+        currentZoom = 1f;
+        imageRect.localScale = Vector3.one;
+    }
+
+    private void Update()
+    {
+        #if UNITY_EDITOR
+        if (!Application.isPlaying)
+        {
+            // 编辑器模式下保持初始化状态
+            if (currentZoom != 1f)
+            {
+                currentZoom = 1f;
+                imageRect.localScale = Vector3.one;
+                imageRect.anchoredPosition = initialAnchoredPosition;
+            }
+            return;
+        }
+        #endif
+
+        HandleTouchZoom();
+        ApplyInertia();
+    }
+
+    private void HandleTouchZoom()
+    {
+        if (Input.touchCount == 2)
+        {
+            Touch touchZero = Input.GetTouch(0);
+            Touch touchOne = Input.GetTouch(1);
+
+            if (touchZero.phase == TouchPhase.Moved || touchOne.phase == TouchPhase.Moved)
+            {
+                Vector2 touchZeroPrevPos = touchZero.position - touchZero.deltaPosition;
+                Vector2 touchOnePrevPos = touchOne.position - touchOne.deltaPosition;
+
+                float prevDistance = Vector2.Distance(touchZeroPrevPos, touchOnePrevPos);
+                float currentDistance = Vector2.Distance(touchZero.position, touchOne.position);
+
+                float difference = currentDistance - prevDistance;
+                ZoomImage(1 + difference * touchZoomSpeed, (touchZero.position + touchOne.position) / 2);
+            }
+            isTwo=true;
+        }
+        else if(Input.touchCount == 0)
+        {
+            isTwo=false;
+
+        }
+    }
+
+    private void ApplyInertia()
+    {
+        if (!isDragging && velocity.magnitude > 0.1f)
+        {
+            imageRect.anchoredPosition += velocity * Time.deltaTime;
+            velocity *= friction;
+            ClampImagePosition();
+        }
+        else
+        {
+            velocity = Vector2.zero;
+        }
+    }
+
+    public void OnBeginDrag(PointerEventData eventData)
+    {
+        if (Input.touchCount > 1) return;
+        
+        isDragging = true;
+        lastDragPosition = eventData.position;
+    }
+
+    public void OnDrag(PointerEventData eventData)
+    {
+        if (Input.touchCount > 1 || currentZoom <= 1f) return;
+        
+        Vector2 delta = eventData.position - lastDragPosition;
+        imageRect.anchoredPosition += delta * moveSpeed;
+        velocity = delta * moveSpeed;
+        lastDragPosition = eventData.position;
+        
+        ClampImagePosition();
+    }
+
+    public void OnEndDrag(PointerEventData eventData)
+    {
+        isDragging = false;
+    }
+
+    public void OnScroll(PointerEventData eventData)
+    {
+        float scrollDelta = eventData.scrollDelta.y;
+        float zoomFactor = 1f + scrollDelta * zoomSpeed;
+        ZoomImage(zoomFactor, eventData.position);
+    }
+
+    bool isTwo=false;
+    public void OnPointerClick(PointerEventData eventData)
+    {
+        if (eventData.clickCount == 2)
+        {
+            HandleDoubleTap(eventData.position);
+        }
+        else if (eventData.clickCount == 1&&!isTwo)
+        {
+            float currentTime = Time.time;
+            if (currentTime - lastTapTime < DoubleTapTime)
+            {
+                HandleDoubleTap(eventData.position);
+            }
+            lastTapTime = currentTime;
+        }
+    }
+
+    private void HandleDoubleTap(Vector2 position)
+    {
+        if (currentZoom > 1f)
+        {
+            ResetView();
+        }
+        else
+        {
+            ZoomImage(2f, position);
+        }
+    }
+
+    private void ZoomImage(float zoomFactor, Vector2 zoomCenter)
+    {
+        float newZoom = currentZoom * zoomFactor;
+        newZoom = Mathf.Clamp(newZoom, minZoom, maxZoom);
+        
+        RectTransformUtility.ScreenPointToLocalPointInRectangle(
+            imageRect, 
+            zoomCenter, 
+            null, 
+            out Vector2 localPoint);
+        
+        Vector2 pivotOffset = (Vector2)imageRect.pivot - new Vector2(0.5f, 0.5f);
+        Vector2 offset = localPoint * (newZoom - currentZoom);
+        
+        imageRect.localScale = Vector3.one * newZoom;
+       // imageRect.anchoredPosition -= zoomCenter-imageRect.sizeDelta*imageRect.localScale.x;
+        currentZoom = newZoom;
+        
+        ClampImagePosition();
+    }
+
+    private void ClampImagePosition()
+    {
+        if (currentZoom <= 1f)
+        {
+            imageRect.anchoredPosition = initialAnchoredPosition;
+            return;
+        }
+
+        Vector3[] corners = new Vector3[4];
+        imageRect.GetWorldCorners(corners);
+        
+        if (contentRect == null) return;
+        
+        Vector3[] contentCorners = new Vector3[4];
+        contentRect.GetWorldCorners(contentCorners);
+        
+        float imageWidth = (corners[2].x - corners[0].x)*imageRect.localScale.x;
+        float imageHeight = (corners[2].y - corners[0].y)*imageRect.localScale.x;
+        
+        float contentWidth = contentCorners[2].x - contentCorners[0].x;
+        float contentHeight = contentCorners[2].y - contentCorners[0].y;
+        
+        float minX = contentWidth - imageWidth;
+        float maxX = 0+ imageWidth;
+        float minY = contentHeight - imageHeight;
+        float maxY = 0+ imageHeight;
+        
+        Vector3 pos = imageRect.localPosition;
+        pos.x = Mathf.Clamp(pos.x, minX, maxX);
+        pos.y = Mathf.Clamp(pos.y, minY, maxY);
+        
+        // 弹性效果
+        if (pos.x != imageRect.localPosition.x || pos.y != imageRect.localPosition.y)
+        {
+            velocity = Vector2.zero;
+            imageRect.localPosition = Vector3.Lerp(imageRect.localPosition, pos, elasticFactor);
+        }
+        else
+        {
+            imageRect.localPosition = pos;
+        }
+    }
+
+    public void ResetView()
+    {
+        currentZoom = 1f;
+        imageRect.localScale = Vector3.one;
+        imageRect.anchoredPosition = initialAnchoredPosition;
+        velocity = Vector2.zero;
+    }
+
+    #if UNITY_EDITOR
+    private void OnValidate()
+    {
+        if (EditorApplication.isPlayingOrWillChangePlaymode) return;
+        
+        if (imageRect == null) imageRect = GetComponent<RectTransform>();
+        if (contentRect == null && transform.parent != null) 
+            contentRect = transform.parent.GetComponent<RectTransform>();
+        
+        initialAnchoredPosition = imageRect.anchoredPosition;
+        initialSizeDelta = imageRect.sizeDelta;
+    }
+    #endif
+}

Assets/AdvancedImageViewer.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f1885191a59ae493ea8272080839cec7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/DownLoadCOSXRItem.cs

@@ -113,12 +113,13 @@ public class DownLoadCOSXRItem : MonoBehaviour
         {
             yield return null;
         }
+        /*
         Debug.Log("ReadStreamingAssetsFile==IsCompleted=>" + task.IsCompleted);
         Debug.Log("ReadStreamingAssetsFile===>" + task.IsFaulted);
         Debug.Log("ReadStreamingAssetsFile===>" + task.IsCompletedSuccessfully);
         Debug.Log("ReadStreamingAssetsFile===>" + task.Status);
-        Debug.Log("ReadStreamingAssetsFile===>" + task.Exception);
-        Debug.Log("ReadStreamingAssetsFile===>" + task.Result.RawContentBodyString);
+        Debug.Log("ReadStreamingAssetsFile===>" + task.Exception);*/
+       // Debug.Log("ReadStreamingAssetsFile===>" + task.Result.RawContentBodyString);
         //  Destroy(this.gameObject);
     }
     public string localPath;

Assets/GongDanXQManager.cs

@@ -1,8 +1,10 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.IO;
 using FantomLib;
 using LitJson;
+using Unity.VisualScripting;
 using UnityEngine;
 using UnityEngine.UI;
 using static BaoBiaoDetail;
@@ -79,12 +81,27 @@ public class GongDanXQManager : MonoBehaviour
     public GameObject cancelgo;
     public GameObject zhizhigo;
     public GameObject dianzigo;
+
+    public ImageLoadManager faultImage;
+
+    public List<ImageLoadManager> faillist=new List<ImageLoadManager>();
+
+    public ImageLoadManager PdfImage;
+
+    public ImageLoadManager ZhizBG;
+
     void Awake()
     {
         Instance = this;
     }
     void OnEnable()
     {
+        TopWindowManager.Instance.showTitle("需求单处理");
+        for (int i=0;i<faillist.Count;i++)
+        {
+            Destroy(faillist[i].gameObject);
+        }
+        this.faillist.Clear();
         for (int i = 0;i<itemviewList.Count;i++)
         {
             Destroy(itemviewList[i].gameObject);
@@ -174,6 +191,18 @@ public class GongDanXQManager : MonoBehaviour
             else if(reports.reportsType==1)
             {
 
+                if(reports.paperReports!=null)
+                {
+                    for (int i = 0;i<reports.paperReports.Count;i++)
+                    {
+                        // 处理图片文件
+                        ImageLoadManager nitem = GameObject.Instantiate(ZhizBG,ZhizBG.transform.parent);
+                        nitem.loadimage(reports.paperReports[i]);
+                        nitem.gameObject.SetActive(true);
+                        this.faillist.Add(nitem);
+                    }
+
+                }
                 cancelgo.SetActive(false);
                 zhizhigo.SetActive(true);
                 dianzigo.SetActive(false);
@@ -192,11 +221,15 @@ public class GongDanXQManager : MonoBehaviour
                 contactF.text = XQData.demand.contact;
                 mobilePhoneF.text = XQData.demand.mobilePhone;
                 customerAddressF.text = XQData.demand.customerAddress;
-                
+                bool isnew=false;
                 if(reports.reportsType==2)
                 {
                     ereports = XQData.workOrder.reports.eReports;
                 }
+                else
+                {
+                    isnew=true;
+                }
                 deviceModelF.text = TianJiWindowManager.Instance.dtdlist.strings[ereports.deviceType];
   
                 serviceType.text = TianJiWindowManager.getConfigServerTypestr(XQData.demand.kind,XQData.workOrder.serviceType)[1].ToString();
@@ -238,6 +271,8 @@ public class GongDanXQManager : MonoBehaviour
                         appraiselist.text= "不满意";
                     break;
                 }
+
+
                 isAdequatelyPrepared.text = ereports.isAdequatelyPrepared?"是":"否";
                 isResolved.text  = ereports.isResolved?"是":"否";
 
@@ -264,6 +299,31 @@ public class GongDanXQManager : MonoBehaviour
                 customerSignature.GetComponent<RawImage>().texture = customerSignature.defaultTexture;
                 solverSignature.GetComponent<RawImage>().texture = solverSignature.defaultTexture;
                     
+                for (int i = 0;i<XQData.workOrder.annex.Count;i++)
+                {
+                    string extension = Path.GetExtension(XQData.workOrder.annex[i]);
+
+                    // 使用示例
+                    if(extension == ".png" || extension == ".jpg")
+                    {
+                    // 处理图片文件
+                        ImageLoadManager nitem = GameObject.Instantiate(faultImage,faultImage.transform.parent);
+                        nitem.loadimage(XQData.workOrder.annex[i]);
+                        nitem.gameObject.SetActive(true);
+                        this.faillist.Add(nitem);
+                    }
+                    else if(extension == ".pdf")
+                    {
+                    // 处理图片文件
+                        ImageLoadManager nitem = GameObject.Instantiate(PdfImage,PdfImage.transform.parent);
+                        nitem.loadPdf(XQData.workOrder.annex[i]);
+                        nitem.gameObject.SetActive(true);
+                        this.faillist.Add(nitem);
+                        // 处理预制体文件
+                    }
+
+                }
+                
             }
 
         });

Assets/ImageLoadManager.cs

@@ -0,0 +1,71 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+using static DownLoadXRManager;
+
+public class ImageLoadManager : MonoBehaviour
+{
+    string type = "";
+    public Texture2D texture2D;
+    public void loadimage(string path)
+    {
+        type="image";
+        if(path==""||path==null)
+        {
+            return;
+        }
+        Debug.Log("开始下载图片===》"+path);
+        DownLoadResources dlr = new DownLoadResources();
+        dlr.path = path;
+        // 文件上传
+        DownLoadXRManager.DownLoadForTexture(dlr, msg =>
+        {
+            texture2D=msg;
+            this.transform.GetComponent<RawImage>().texture = msg;
+        },(f)=>{
+
+
+        });
+    }
+    public Texture2D pdftex;
+    string pdfpath;
+    public void loadPdf(string path)
+    {
+
+        type="pdf";
+        if(path==""||path==null)
+        {
+            return;
+        }
+        Debug.Log("开始下载Pdf===》"+path);
+        DownLoadResources dlr = new DownLoadResources();
+        dlr.path = path;
+        // 文件上传
+        DownLoadXRManager.DownLoadForFilePath(dlr, msg =>
+        {
+            pdfpath=msg;
+            this.transform.GetComponent<RawImage>().texture = pdftex;
+           // this.transform.GetComponent<RawImage>().texture = msg;
+        },(f)=>{
+
+
+        });
+    }
+
+    public void showBigTexture()
+    {
+        if(type=="image")
+        {
+            TianJiWindowManager.Instance.showPoTexure2D(5,texture2D);
+        }
+        else
+        {
+            TianJiWindowManager.Instance.showPoPdf(6,pdfpath);
+        }
+    }
+    void OnDestroy()
+    {
+        Destroy(texture2D);
+    }
+}

Assets/ImageLoadManager.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: eef459d85f29943019d88ce2b65c7826
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/RemoteTools/Remote3.1/Scripts/LoginModule/LoginForms.cs

@@ -252,7 +252,7 @@ public class LoginForms : BaseUIForms
 
     private void YuLoginOk()
     {
-        userInputField.text="test07";
+        userInputField.text="test03";
         passwordInputField.text="123456Aa";
         NetWorkHeaders.Login(userInputField.text, passwordInputField.text, LoginOk, LoginFail);
     }

Assets/StreamingAssets/build_info

@@ -1 +1 @@
-Build from MacBook Pro at 3/28/2025 11:13:02 AM
+Build from MacBook Pro at 3/28/2025 4:30:54 PM

Assets/TianJiSprite/BaoBiaoDetail.cs

@@ -42,12 +42,12 @@ public class BaoBiaoDetail
         public string unresolved { get; set; }
         public string followup { get; set; }
         public string suggestion { get; set; }
-        public int appraise { get; set; }
-        public bool isAdequatelyPrepared { get; set; }
-        public bool isResolved { get; set; }
-        public int attitudeScores { get; set; }
-        public int responseScores { get; set; }
-        public int engineerSkillScores { get; set; }
+        public int appraise=1;
+        public bool isAdequatelyPrepared =true;
+        public bool isResolved =true;
+        public int attitudeScores =10;
+        public int responseScores =10;
+        public int engineerSkillScores =10;
         public string situation { get; set; }
         public string customerSuggestion { get; set; }
         public string customerSignature { get; set; }

Assets/TianJiSprite/BaoGaoInputManager.cs

@@ -81,12 +81,15 @@ public class BaoGaoInputManager : MonoBehaviour
     Reports reports = new Reports();
     public JsonData serviceTimeDetail;
     void OnEnable()
+    {
+    }
+    public void initBG()
     {
         StartCoroutine(getData());
     }
     void OnDisable()
     {
-        BaoGaoWindowManager.Instance.XQData=null;
+       // BaoGaoWindowManager.Instance.XQData=null;
     }
     public IEnumerator getData()
     {
@@ -184,7 +187,7 @@ public class BaoGaoInputManager : MonoBehaviour
     public void gotocompleteGongdan(bool isDraft)
     {
         JsonData data= new JsonData();
-        data["workOrderId"] = BaoGaoWindowManager.Instance.XQData.workOrder.id;
+        data["workOrderId"] = int.Parse(ChuLiItemManager.ChooseData["id"].ToString()) ;
         data["reportsType"] = 2;
         data["isDraft"] = isDraft;
 

Assets/TianJiSprite/BaoGaoUpLoadManager.cs

@@ -13,35 +13,33 @@ public class BaoGaoUpLoadManager : MonoBehaviour
     {
         Instance = this;
     }
-    void OnEnable()
+    public void initBG()
     {
-        initBG(BaoGaoWindowManager.Instance.XQData);
-    }
-    public void initBG(BaoBiaoDetail data)
-    {
-        for (int i = 0;i< data.workOrder.reports.paperReports.Count;i++)
+        for (int i = 0;i<itemlist.Count;i++)
+        {
+            Destroy(itemlist[i].gameObject);
+        }
+        itemlist.Clear();
+        Debug.Log("BaoGaoWindowManager.Instance.XQData.workOrder.reports.paperReports==>");
+        if(BaoGaoWindowManager.Instance.XQData.workOrder.reports!=null&&BaoGaoWindowManager.Instance.XQData.workOrder.reports.paperReports!=null)
         {
-            downloadimg(data.workOrder.reports.paperReports[i]);
+        Debug.Log("BaoGaoWindowManager.Instance.XQData.workOrder.reports.paperReports==>"+BaoGaoWindowManager.Instance.XQData.workOrder.reports.paperReports.Count);
+            for (int i = 0;i< BaoGaoWindowManager.Instance.XQData.workOrder.reports.paperReports.Count;i++)
+            {
+                downloadimg(BaoGaoWindowManager.Instance.XQData.workOrder.reports.paperReports[i]);
+            }
+
         }
        
     }
     public void downloadimg(string path)
     {
         Debug.Log("开始下载图片===》"+path);
-        DownLoadResources dlr = new DownLoadResources();
-        dlr.path = path;
-        // 文件上传
-        DownLoadXRManager.DownLoadForTexture(dlr, msg =>
-        {
-            Texture2D t2d = msg;
-            UpLoadmageItem nitem = GameObject.Instantiate(item,item.transform.parent);
-            nitem.gameObject.SetActive(true);
-            nitem.init(t2d,imgpath);
-            itemlist.Add(nitem);
-        },(f)=>{
-
-
-        });
+        UpLoadmageItem nitem = GameObject.Instantiate(item,item.transform.parent);
+        nitem.GetComponent<ImageLoadManager>().loadimage(path);
+        nitem.gameObject.SetActive(true);
+        nitem.path = path;
+        itemlist.Add(nitem);
     }
     string imgpath="";
     public UpLoadmageItem item; 
@@ -80,8 +78,8 @@ public class BaoGaoUpLoadManager : MonoBehaviour
     public void gotocompleteGongdan(bool isDraft)
     {
         JsonData data= new JsonData();
-        data["workOrderId"] = BaoGaoWindowManager.Instance.XQData.workOrder.id;
-        data["reportsType"] = 2;
+        data["workOrderId"] =int.Parse(ChuLiItemManager.ChooseData["id"].ToString()) ;
+        data["reportsType"] = 1;
         data["isDraft"] = isDraft;
 
         data["paperReports"] = new JsonData();
@@ -90,8 +88,8 @@ public class BaoGaoUpLoadManager : MonoBehaviour
         {
            data["paperReports"].Add(itemlist[i].path);
         }
-     
-        if( data["paperReports"].Count<=0)
+        
+        if( itemlist.Count<=0&&!isDraft)
         {
             TianJiWindowManager.Instance.showPop(4,"请上传图片");
             Debug.Log("请上传图片");

Assets/TianJiSprite/BaoGaoWindowManager.cs

@@ -19,6 +19,7 @@ public class BaoGaoWindowManager : MonoBehaviour
     public BaoBiaoDetail XQData;
     void OnEnable()
     {
+        TopWindowManager.Instance.showTitle("服务报告");
         JsonData jsonData =new JsonData();
         jsonData["id"] = int.Parse(ChuLiItemManager.ChooseData["id"].ToString());
         DataManager.Instance.GetBaoGaoItem(jsonData,(str)=>{
@@ -28,10 +29,12 @@ public class BaoGaoWindowManager : MonoBehaviour
             if(XQData.workOrder.reports!=null&&XQData.workOrder.reports.reportsType==1)
             {
                 st.isOn=true;
+                scGo.GetComponent<BaoGaoUpLoadManager>().initBG();
             }
             else
             {
                 tt.isOn=true;
+                txGo.GetComponent<BaoGaoInputManager>().initBG();
             }
 
         });
@@ -59,12 +62,15 @@ public class BaoGaoWindowManager : MonoBehaviour
     {
         txGo.SetActive(true);
         scGo.SetActive(false);
+                txGo.GetComponent<BaoGaoInputManager>().initBG();
     }
 
     public void  gotoSc()
     {
         txGo.SetActive(false);
         scGo.SetActive(true);
+                scGo.GetComponent<BaoGaoUpLoadManager>().initBG();
+
 
     }
 }

Assets/TianJiSprite/DataManager.cs

@@ -84,7 +84,7 @@ public class DataManager : MonoBehaviour
         }));
     }
 
-    public static string ip =  "https://api-fat1.ghz-tech.com";//"https://api-cs.ghz-tech.com";//
+    public static string ip =  "https://api-cs.ghz-tech.com";//"https://api-fat1.ghz-tech.com";//
     public  IEnumerator Post_Demo(string url,string lstformData,Action<string> callback)
     {
         Debug.Log("开始请求" + url + "_" + lstformData);

Assets/TianJiSprite/GongDanMainManager.cs

@@ -51,6 +51,7 @@ public class GongDanMainManager : MonoBehaviour
     }
     void OnEnable()
     {
+        TopWindowManager.Instance.showTitle(TianJiWindowManager.Instance.GetTextByKey("110009"));
         Invoke("initdata",0.2f);
     }
     void initdata()

Assets/TianJiSprite/GongDanWindowManager.cs

@@ -122,6 +122,7 @@ public class GongDanWindowManager : MonoBehaviour
 
     public void gotoBaoGao()
     {
+        this.transform.parent.GetComponent<RectTransform>().anchoredPosition3D =Vector3.zero;
         MainGo.SetActive(false);
         BaoGaogo.SetActive(true);
         XQGo.SetActive(false);
@@ -130,6 +131,7 @@ public class GongDanWindowManager : MonoBehaviour
     }
     public void gotoXQGo()
     {
+        this.transform.parent.GetComponent<RectTransform>().anchoredPosition3D =Vector3.zero;
         MainGo.SetActive(false);
         BaoGaogo.SetActive(false);
         XQGo.SetActive(true);
@@ -139,6 +141,7 @@ public class GongDanWindowManager : MonoBehaviour
 
     public void gotoMain()
     {
+        this.transform.parent.GetComponent<RectTransform>().anchoredPosition3D =Vector3.zero;
         MainGo.SetActive(true);
         BaoGaogo.SetActive(false);
         XQGo.SetActive(false);
@@ -147,6 +150,7 @@ public class GongDanWindowManager : MonoBehaviour
 
     public void gotoXQXQ()
     {
+        this.transform.parent.GetComponent<RectTransform>().anchoredPosition3D =Vector3.zero;
         MainGo.SetActive(false);
         BaoGaogo.SetActive(false);
         XQGo.SetActive(false);

Assets/TianJiSprite/PopWindowManager.cs

@@ -1,12 +1,17 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using Paroxe.PdfRenderer;
 using UnityEngine;
 using UnityEngine.UI;
 
 public class PopWindowManager : MonoBehaviour
 {
+    public PDFViewer pDFViewer;
+    public static Texture texture;
+    public RawImage image;
     public static string info;
+    public static string pdfpath;
     public Text fivetext;
     public static PopWindowManager Instance;
     void Awake()
@@ -19,11 +24,49 @@ public class PopWindowManager : MonoBehaviour
 
     public void OnEnable()
     {
+        if(pdfpath!=""&&pdfpath!=null)
+        {
+            Screen.autorotateToLandscapeLeft = true;
+            Screen.autorotateToLandscapeRight = true;
+            Screen.autorotateToPortrait = true;
+            Screen.autorotateToPortraitUpsideDown = true;
+            pDFViewer.LoadDocumentFromWeb(pdfpath);
+            pdfpath="";
+        }
+        image.texture = texture;
         fivetext.text = info;
         for (int i=0;i<golist.Count;i++)
         {
             golist[i].SetActive(false);
         }
         golist[indexwd].SetActive(true);
+        SetImageFullScreen();
+    }
+     void SetImageFullScreen()
+    {
+        // 获取屏幕和图片的宽高比
+        float screenAspect = (float)Screen.width / Screen.height;
+        float imageAspect = (float)image.texture.width / image.texture.height;
+        
+        // 根据宽高比调整图片大小
+        if (screenAspect > imageAspect)
+        {
+            // 屏幕更宽，以高度为基准
+            image.rectTransform.sizeDelta = new Vector2(
+                Screen.height * imageAspect, 
+                Screen.height
+            );
+        }
+        else
+        {
+            // 屏幕更高，以宽度为基准
+            image.rectTransform.sizeDelta = new Vector2(
+                Screen.width, 
+                Screen.width / imageAspect
+            );
+        }
+        
+        // 居中显示
+        image.rectTransform.anchoredPosition = Vector2.zero;
     }
 }

Assets/TianJiSprite/ThemeData.cs

@@ -0,0 +1,10 @@
+using UnityEngine;
+
+[CreateAssetMenu(fileName = "ThemeData", menuName = "UI/Theme Data")]
+public class ThemeData : ScriptableObject
+{
+    public Color backgroundColor;
+    public Color textColor;
+    public Color buttonColor;
+    // 其他 UI 元素颜色...
+}

Assets/TianJiSprite/ThemeData.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 386f64d7e1aab4964940c4f7838efd26
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/TianJiSprite/TianJiLoginManager.cs

@@ -19,7 +19,7 @@ public class TianJiLoginManager : MonoBehaviour
         errorgo.SetActive(false);
     }
     public void GotoLogin()
-    {   
+    {   //17606175082  00000002
         JsonData userData =new JsonData();
         userData["account"] = acctext.text;
         userData["password"] = passtext.text;

Assets/TianJiSprite/TianJiWindowManager.cs

@@ -63,6 +63,18 @@ public class TianJiWindowManager : MonoBehaviour
         MainGo.SetActive(false);
         LoginGo.SetActive(true);
     }
+    public void showPoPdf(int i,string path)
+    {
+        PopWindowManager.pdfpath = path;
+        PopWindowManager.indexwd =i;
+        PopGo.SetActive(true);
+    }
+    public void showPoTexure2D(int i,Texture tex)
+    {
+        PopWindowManager.texture = tex;
+        PopWindowManager.indexwd =i;
+        PopGo.SetActive(true);
+    }
 
     public void showPop(int i =0,string str ="")
     {

Assets/UI/Light.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a9c061e051f91474e9af1f31747ed5a8
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/UI/Light/容器 3643@2x.png.meta

@@ -0,0 +1,140 @@
+fileFormatVersion: 2
+guid: b48d5d34e77334388a760a6ba6ad7d73
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    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
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  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: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 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
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 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
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: