chenbin/tianrunCRM
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

android

Browse Source
This commit is contained in:
陈彬
2020-08-03 23:05:29 +08:00
parent f3ecc018ff
commit 9e8c6f080f
64 changed files with 325 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
Assets/CoolapeFrame/Editor/Tools/ECLUpgradeBindingServer.cs
View File

@@ -8,6 +8,7 @@ using System.Net;
public class ECLUpgradeBindingServer : EditorWindow
{
string contentStr;
Hashtable content;
Hashtable servers;
@@ -172,7 +173,7 @@ public class ECLUpgradeBindingServer : EditorWindow
} else {
GUI.color = Color.white;
}
EditorGUILayout.TextField (MapEx.getString (server, "idx"), GUILayout.Width (80));
EditorGUILayout.TextField (MapEx.getString (server, "id"), GUILayout.Width (80));
EditorGUILayout.TextField (MapEx.getString (server, "name"), GUILayout.Width (100));
GUI.color = Color.yellow;
#if UNITY_ANDROID
@@ -256,7 +257,7 @@ public class ECLUpgradeBindingServer : EditorWindow
server ["pkgName"] = MapEx.getString (d, "name");
server ["pkgRemark"] = MapEx.getString (d, "remark");
servers [key] = server;
saveData (MapEx.getString (server, "idx"), newMd5, vetType);
saveData (verKey);
}
}
}
@@ -283,42 +284,43 @@ public class ECLUpgradeBindingServer : EditorWindow
Hashtable d = paras [0] as Hashtable;
string platform = paras [1] as string;
string oldMd5 = "";
string verKey = "";
string vetType = "1";
if (platform.Equals("ios"))
{
verKey = "iosVer";
vetType = "1";
}
else if (platform.Equals("Android"))
{
verKey = "androidVer";
vetType = "2";
}
else if (platform.Equals("win"))
{
verKey = "winversion";
vetType = "3";
}
else if (platform.Equals("osx"))
{
verKey = "osxversion";
vetType = "4";
}
//
if (EditorUtility.DisplayDialog ("Alert", "Really want to upgrade all selected servers!!", "Okay", "Cancel")) {
foreach (DictionaryEntry cell in servers) {
Hashtable server = cell.Value as Hashtable;
if (MapEx.getBool (server, "selected")) {
string verKey = "";
string vetType = "1";
if (platform.Equals ("ios")) {
verKey = "iosVer";
vetType = "1";
}
else if (platform.Equals("Android"))
{
verKey = "androidVer";
vetType = "2";
}
else if (platform.Equals("win"))
{
verKey = "winversion";
vetType = "3";
}
else if (platform.Equals("osx"))
{
verKey = "osxversion";
vetType = "4";
}
oldMd5 = MapEx.getString (server, verKey);
string newMd5 = MapEx.getString (d, "md5");
if (!newMd5.Equals (oldMd5)) {
server [verKey] = newMd5;
server ["pkgName"] = MapEx.getString (d, "name");
server ["pkgRemark"] = MapEx.getString (d, "remark");
saveData (MapEx.getString (server, "id"), newMd5, verKey);
}
}
}
saveData(verKey);
}
}
@@ -349,7 +351,7 @@ public class ECLUpgradeBindingServer : EditorWindow
return null;
}
public void saveData (string serverID, string version, string verKey)
public void saveData (string verkey)
{
/*
string url = selectedServer.setServerPkgMd5Url;
@@ -362,8 +364,17 @@ public class ECLUpgradeBindingServer : EditorWindow
return;
response.Close ();
*/
Hashtable server = servers[serverID] as Hashtable;
server[verKey] = version;
Hashtable content = JSON.DecodeMap(contentStr);
Hashtable newservers = MapEx.getMap(content, CLCfgBase.self.appUniqueID.ToString());
//Hashtable server = servers[serverID] as Hashtable;
foreach (DictionaryEntry cell in servers)
{
Hashtable server = cell.Value as Hashtable;
Hashtable server2 = newservers[cell.Key] as Hashtable;
server2[verkey] = server[verkey];
}
string str = JSON.JsonEncode(content);
Debug.Log(str);
string path = Path.Combine(Application.dataPath, CLPathCfg.self.basePath, "serversCfg/servers.json");
@@ -389,9 +400,10 @@ public class ECLUpgradeBindingServer : EditorWindow
selectedServer.port4UploadUpgradePackage,
selectedServer.ftpUser,
selectedServer.ftpPassword);
string remotePath = Path.Combine(selectedServer.RemoteBaseDir, Path.GetFileName(serversFilePath.ToString()));
if (sftp.connect())
{
sftp.put(serversFilePath.ToString(), selectedServer.RemoteBaseDir, (Callback)onftpFinish);
sftp.put(serversFilePath.ToString(), remotePath, (Callback)onftpFinish);
sftp.disConnect();
sftp = null;
}
@@ -437,13 +449,13 @@ public class ECLUpgradeBindingServer : EditorWindow
HttpWebResponse response = HttpEx.CreateGetHttpResponse(url, 10000);
if (response == null)
return;
string str = HttpEx.readString (response);
contentStr = HttpEx.readString (response);
response.Close ();
// Debug.Log (url);
// string str = HttpEx.readString (url, null);
Debug.Log (str);
content = JSON.DecodeMap(str);
servers = MapEx.getMap(content, CLCfgBase.self.appUniqueID);
Debug.Log (contentStr);
content = JSON.DecodeMap(contentStr);
servers = MapEx.getMap(content, CLCfgBase.self.appUniqueID.ToString());
Hashtable server = null;
Hashtable pkg = null;
if (servers != null) {