uu

Assets/CoolapeFrameData/verControl/android/ver4Upgrade.v

@@ -29,7 +29,7 @@ trCRM/upgradeRes/priority/lua/ui/cell/CLToastRoot.lua,5809bbdd4b059a64e8129c55b1
 trCRM/upgradeRes/other/uiAtlas/order/Android/close.unity3d,1b49cc4db64de50d13ee029447a3d49d
 trCRM/upgradeRes/other/uiAtlas/order/Android/xuanze.unity3d,2e0769c464e38c238cbf8e734f45303d
 trCRM/upgradeRes/priority/lua/ui/panel/CLLPCalender.lua,06ea21012958c4b42ca8122d1515ed1f
-trCRM/upgradeRes/priority/ui/panel/Android/PanelOceanList.unity3d,2cd4bfe3543e5421d6e37eaee92adff1
+trCRM/upgradeRes/priority/ui/panel/Android/PanelOceanList.unity3d,16c291d24fdd592bb0516485f87b3ecc
 trCRM/upgradeRes/other/uiAtlas/guid/Android/1.unity3d,7654268e7c4bc7cea47f584d306f503d
 trCRM/upgradeRes/other/uiAtlas/public/Android/tips_1.unity3d,aca2dfb1fbece45c7333447195bc7efe
 trCRM/upgradeRes/priority/lua/toolkit/LuaUtl.lua,cde8ec272382f95abe0320714201b387
@@ -54,7 +54,7 @@ trCRM/upgradeRes/other/uiAtlas/main/Android/icon_news2.unity3d,a35e85b68569bf1ad
 trCRM/upgradeRes/priority/ui/other/Android/AlertRoot.unity3d,c30044a6e7bf14ddb7a87c4f51d1f073
 trCRM/upgradeRes/priority/ui/other/Android/InputDate.unity3d,5a0421a465971e0f409444025e1e4fb4
 trCRM/upgradeRes/priority/lua/ui/panel/TRPGuid.lua,ee29c8c2537cd4c445afe1397450cdae
-trCRM/upgradeRes/priority/lua/ui/panel/TRPOceanList.lua,64ab018b6a3eb44f3ba92a07aa77a9f5
+trCRM/upgradeRes/priority/lua/ui/panel/TRPOceanList.lua,a3dc70580c8a7c1ea4904d53e17373a2
 trCRM/upgradeRes/other/uiAtlas/guid/Android/3.unity3d,6fafc74e9a154b5b3c19accabd3e11b0
 trCRM/upgradeRes/other/uiAtlas/public/Android/tips_4.unity3d,67187ab01b7b863b2a7f37b430212a3d
 trCRM/upgradeRes/priority/lua/bio/BioType.lua,4667e9def8191cbf2b9dc25e928bc23f
@@ -73,7 +73,7 @@ trCRM/upgradeRes/priority/lua/ui/panel/TRPNewCust.lua,c3f8563afb97d79992a35de8c3
 trCRM/upgradeRes/other/uiAtlas/login/Android/log_invisible.unity3d,e1a5814af01e17e83e9939c9f1839524
 trCRM/upgradeRes/other/uiAtlas/login/Android/log_sms.unity3d,8677ba455b4c85e5f1230986ff1032cf
 trCRM/upgradeRes/priority/lua/ui/panel/TRPConnect.lua,24712c363be3eef2c7e32413cc9f146d
-trCRM/upgradeRes/priority/lua/ui/panel/CLLPStart.lua,1ae83dcbbd5fb9481f29116da06fdb51
+trCRM/upgradeRes/priority/lua/ui/panel/CLLPStart.lua,a0942cd911e7f9db57a578f1d43aa55c
 trCRM/upgradeRes/other/uiAtlas/work/Android/work_bg_shadow.unity3d,10087f2ab389bdfd71cfce8a6c466038
 trCRM/upgradeRes/other/uiAtlas/work/Android/work_bg_noshadow.unity3d,4aee082b48104519ba82bad6aac83cf3
 trCRM/upgradeRes/other/uiAtlas/icon/Android/company_1.unity3d,8ba9f20b736fb17e2f6ee414df072492
