Explorar el Código

Z991239-4839 #comment feat: 修改uos关闭cefclient的方式

陈纪林80310970 hace 2 años
padre
commit
eb7672da10

+ 34 - 0
addin/res/ManagerDesktop/js/entityService.js

@@ -675,6 +675,40 @@ var HealthManagerService={
 };
 
 
+var ChromiumSrv={
+    _serviceBase:{
+        entityName : 'Chromium',
+        className : 'ChromiumSrv'
+    },
+    _methodID : {
+        CloseBrowser: 1,
+    },
+            
+    _methodSignature :{
+        CloseBrowser: -1561571899,
+    },
+    init:function(){
+        //start session
+        var sessionMsg = new Session();
+        sessionMsg.entity = this._serviceBase.entityName;
+        sessionMsg.class = this._serviceBase.className;
+        WebSocketBase.startSession(sessionMsg, function() {
+            logEvent("Chromium startSession callback");
+        });
+    },
+    CloseBrowser:function(req,callback){
+        req.entity = this._serviceBase.entityName;
+		req.class = this._serviceBase.className;
+		req.methodID = this._methodID.CloseBrowser;
+		req.signature = this._methodSignature.CloseBrowser;
+		WebSocketBase.sendMsg(req, function(data) {
+            var jsondata = JSON.parse(data);
+            callback(jsondata);
+        });
+    }
+
+};
+
 //注册DeviceService
 var DeviceService= {
     _eventCode:{

+ 21 - 4
addin/res/ManagerDesktop/js/getTerminalInfo.js

@@ -36,6 +36,7 @@ window.onload=function(){
   HealthManagerService.init();
   CenterSettingService.init();
 	ResourceWatcherService.init();
+	ChromiumSrv.init();
   getHardwareInfo()
   // getAccessUrl()
 	getCertainAceessUrl() //准入接口
@@ -202,10 +203,26 @@ function closeModal(type){
 
 // 关闭错误页
 function chromiumClose(){
-		let req = {};
-		req.messageType = 0;
-		req.command = 'ChromiumClose';
-		sendRequest(req); 
+		// let req = {};
+		// req.messageType = 0;
+		// req.command = 'ChromiumClose';
+		// sendRequest(req); 
+	let req = new Request()
+	req.type = "SpecialPageFromOtherEntity";
+	req.name = "tempMessage";
+	let timeoutFn= setTimeout(function(){
+		let tips = '请求超时'
+		ModalPrompt(tips, 'pathN')
+	},60000)
+		
+	ChromiumSrv.CloseBrowser(req, function(ret) {
+		logEvent("CloseBrowser ret: "+JSON.stringify(ret));
+		console.log("CloseBrowser ret: "+JSON.stringify(ret));
+		if(ret){
+			clearTimeout(timeoutFn);
+		}
+		
+	})
 }
 
 function sendRequest(request){