From fa83767e3e288820ae29c1e723cf484a0b1df21d Mon Sep 17 00:00:00 2001 From: chenbin Date: Tue, 13 Oct 2020 23:42:48 +0800 Subject: [PATCH] server --- .../CoolapeFrameData/cfg/publishChannel.cfg | 2 +- .../Android/gen/android/telephony.meta | 8 ++++ .../priority/lua/public/CLLIncludeBase.lua | 2 +- .../priority/lua/ui/panel/CLLPSplash.lua | 37 ++++++++++++++++++- 4 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 Assets/trCRM/Plugins/Android/gen/android/telephony.meta diff --git a/Assets/CoolapeFrameData/cfg/publishChannel.cfg b/Assets/CoolapeFrameData/cfg/publishChannel.cfg index aca82a0..d34f02f 100644 --- a/Assets/CoolapeFrameData/cfg/publishChannel.cfg +++ b/Assets/CoolapeFrameData/cfg/publishChannel.cfg @@ -1 +1 @@ -tBchannelMapr?generalp'FmBuildLocation@iosBuildDmProductNameD添添办公CisThirdExitJmBundleVersionCode DmCtccChannel7CmSubChannel<1000FmBundleVersion=0.997ImKeystoreNamePath8 +Assets/trCRM/xRes/keystore/tianrun.keystoreEisUseUnityIAPEmKeyaliasPassCtianrun2020BisMoreGameGisSwitchAccountMmCreateEclipseProjectLmLicenseVerificationJmBundleIndentifierHcom.cdtianrun.moEmCopyDirPathsUAmPlatform?androidEmKeyaliasName?tianrun8(mOtherScriptingDefineSymbolsKUSE_LOCATION_SERVERAserverKey8,d265697d3e1ff6fe9435580ea91c4482Cmd5SignCode7BmAlertDesc7JisBuildWithLogView@mChlNmae?GeneralHmSplashImagePath7EmKeystorePassCtianrun2020HmDefaultIconPathv=72x72OtrCRM/xRes/icon/114.png?192x192OtrCRM/xRes/icon/180.png=48x48OtrCRM/xRes/icon/114.png=36x36OtrCRM/xRes/icon/114.png=96x96OtrCRM/xRes/icon/114.png?144x144OtrCRM/xRes/icon/180.pngBgeneraliOSp'FmBuildLocation@iosBuildDmProductNameD添添办公CisThirdExitJmBundleVersionCodeDmCtccChannel7FmBundleVersion;0.8ImKeystoreNamePath8 +Assets/trCRM/xRes/keystore/tianrun.keystoreEisUseUnityIAPCmSubChannel<2000EmKeyaliasPassCtianrun2020BisMoreGameGisSwitchAccountMmCreateEclipseProjectLmLicenseVerificationJmBundleIndentifierHcom.cdtianrun.moEmCopyDirPathsUAmPlatform;iosEmKeyaliasName?tianrun8(mOtherScriptingDefineSymbolsKUSE_LOCATION_SERVERAserverKey8,d265697d3e1ff6fe9435580ea91c4482Cmd5SignCode7BmAlertDesc7JisBuildWithLogView@mChlNmaeBGeneraliOSHmSplashImagePath7EmKeystorePassCtianrun2020HmDefaultIconPathp#?152x152OtrCRM/xRes/icon/180.png=76x76OtrCRM/xRes/icon/114.pngL1024x1024(App Store)PtrCRM/xRes/icon/1024.png=57x57OtrCRM/xRes/icon/114.png?120x120OtrCRM/xRes/icon/120.pngK20x20(Notification)OtrCRM/xRes/icon/114.png?144x144OtrCRM/xRes/icon/180.png=96x96OtrCRM/xRes/icon/114.png?192x192OtrCRM/xRes/icon/180.pngH40x40(Spotlight)OtrCRM/xRes/icon/114.pngJ120x120(Spotlight)OtrCRM/xRes/icon/120.pngK60x60(Notification)OtrCRM/xRes/icon/114.png=48x48OtrCRM/xRes/icon/114.pngK40x40(Notification)OtrCRM/xRes/icon/114.png=72x72OtrCRM/xRes/icon/114.png?180x180OtrCRM/xRes/icon/180.png=36x36OtrCRM/xRes/icon/114.pngG29x29(Settings)OtrCRM/xRes/icon/114.png?114x114OtrCRM/xRes/icon/114.pngG58x58(Settings)OtrCRM/xRes/icon/114.pngH80x80(Spotlight)OtrCRM/xRes/icon/114.pngG87x87(Settings)OtrCRM/xRes/icon/114.png?167x167OtrCRM/xRes/icon/180.pngCchannelEnumX?GeneralBGeneraliOSBchannelKeyX?generalBgeneraliOSHchannelAliasEnumX>通用A通用iOS \ No newline at end of file +tBchannelMaps?generalp'FmBuildLocation@iosBuildDmProductNameD添添办公CisThirdExitJmBundleVersionCode DmCtccChannel7CmSubChannel<1000FmBundleVersion=0.997ImKeystoreNamePath8 +Assets/trCRM/xRes/keystore/tianrun.keystoreEisUseUnityIAPEmKeyaliasPassCtianrun2020BisMoreGameGisSwitchAccountMmCreateEclipseProjectLmLicenseVerificationJmBundleIndentifierHcom.cdtianrun.moEmCopyDirPathsUAmPlatform?androidEmKeyaliasName?tianrun8(mOtherScriptingDefineSymbolsKUSE_LOCATION_SERVERAserverKey8,d265697d3e1ff6fe9435580ea91c4482Cmd5SignCode7BmAlertDesc7JisBuildWithLogView@mChlNmae?GeneralHmSplashImagePath7EmKeystorePassCtianrun2020HmDefaultIconPathv=72x72OtrCRM/xRes/icon/114.png?192x192OtrCRM/xRes/icon/180.png=48x48OtrCRM/xRes/icon/114.png=36x36OtrCRM/xRes/icon/114.png=96x96OtrCRM/xRes/icon/114.png?144x144OtrCRM/xRes/icon/180.png?tianrunp'FmBuildLocation@iosBuildDmProductNameD添添办公CisThirdExitJmBundleVersionCode DmCtccChannel7FmBundleVersion=0.997ImKeystoreNamePath8 +Assets/trCRM/xRes/keystore/tianrun.keystoreEisUseUnityIAPCmSubChannel<3000EmKeyaliasPassCtianrun2020BisMoreGameGisSwitchAccountMmCreateEclipseProjectLmLicenseVerificationJmBundleIndentifierHcom.cdtianrun.moEmCopyDirPathsUAmPlatform?androidEmKeyaliasName?tianrun8(mOtherScriptingDefineSymbolsKUSE_LOCATION_SERVERAserverKey8,d265697d3e1ff6fe9435580ea91c4482Cmd5SignCode7BmAlertDesc7JisBuildWithLogView@mChlNmae?tianrunHmSplashImagePath7EmKeystorePassCtianrun2020HmDefaultIconPathv=72x72OtrCRM/xRes/icon/114.png?192x192OtrCRM/xRes/icon/180.png=48x48OtrCRM/xRes/icon/114.png=36x36OtrCRM/xRes/icon/114.png=96x96OtrCRM/xRes/icon/114.png?144x144OtrCRM/xRes/icon/180.pngBgeneraliOSp'FmBuildLocation@iosBuildDmProductNameD添添办公CisThirdExitJmBundleVersionCodeDmCtccChannel7CmSubChannel<2000FmBundleVersion;0.8ImKeystoreNamePath8 +Assets/trCRM/xRes/keystore/tianrun.keystoreEisUseUnityIAPEmKeyaliasPassCtianrun2020BisMoreGameGisSwitchAccountMmCreateEclipseProjectLmLicenseVerificationJmBundleIndentifierHcom.cdtianrun.moEmCopyDirPathsUAmPlatform;iosEmKeyaliasName?tianrun8(mOtherScriptingDefineSymbolsKUSE_LOCATION_SERVERAserverKey8,d265697d3e1ff6fe9435580ea91c4482Cmd5SignCode7BmAlertDesc7JisBuildWithLogView@mChlNmaeBGeneraliOSHmSplashImagePath7EmKeystorePassCtianrun2020HmDefaultIconPathp#?152x152OtrCRM/xRes/icon/180.png=76x76OtrCRM/xRes/icon/114.pngL1024x1024(App Store)PtrCRM/xRes/icon/1024.png=57x57OtrCRM/xRes/icon/114.png?120x120OtrCRM/xRes/icon/120.pngK20x20(Notification)OtrCRM/xRes/icon/114.png?144x144OtrCRM/xRes/icon/180.png=96x96OtrCRM/xRes/icon/114.png?192x192OtrCRM/xRes/icon/180.pngH40x40(Spotlight)OtrCRM/xRes/icon/114.pngJ120x120(Spotlight)OtrCRM/xRes/icon/120.pngK60x60(Notification)OtrCRM/xRes/icon/114.png=48x48OtrCRM/xRes/icon/114.pngK40x40(Notification)OtrCRM/xRes/icon/114.png=72x72OtrCRM/xRes/icon/114.png?180x180OtrCRM/xRes/icon/180.png=36x36OtrCRM/xRes/icon/114.pngG29x29(Settings)OtrCRM/xRes/icon/114.png?114x114OtrCRM/xRes/icon/114.pngG58x58(Settings)OtrCRM/xRes/icon/114.pngH80x80(Spotlight)OtrCRM/xRes/icon/114.pngG87x87(Settings)OtrCRM/xRes/icon/114.png?167x167OtrCRM/xRes/icon/180.pngCchannelEnumY?GeneralBGeneraliOS?tianrunBchannelKeyY?generalBgeneraliOS?tianrunHchannelAliasEnumY>定制A定制iOSD天润版本 \ No newline at end of file diff --git a/Assets/trCRM/Plugins/Android/gen/android/telephony.meta b/Assets/trCRM/Plugins/Android/gen/android/telephony.meta new file mode 100644 index 0000000..537b98d --- /dev/null +++ b/Assets/trCRM/Plugins/Android/gen/android/telephony.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 12d49a1a05449429383d2dd5bc950c04 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLIncludeBase.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLIncludeBase.lua index 8a13421..6cea6c8 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLIncludeBase.lua +++ b/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") diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPSplash.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPSplash.lua index bb65866..eb14737 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPSplash.lua +++ b/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),