@@ -154,7 +154,7 @@ trCRM/upgradeRes/priority/ui/panel/Android/PanelPopCheckBoxs.unity3d,d3a8693784b
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellOrderList.lua,d4a79966004672384a664700987d2533
 trCRM/upgradeRes/priority/lua/city/CLLCity.lua,b7ee9fffacb28d09ab08728a49dedc8e
 trCRM/upgradeRes/priority/lua/ui/panel/TRPComFilter.lua,847c4dd22654ad43a7048dc6b5f55e49
-trCRM/upgradeRes/priority/lua/ui/panel/TRPOrderList.lua,0416b5480e5b9ffa3493cda3347c1475
+trCRM/upgradeRes/priority/lua/ui/panel/TRPOrderList.lua,47b2dd82f0f529c58b08c44f9a8d6b60
 trCRM/upgradeRes/priority/lua/ui/panel/TRPFollowList.lua,04ac8069c9ba31fb240d8cd7ab1861ed
 trCRM/upgradeRes/priority/lua/public/CLLStack.lua,579069654d88a15e43c818a6b8079b15
 trCRM/upgradeRes/priority/lua/db/DBOrder.lua,8e8be2e549257d747b99e5149681ab19
@@ -192,7 +192,7 @@ trCRM/upgradeRes/other/uiAtlas/cust/Android/remove.unity3d,b460d3a275be876e0cfa0
 trCRM/upgradeRes/priority/ui/panel/Android/PanelMain.unity3d,a56567b78909e1992695a97cb19d3e1c
 trCRM/upgradeRes/other/uiAtlas/cust/Android/cus_tel.unity3d,692b010c775fb99d05d342f5ad0272fa
 trCRM/upgradeRes/priority/ui/panel/Android/PanelWebView.unity3d,e5372cdacc520ff8ba318ce09b681772
-trCRM/upgradeRes/priority/lua/db/DBUser.lua,04ddeb48500527c65b01ce965e0fce13
+trCRM/upgradeRes/priority/lua/db/DBUser.lua,bbd200dd301ee4e583c7ebbb6ace3b3a
 trCRM/upgradeRes/priority/lua/ui/panel/TRBasePanel.lua,dc088058987b435c998a9709297a88e6
 trCRM/upgradeRes/priority/lua/public/class.lua,cc0f201cc55c59f8bc8f623853382b9c
 trCRM/upgradeRes/other/uiAtlas/login/Android/log_bg.unity3d,a7398f0f48b3b469e31bea6dac45457e
@@ -280,7 +280,7 @@ trCRM/upgradeRes/other/uiAtlas/news/Android/news_1.unity3d,51120d82352e936df826b
 trCRM/upgradeRes/other/uiAtlas/cust/Android/add.unity3d,ceb10233c0fc59270d66e1cb5c93bb49
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellProductSelected.lua,e7f4b1e06a54d5fa52cf9a4ed00f5233
 trCRM/upgradeRes/priority/lua/public/CLLIncludeBase.lua,87bcfc58c6d99be6fe89102d7323c95e
-trCRM/upgradeRes/priority/lua/ui/panel/TRPCustList.lua,36d78a08fe9233e90a9b65e9da709ad7
+trCRM/upgradeRes/priority/lua/ui/panel/TRPCustList.lua,12c68dcd0ae5e5bbf33d7df623eef6bf
 trCRM/upgradeRes/priority/ui/panel/Android/PanelMine.unity3d,4ae16367e048f6856c2eec27230c19c3
 trCRM/upgradeRes/priority/lua/cfg/DBCfg.lua,3d0e60dbcdaa61b8553eee17f4d68b32
 trCRM/upgradeRes/other/txt/Android/serviceProto.unity3d,8227f724d4bf3276e5db7459afcf0170

Assets/CoolapeFrameData/verControl/android/ver4UpgradeMd5.v

@@ -31,7 +31,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_unread.unity3d,f1b29d85
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLToastRoot.lua,5809bbdd4b059a64e8129c55b146b514
 trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/xuanze.unity3d,2e0769c464e38c238cbf8e734f45303d
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPCalender.lua,06ea21012958c4b42ca8122d1515ed1f
-trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOceanList.unity3d,2cd4bfe3543e5421d6e37eaee92adff1
+trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOceanList.unity3d,16c291d24fdd592bb0516485f87b3ecc
 trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/1.unity3d,7654268e7c4bc7cea47f584d306f503d
 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_1.unity3d,aca2dfb1fbece45c7333447195bc7efe
 trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_visible.unity3d,884f69f0dd0c2a58af5ad891f23e985e
@@ -58,7 +58,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/main/Android/icon_news2.unity3d,a35e85b68
 trCRM/upgradeRes4Publish/priority/ui/other/Android/AlertRoot.unity3d,c30044a6e7bf14ddb7a87c4f51d1f073
 trCRM/upgradeRes4Publish/priority/ui/other/Android/InputDate.unity3d,5a0421a465971e0f409444025e1e4fb4
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPGuid.lua,ee29c8c2537cd4c445afe1397450cdae
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOceanList.lua,64ab018b6a3eb44f3ba92a07aa77a9f5
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOceanList.lua,a3dc70580c8a7c1ea4904d53e17373a2
 trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/3.unity3d,6fafc74e9a154b5b3c19accabd3e11b0
 trCRM/upgradeRes4Publish/other/uiAtlas/coolape/Android/password.unity3d,ae473953dbd84c6f9a4e736f5101f4a2
 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_4.unity3d,67187ab01b7b863b2a7f37b430212a3d
@@ -74,7 +74,7 @@ trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectServer.lua,8979777d66bc6
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelLogin.unity3d,5cac11a5557933d49c37a554c76a730f
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/cus_followup.unity3d,a722ae8374cf3aa0fd87fc6d74ddabfd
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua,c3f8563afb97d79992a35de8c3ee9ba6
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderList.lua,0416b5480e5b9ffa3493cda3347c1475
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderList.lua,47b2dd82f0f529c58b08c44f9a8d6b60
 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_time.unity3d,16ca1ec9a44b8633ca032c3c8cdf1a9b
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPConnect.lua,24712c363be3eef2c7e32413cc9f146d
 trCRM/upgradeRes4Publish/priority/lua/public/CLLIncludeBase.lua,87bcfc58c6d99be6fe89102d7323c95e
@@ -109,7 +109,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/kuang.unity3d,a6ce8e74b0631e
 trCRM/upgradeRes4Publish/other/uiAtlas/logo/Android/logo2.unity3d,1bddae3d3fe67d91fc6b5c6f9dbb0bea
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICellPoplist.lua,18d47301d459fd66ed63b902546e8619
 trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/sms.unity3d,9d63dc8f82de2f772e544b8c8518021b
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPStart.lua,1ae83dcbbd5fb9481f29116da06fdb51
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPStart.lua,a0942cd911e7f9db57a578f1d43aa55c
 trCRM/upgradeRes4Publish/other/uiAtlas/main/Android/icon_me.unity3d,b6060c4f6b1cf669b21b5d4f8b23efbe
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPlaySoundRecord.unity3d,14e1a1da65735a1ac9a4256be49a4e40
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/phone.unity3d,36e34519b910a11de3531994f607a140
@@ -196,7 +196,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/remove.unity3d,b460d3a275be8
 trCRM/upgradeRes4Publish/other/uiAtlas/hotwheel/Android/loading.unity3d,2f74f17f1282c12ab63108377b4798e0
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/cus_tel.unity3d,692b010c775fb99d05d342f5ad0272fa
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelWebView.unity3d,e5372cdacc520ff8ba318ce09b681772
-trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua,04ddeb48500527c65b01ce965e0fce13
+trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua,bbd200dd301ee4e583c7ebbb6ace3b3a
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRBasePanel.lua,dc088058987b435c998a9709297a88e6
 trCRM/upgradeRes4Publish/priority/lua/public/class.lua,cc0f201cc55c59f8bc8f623853382b9c
 trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_bg.unity3d,a7398f0f48b3b469e31bea6dac45457e
