下拉刷新

Assets/FrameWork/ProjectManager/XunJian/列表模块/列表模块.prefab

@@ -3959,7 +3959,7 @@ GameObject:
   - component: {fileID: 2479514545522761070}
   - component: {fileID: 1899207473426752957}
   - component: {fileID: 8126937465351537638}
-  - component: {fileID: 6641164070653094672}
+  - component: {fileID: 3517939022194484626}
   m_Layer: 5
   m_Name: Scroll View
   m_TagString: Untagged
@@ -4028,7 +4028,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!114 &6641164070653094672
+--- !u!114 &3517939022194484626
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -4037,7 +4037,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 3565606044301955425}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
+  m_Script: {fileID: 11500000, guid: a18d12cf0897842479526c6009917959, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Content: {fileID: 627361399737624296}
@@ -4051,10 +4051,10 @@ MonoBehaviour:
   m_Viewport: {fileID: 9164797641204290648}
   m_HorizontalScrollbar: {fileID: 0}
   m_VerticalScrollbar: {fileID: 0}
-  m_HorizontalScrollbarVisibility: 1
+  m_HorizontalScrollbarVisibility: 0
   m_VerticalScrollbarVisibility: 0
-  m_HorizontalScrollbarSpacing: -3
-  m_VerticalScrollbarSpacing: -3
+  m_HorizontalScrollbarSpacing: 0
+  m_VerticalScrollbarSpacing: 0
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []

Assets/HotUpdate/Scripts/Scripts/JinRuRenwu.cs

@@ -169,7 +169,7 @@ public class JinRuRenwu : WindowSingleton<JinRuRenwu>
         }
         else
         {
-            gotoNextItem();
+            gotoNextItem(false);
         }
         // if (XunJianDataManager.Instance.chooseXunJian != null)
         //    UpdateData();
@@ -577,7 +577,7 @@ public class JinRuRenwu : WindowSingleton<JinRuRenwu>
         rwitem.state = RenWuState.Fail;
      //   rwitem.status = 2;
     }
