Commit c016dfb1 authored by 潘梓豪's avatar 潘梓豪

调整启动方法 使用了参数启动

parent 4a32dfde
......@@ -19,7 +19,7 @@ public class ValManager : MonoBehaviour
[Tooltip("软件可修改设置")]
public ConfigSetting Setting;
IEnumerator Start()
/*IEnumerator Start()
{
//string path = "C:\\Users\\Zeus_PC\\Desktop\\testval\\ReqData.json";
string path = "ReqData.json";
......@@ -87,8 +87,61 @@ public class ValManager : MonoBehaviour
text.text = "丢失参数文件,请在ZeusHub中启动软件";
}
yield return null;
}*/
IEnumerator Start()
{
//string path = "C:\\Users\\Zeus_PC\\Desktop\\testval\\ReqData.json";
//string path = "ReqData.json";
string[] arg= Environment.GetCommandLineArgs();
if(arg!=null && arg.Length > 1)
{
//重定向项目路径
Directory.SetCurrentDirectory(arg[3]);
ConfigSetting saved_setting = ConfigSetting.Instant;
if (saved_setting == null)
{
saved_setting = ConfigSetting.Instant = Setting;
}
Setting = saved_setting;
//获取本机code
string code = getMNum();
//通过机器码code、产品id判读是否已校验
using (var rq = UnityWebRequest.Get(arg[4] + "/getRobotCode?productionid=" + arg[2] + "&code=" + code))
{
rq.SetRequestHeader("Authorization", arg[1]);
yield return rq.SendWebRequest();
if (string.IsNullOrEmpty(rq.error))
{
Dictionary<string, object> jsonData = JsonMapper.ToObject<Dictionary<string, object>>(rq.downloadHandler.text);
string scene = (string)jsonData.Where(S => S.Key == "LoadScene").Select(S => S.Value).First();
if (scene != null && !scene.Equals(""))
{
text.text = "验证成功,正在跳转。。。";
SceneManager.LoadScene(scene);
//删除参数配置文件
//File.Delete(path);
}
else
{
text.text = "没有注册码,请先注册";
}
}
}
}
else
{
text.text = "丢失参数文件,请在ZeusHub中启动软件";
}
yield return null;
}
//生成机器码
public static string getMNum()
{
......
......@@ -8,12 +8,13 @@ using UnityEngine;
public class ProgressUntily : MonoBehaviour
{
Process process = new Process();
public void CallProress(string path)
public void CallProress(string path,string arg)
{
try
{
process.StartInfo.UseShellExecute = false;
process.StartInfo.FileName = path;
process.StartInfo.Arguments =arg;
process.StartInfo.CreateNoWindow = true;
process.StartInfo.RedirectStandardInput = true;
process.StartInfo.RedirectStandardOutput = true;
......
......@@ -77,7 +77,7 @@ public class WelBorews : MonoBehaviour
}
private IEnumerator _getProcessStart()
/*private IEnumerator _getProcessStart()
{
string api = Setting.IP + "/zeus/es3cloud/getAutoSend";
......@@ -111,13 +111,13 @@ public class WelBorews : MonoBehaviour
}
yield return new WaitForSeconds(1);
}
}
}*/
public void InitData()
{
browser.RegisterFunction("startProgram", (JSONNode jk) => {
startProcess(jk[0].Value+"",jk[1].Value+"");
startProcess(jk[0].Value+"",jk[1].Value+"",jk[2].Value+"");
});
browser.RegisterFunction("downloadProgram", (JSONNode jk) => {
......@@ -147,7 +147,7 @@ public class WelBorews : MonoBehaviour
//启动程序
public void startProcess(string id,string path)
public void startProcess(string id,string path,string val_path)
{
if (File.Exists(path))
{
......@@ -176,7 +176,12 @@ public class WelBorews : MonoBehaviour
if (System.IO.File.Exists("ReqData.json"))
{
ProgressUntily progressUntily = new ProgressUntily();
progressUntily.CallProress(path);
string argument1 = "\"" + manager.token + "\"";
string argument2 = "\"" + id + "\"";
string argument3= "\"" + path.Substring(0, path.LastIndexOf("/")) + "\"";
string argument4 = "\"" + val_path + "\"";
progressUntily.CallProress(path,argument1+" "+ argument2+" "+argument3+" "+argument4);
}
}
}else
......
......@@ -310,7 +310,7 @@ GameObject:
- component: {fileID: 1121117389}
- component: {fileID: 1121117388}
m_Layer: 5
m_Name: Canvas
m_Name: "\u672C\u5730\u9A8C\u8BC1"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
......
fileFormatVersion: 2
guid: 179d30774b871b243b216cc702e1eed2
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -944,7 +944,7 @@
success:function(data){
if(data.path!=null && data.path!=""){
//调用c#方法 启动软件
startProgram($(that).attr("data-id"),data.path);
startProgram($(that).attr("data-id"),data.path,data.val_path);
}else{
alert("请先配置软件路径");
}
......
......@@ -1053,7 +1053,7 @@
success:function(data){
if(data.path!=null && data.path!=""){
//调用c#方法 启动软件
startProgram($(that).attr("data-id"),data.path);
startProgram($(that).attr("data-id"),data.path,data.val_path);
}else{
alert("请先配置软件路径");
}
......
{"token":"Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImp0aSI6IjQxZWQ1NTZlZjM2NzE4ZWQ2MjZkYjI1N2YzODJjNzVhNGQxZWZmYzk5ZmIxNmZlOWI1YzM3NGE1Y2Q2YzFhN2IxNDE1OTJmMWY2OWUxNDVhIn0.eyJhdWQiOiIyYmM1ZjE1Zi0wNzE3LTQ4ZjktYTc4Mi03NzQ5M2FjNDUwODQiLCJqdGkiOiI0MWVkNTU2ZWYzNjcxOGVkNjI2ZGIyNTdmMzgyYzc1YTRkMWVmZmM5OWZiMTZmZTliNWMzNzRhNWNkNmMxYTdiMTQxNTkyZjFmNjllMTQ1YSIsImlhdCI6MTY2MTI0MTMxMiwibmJmIjoxNjYxMjQxMzEyLCJleHAiOjE2NjE1NDEzMTIsInN1YiI6IjgzNiIsInNjb3BlcyI6WyJhdXRoZW50aWNhdGVkIl19.HEG49ki4AiO8NOlX2jTzPtjMFh6JoXskFPgSWxwkM5y0XocvEoQ0Vx9P7octNEDQEdQ3CTDvwDFt5Lw-C5IFeVgOe5_nDnaZpznNY9mSS9F1WfCmUFovp1N1gHbyDWcipUrTzllyd3-VPemI9cJv3om_4VbUVKWrCy14pmPwGQGYgY5ZlNHj7VYS24NO9E6IoEZZm9neqzNHRl0BoDSY7EYnC48jUyUtw5pHPfHBmMs_Mqbcl96ra8_MYA0EG2tXuEXc7O7BEFCIx7pf4RjGVceGgj2SloBhdlKlzpOgDQ9mKMBG7d0JjcPXXPUeYSiD9ayZDosHmrXTYAdecnaJ3wDwKclC7dYaymnPftRjAa2tg9uo-uUih40OXzw_UFvbsIq90r8QY_4opDuHNOEMPz2b6kP6rzubts2hNzMpF_0aTwqquoYK8xlm115-umtd_TwC85J2OCNhXVwRLmXKJxJFEyG39c7_77l6rUNhOK4ObH9u1HE3qAf-GPoxxzggrlKPqc51ksUyHWzAtJbJ3Splqe9qvHJsPizNN2r4Wz2QnTzpcY5qa4maDIzuCrp4mRTiL4EKVptTy-TdcRCg6_-kC0xgY1T6i6ypAlK2vSUqLaOvsPy3YHRZhqSod4iwt6fGw8zAMyXMohG59bidmDilAKeqSfrG-a3JcCLPv7w","productionid":"12698","filepath":"D://DownloadDemo/TIYANGUAN"}
\ No newline at end of file
{"token":"Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImp0aSI6ImFmMzRjNWNhYWFiOGMzMzU1ZmRjNTE0MTEwOWMyODFjNDRhNDE0N2QzZGYxMjRhZGY3MTA0Mzg1YmZmZmFmOTc0NGI4MzY5YjViZmJjOTUwIn0.eyJhdWQiOiIyYmM1ZjE1Zi0wNzE3LTQ4ZjktYTc4Mi03NzQ5M2FjNDUwODQiLCJqdGkiOiJhZjM0YzVjYWFhYjhjMzM1NWZkYzUxNDExMDljMjgxYzQ0YTQxNDdkM2RmMTI0YWRmNzEwNDM4NWJmZmZhZjk3NDRiODM2OWI1YmZiYzk1MCIsImlhdCI6MTY2OTg4NDYyMSwibmJmIjoxNjY5ODg0NjIxLCJleHAiOjE2NzAxODQ2MjEsInN1YiI6IjgzNiIsInNjb3BlcyI6WyJhdXRoZW50aWNhdGVkIl19.wKLBHrcTkC83ymD78RJxcmj5xCXaFPlT71cMxxxNi7qLqZalPISh7AYtGRQgzuo7pFYdc9_ogQ6O3y4Ucm4ODjlXIsxkdJmr_mV9AfkOHlCOhK0WWJNxRR3X5EG3meiY0v7mx4Aq12dXzXd0-48DELRDHn87mPGhLc8Ml_Kv_7wv0Naf9HY_ClvfjssaVN1sXb7BkzBVkT6hVmAP7Ed_Fe8IQH0Nu0I2_geSudqw3bK2PSm5yRfO5GLGoLdVU9v1SSp8Tn2ELAwewigZeJ1X3GPJSIh3lgmU_JhK_4ak3Hdcv5W6XmuTeBbF9PpK2rKfG1CUniHjIue2VhibP-ZU80cVunX5Zlz9JNl_9X8_nAmBcsce-PNKuybScB7IvCpCqjoOvEjj4lv_CVxwXH-HMg1Bfwm5F7OgKSz-of8IRG70XL0A7JoXCTi6MFN8TnHb6fyyUzx0vWXyvznbg9YeRNPT6GVffS8LIlFLOmrryu0lM4S06ITnMMX5ggJ19sYGg46zbVHy9UuFkxuZIH13JbfSq0wBGGp8hZeNg7xvrNw9F9oLQ_Y-Ihz9KKk64ZbGQ3gmsqaYLcC5nD-n18ZnhuBRL_nbC6VXJImm3QWpfSpz5NWBxPpdVVCiwDnKSViLE2v86xbGXBxaFbxhSMe5-aFS_IJkeJUVrCiXMlc1l8k","productionid":"12679","filepath":"D://DownloadDemo/HUBDemo1"}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment