server

Assets/CoolapeFrameData/cfg/publishChannel.cfg

@@ -1 +1 @@
-tBchannelMapr?generalp'FmBuildLocation@iosBuildDmProductNameD添添办公CisThirdExitJmBundleVersionCode
+tBchannelMaps?generalp'FmBuildLocation@iosBuildDmProductNameD添添办公CisThirdExitJmBundleVersionCode

Assets/trCRM/Plugins/Android/gen/android/telephony.meta

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

Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLIncludeBase.lua

@@ -202,7 +202,7 @@ function getChlCode()
     if chnCfg ~= nil then
         return MapEx.getString(chnCfg, "SubChannel")
     end
-    local chlCode = "1000"
+    local chlCode = "3000"
     chnCfg = getChlCfg()
     if (chnCfg ~= nil) then
         chlCode = MapEx.getString(chnCfg, "SubChannel")

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

@@ -203,9 +203,15 @@ function CLLPSplash.updateRes()
 end
 
 CLLPSplash.selectServer = function(callback)
-    local onGetServers = function(content, orgs)
+    local onGetServers4Channel = function(content, orgs)
         local _content = json.decode(content)
-        local servers = _content[tostring(CLCfgBase.self.appUniqueID)] or {}
+        local serverIds = _content[getChlCode()] or {}
+        local serversMap = orgs
+        local servers = {}
+        for i, sid in ipairs(serverIds) do
+            servers[i] = serversMap[sid]
+        end
+
         local userName = Prefs.getUserName()
         DBUser.isWhiteUser(
             userName,
@@ -218,6 +224,7 @@ CLLPSplash.selectServer = function(callback)
                     for key, v in pairs(servers) do
                         if v.isDev == 0 then
                             server = v
+                            break
                         end
                     end
                     Utl.doCallback(callback, server)
@@ -225,6 +232,32 @@ CLLPSplash.selectServer = function(callback)
             end
         )
     end
+
+    local onGetServers = function(content, orgs)
+        local _content = json.decode(content)
+        local servers = _content[tostring(CLCfgBase.self.appUniqueID)] or {}
+
+        -- 取得渠道对应的服务器
+        local url = joinStr(CLVerManager.self.baseUrl, "/servers4Channel.json")
+        WWWEx.get(
+            Utl.urlAddTimes(url),
+            nil,
+            CLAssetType.text,
+            onGetServers4Channel,
+            function()
+                CLUIUtl.showConfirm(
+                    "无法取得服务器，点击重试",
+                    function()
+                        CLLPSplash.selectServer(callback)
+                    end
+                )
+            end,
+            servers,
+            true,
+            2
+        )
+    end
+
     local url = joinStr(CLVerManager.self.baseUrl, "/servers.json")
     WWWEx.get(
         Utl.urlAddTimes(url),