-    public void gotoNextItem()
+    public void gotoNextItem(bool report = true)
     {
         closeAll();
         saotuTip.SetActive(false);
@@ -590,10 +590,11 @@ public class JinRuRenwu : WindowSingleton<JinRuRenwu>
         //jsonData["status"] = rwitem.status;
         //jsonData["consumingTime"] = (int)(Time.time - rwitem.startTime);
 
-      
-        //jsonData["dataFileIds"] = jobject;
 
-        if(rwitem.status != 0)
+        //jsonData["dataFileIds"] = jobject;
+      
+        Debug.Log(JsonConvert.SerializeObject(rwitem));
+        if(report)
         {
             TasksReport tasks = new TasksReport();
             tasks.projectInspectionTaskId = rwitem.id;

Assets/HotUpdate/Scripts/Scripts/Project/XunJian/XunJianDataManager.cs

@@ -14,6 +14,8 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
     public XunJianListData chooseXunJian;
     public List<XunJianListData> xjDataList = new List<XunJianListData>();
 
+    public int page = 1;
+
     public void GetXunJianList(Action<List<XunJianListData>> callback)
     {
        WindowsManager.Instance.StartCoroutine(testBack(callback));
@@ -386,7 +388,7 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
         // 加入分页查询
 
         JsonData jsonData = new JsonData();
-        jsonData["page"] = 7;
+        jsonData["page"] = page++;
         jsonData["limit"] = 50;
         Debug.Log(jsonData.ToJson());
         yield return WindowsManager.Instance.StartCoroutine(HttpTool.Instance.SendHttp(HttpEdustryAction.InspectionList, jsonData.ToJson(), (string msg) =>
@@ -396,6 +398,12 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
             if (jObject["code"].ToString() == "200")
             {
                 List<XunJianData> data = JsonConvert.DeserializeObject<List<XunJianData>>(jObject["data"]["list"].ToString());
+
+                if(data==null||data.Count<1)
+                {
+                    page = -1;
+                   
+                }
                 int listConunt = int.Parse(jObject["data"]["count"].ToString());
 
                 Debug.Log(HttpEdustryAction.InspectionList +" Count " +listConunt);

Assets/HotUpdate/Scripts/Scripts/Project/XunJianLieBiaoRefresh.cs

@@ -0,0 +1,70 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.EventSystems;
+using UnityEngine.UI;
+using static XunJianDataManager;
+
+public class XunJianLieBiaoRefresh : ScrollRect
+{
+    //高度 往下拉是负数   往上拉是正数
+    float f = -30f;
+    //是否刷新
+    bool isRef = false;
+    //是否处于拖动
+    bool isDrag = false;
+    //显示、隐藏刷新字段
+    //public Callback<bool> callback1;
+    //如果满足刷新条件 执行的方法
+   // public Callback callback2;
+
+    protected override void Awake()
+    {
+        base.Awake();
+        onValueChanged.AddListener(ScrollValueChanged);
+    }
+
+    /// <summary>
+    /// 当ScrollRect被拖动时
+    /// </summary>
+    /// <param name="vector">被拖动的距离与Content的大小比例</param>
+    void ScrollValueChanged(Vector2 vector)
+    {
+        //如果不拖动 当然不执行之下的代码
+        if (!isDrag)
+            return;
+        //这个就是Content
+        RectTransform rect = GetComponentInChildren<ContentSizeFitter>().GetComponent<RectTransform>();
+        //如果拖动的距离大于给定的值
+        if (f > rect.rect.height * vector.y)
+        {
+            isRef = true;
+          
+        }
+        else
+        {
+            isRef = false;
+           
+        }
+    }
+
+    public override void OnBeginDrag(PointerEventData eventData)
+    {
+        base.OnBeginDrag(eventData);
+        isDrag = true;
+    }
+
+    public override void OnEndDrag(PointerEventData eventData)
+    {
+        base.OnEndDrag(eventData);
+
+        if (isRef)
+        {
+            XunJianLieBiaoWindow.Instance.RefreshLieBiao();
+
+        }
+        isRef = false;
+        isDrag = false;
+    }
+
+}

Assets/HotUpdate/Scripts/Scripts/Project/XunJianLieBiaoRefresh.cs.meta

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

Assets/HotUpdate/Scripts/Scripts/Project/XunJianLieBiaoWindow.cs

@@ -17,6 +17,7 @@ public class XunJianLieBiaoWindow : WindowSingleton<XunJianLieBiaoWindow>
     {
         base.OnStart();
         RemoveAll();
+        XunJianDataManager.Instance.page = 1;
         GameObject liebiao = WindowsManager.Instance.GetPrefab(WindowConfig.windowType.XunJian, "liebiao");
         XunJianDataManager.Instance.GetXunJianList((List<XunJianListData> data) => {
             for (int i = 0; i < data.Count; i++)
@@ -54,6 +55,48 @@ public class XunJianLieBiaoWindow : WindowSingleton<XunJianLieBiaoWindow>
         });
     }
 
+    public void RefreshLieBiao()
+    {
+        if (XunJianDataManager.Instance.page == -1)
+            return;
+
+        GameObject liebiao = WindowsManager.Instance.GetPrefab(WindowConfig.windowType.XunJian, "liebiao");
+        XunJianDataManager.Instance.GetXunJianList((List<XunJianListData> data) => {
+            for (int i = 0; i < data.Count; i++)
+            {
+                GameObject itemGo = GameObject.Instantiate(liebiao, parentGo.transform);
+                XunJianLieBiaoItem item = itemGo.GetComponent<XunJianLieBiaoItem>();
+                item.updateData(data[i]);
+                itemList.Add(itemGo);
+            }
+           // chooseArea.options = new List<TMP_Dropdown.OptionData>();
+            foreach (var it in XunJianDataManager.Instance.areaList.Keys)
+            {
+                TMP_Dropdown.OptionData Ddata = new TMP_Dropdown.OptionData();
+                Ddata.text = it;
+                chooseArea.options.Add(Ddata);
+            }
+            //choosePeople.options = new List<TMP_Dropdown.OptionData>();
+            foreach (var it in XunJianDataManager.Instance.peopleList.Keys)
+            {
+                TMP_Dropdown.OptionData Ddata = new TMP_Dropdown.OptionData();
+                Ddata.text = it;
+                choosePeople.options.Add(Ddata);
+            }
+            TMP_Dropdown.OptionData Ddata2 = new TMP_Dropdown.OptionData();
+            Ddata2.text = "È«²¿µØÇø";
+            chooseArea.options.Add(Ddata2);
+            chooseArea.value = chooseArea.options.Count - 1;
+            TMP_Dropdown.OptionData Ddata3 = new TMP_Dropdown.OptionData();
+            Ddata3.text = "È«²¿ÈËÔ±";
+            choosePeople.options.Add(Ddata3);
+            choosePeople.value = choosePeople.options.Count - 1;
+
+            //chooseArea.onValueChanged.AddListener(areaChange);
+            //choosePeople.onValueChanged.AddListener(peopleChange);
+        });
+    }
+
     private void peopleChange(int arg0)
     {
         RemoveAll();