@@ -280,7 +280,7 @@ trCRM/upgradeRes4Publish/priority/lua/toolkit/CLLUpdateUpgrader.lua,bfff3548aa7c
 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/news_1.unity3d,51120d82352e936df826b05696b89b19
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/add.unity3d,ceb10233c0fc59270d66e1cb5c93bb49
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProductSelected.lua,e7f4b1e06a54d5fa52cf9a4ed00f5233
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustList.lua,36d78a08fe9233e90a9b65e9da709ad7
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustList.lua,12c68dcd0ae5e5bbf33d7df623eef6bf
 trCRM/upgradeRes4Publish/priority/lua/toolkit/LuaUtl.lua,cde8ec272382f95abe0320714201b387
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMine.unity3d,4ae16367e048f6856c2eec27230c19c3
 trCRM/upgradeRes4Publish/priority/lua/cfg/DBCfg.lua,3d0e60dbcdaa61b8553eee17f4d68b32

Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua

@@ -108,4 +108,32 @@ function DBUser.hadPermission(key)
     return rolePermission[key] or false
 end
 
+function DBUser.isWhiteUser(userName, callback)
+    if isNilOrEmpty(userName) then
+        Utl.doCallback(callback, false)
+        return false
+    end
+    if DBUser.whiteNames == nil then
+        local url = Utl.urlAddTimes(joinStr(CLVerManager.self.baseUrl, "/whitList.json"))
+        WWWEx.get(
+            url,
+            CLAssetType.text,
+            function(content)
+                DBUser.whiteNames = json.decode(content)
+                Utl.doCallback(callback, DBUser.whiteNames[userName])
+            end,
+            function()
+                Utl.doCallback(callback, false)
+            end,
+            nil,
+            true,
+            1
+        )
+        return false
+    else
+        Utl.doCallback(callback, DBUser.whiteNames[userName])
+        return DBUser.whiteNames[userName]
+    end
+end
+
 return DBUser

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPStart.lua

@@ -42,13 +42,20 @@ function CLLPStart.setLuasAtBegainning()
 
     -- 日志监听
     if ReporterMessageReceiver.self and ReporterMessageReceiver.self.gameObject then
-        -- if KKWhiteList.isWhiteName() then
         ReporterMessageReceiver.self.gameObject:SetActive(false)
-    -- else
-    --     ReporterMessageReceiver.self.gameObject:SetActive(false)
-    -- end
     end
 
+    DBUser.isWhiteUser(
+        Prefs.getUserName(),
+        function(iswhite)
+            if iswhite then
+                if ReporterMessageReceiver.self and ReporterMessageReceiver.self.gameObject then
+                    ReporterMessageReceiver.self.gameObject:SetActive(true)
+                end
+            end
+        end
+    )
+
     MyUtl.init(csSelf)
 
     CLPanelManager.self.mainPanelName = "PanelMain"
@@ -191,8 +198,7 @@ function CLLPStart.doEnterGame()
         NetProto.login(
             {
                 phone = Prefs.getUserName(),
-                password = Prefs.getUserPsd(),
+                password = Prefs.getUserPsd()
-                model=SystemInfo.deviceModel
             },
             function(content, orgs)
                 if content.success then
@@ -266,24 +272,16 @@ CLLPStart.selectServer = function(callback)
         Utl.doCallback(callback)
         return
     end
-    local url = Utl.urlAddTimes(PStr.b():a(CLVerManager.self.baseUrl):a("/whitList.json"):e())
+
-    WWWEx.get(
+    DBUser.isWhiteUser(
-        url,
+        userName,
-        CLAssetType.text,
+        function(iswhite)
-        function(content)
+            if iswhite then
-            local map = json.decode(content)
-            if map[userName] then
                 getPanelAsy("PanelSelectServer", onLoadedPanelTT, {callback = callback})
             else
                 Utl.doCallback(callback)
             end
-        end,
+        end
-        function()
-            Utl.doCallback(callback)
-        end,
-        nil,
-        true,
-        1
     )
 end
 

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustList.lua

@@ -239,7 +239,13 @@ end
 
 function TRPCustList:resetFilters()
     for i, v in ipairs(self.filters) do
-        v.selected = false
+        if v.list then
+            for j, f in ipairs(v.list) do
+                f.selected = false
+            end
+        else
+            v.value = ""
+        end
     end
 end
 

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOceanList.lua

@@ -69,12 +69,6 @@ function TRPOceanList:initFilters()
     end
 end
 
-function TRPOceanList:resetFilters()
-    for i, v in ipairs(self.filters) do
-        v.selected = false
-    end
-end
-
 -- 设置数据
 ---@param paras _ParamTRPOceanList
 function TRPOceanList:setData(paras)
@@ -152,7 +146,8 @@ function TRPOceanList:initCell(cell, data)
 end
 
 function TRPOceanList:onClickCell(cell, data)
-    getPanelAsy("PanelOrderDetail", onLoadedPanelTT, data)
+    --//TODO:
+    -- getPanelAsy("PanelOrderDetail", onLoadedPanelTT, data)
 end
 
 function TRPOceanList:refreshFilterBtnStatus()
@@ -218,7 +213,7 @@ function TRPOceanList:setEventDelegate()
                 "PanelComFilter",
                 onLoadedPanelTT,
                 {
-                    title = "订单筛选",
+                    title = "公海筛选",
                     callback = self:wrapFunc(self.onSetFilter),
                     queryKey = uiobjs.InputSeachKey.value,
                     defautFilter = self.filters
@@ -232,6 +227,18 @@ function TRPOceanList:setEventDelegate()
     }
 end
 
+function TRPOceanList:resetFilters()
+    for i, v in ipairs(self.filters) do
+        if v.list then
+            for j, f in ipairs(v.list) do
+                f.selected = false
+            end
+        else
+            v.value = ""
+        end
+    end
+end
+
 function TRPOceanList:getFilterStr()
     if not self.filters then
         return ""
@@ -249,7 +256,7 @@ function TRPOceanList:getFilterStr()
         elseif g.key == "createTime" then
             --//TODO:
         elseif g.key == "updateTime" then
-            --//TODO:
+        --//TODO:
         end
     end
     return ret

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderList.lua

@@ -82,7 +82,13 @@ end
 
 function TRPOrderList:resetFilters()
     for i, v in ipairs(self.filters) do
-        v.selected = false
+        if v.list then
+            for j, f in ipairs(v.list) do
+                f.selected = false
+            end
+        else
+            v.value = ""
+        end
     end
 end
 

Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOceanList.prefab

@@ -972,7 +972,7 @@ MonoBehaviour:
     target: {fileID: 0}
     relative: 1
     absolute: 0
-  updateAnchors: 0
+  updateAnchors: 1
   mColor: {r: 0.8, g: 0.8, b: 0.8, a: 0.7058824}
   mPivot: 4
   mWidth: 204
@@ -2208,7 +2208,7 @@ MonoBehaviour:
     target: {fileID: 0}
     relative: 1
     absolute: 0
-  updateAnchors: 0
+  updateAnchors: 1
   mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
   mPivot: 4
   mWidth: 144

Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl.ver

@@ -1 +1 @@
-r8	(trCRM/resVer/Android/VerCtl/priority.ver8,0c7857a1831144f66d92c34bbc4c996d8	%trCRM/resVer/Android/VerCtl/other.ver8,b9c84be6298806fb21f27e9be837734d
+r8	(trCRM/resVer/Android/VerCtl/priority.ver8,b661dc13be6252f388111b3e6948ab198	%trCRM/resVer/Android/VerCtl/other.ver8,b9c84be6298806fb21f27e9be837734d