软电话修改

CallCenterWeb.UI/callScreen/callScreen.html

@@ -988,6 +988,7 @@
 		<script src="../js/comboSelect/jquery.combo.select.js"></script>
 		<script src="./../js/main.js?v=1.5"></script>
 		<script src="call.js"></script>
+		
 	</body>
 
 </html>

CallCenterWeb.UI/index.html

@@ -545,7 +545,6 @@
                         <button class="btnn" id="rotateLeft" type="button">左旋转</button>
                         <button class="btnn" id="rotateRight" type="button">右旋转</button>
                         <button class="btnn" id="setDrag" type="button">确定保存</button>
-
                     </div>
                 </div>
             </div>
@@ -594,13 +593,16 @@
         </div>
         <div class="phone_btn_bot">
     		<div class="posbtn1 testCall" onclick="testCall()"><img src="img/call_out-icon.png"/></div>
-    		<div class="posbtn2 phoneNum_clear">清除</div>
-    		<div class="posbtn3 hangup" onclick="hangup()"><img src="img/hangu-iconp.png"/></div>
+    		
+    		<div class="posbtn2 phoneNum_clear" style="left: 45%;">清除</div>
+    		<div class="posbtn3 testCall" style="right: 24%;" onclick="inCall()"><img src="img/call_out-icon.png"/></div>
+    		<div class="posbtn3 hangup" style="right: 7%;" onclick="hangup()"><img src="img/hangu-iconp.png"/></div>
     	</div>
     </div>
+    <video id="videoView" hidden="hidden" width="420px" height="320px" autoplay></video>
     <div class="stringData"></div>
     <div class="stringData1"></div>
-     <div class="stringData2"></div>
+    <div class="stringData2"></div>
     <script src="./js/plugins/pace/pace.min.js"></script>
     <script src="./js/plugins/iCheck/icheck.min.js"></script>
     <script src="./css/laydate/laydate.js"></script>

CallCenterWeb.UI/js/index.js

@@ -977,10 +977,10 @@ $('.open-softphone').click(function () {
     	$(".softphone-box").css("display","none");
     	$(".softphone-box").removeClass("active fadeInRight animated");
     }else{
-    	testStart();
-		setTimeout(function () {
-			reg();
-		}, 2000)
+//  	testStart();
+//		setTimeout(function () {
+//			reg();
+//		}, 2000)
     	$(".td-call").hide();
     	$(".tooltip_text").text("分机号："+$.cookie("extno"))
 		$(".softphone-box").css("display","block");

CallCenterWeb.UI/js/main.js

@@ -282,7 +282,13 @@ function DropCallBack() {
 	if(window.frames['iframe'+ hidCallID +'']){
 		 window.frames['iframe'+ hidCallID +''].$(".td-call").hide();
 	}
-
+	$(".tooltip_text").text("通话结束...");
+//	timeStrart=true;
+//	timeReg=true;
+//	testStart();
+//	setTimeout(function () {
+//		reg();
+//	}, 2000)
 
 }
 //线路状态通知

CallCenterWeb.UI/js/softphone.js

@@ -98,6 +98,7 @@
  		});
  		data.session.on('confirmed', function(data) {
  			$(".tooltip_text").text("通话中...") //呼入建立
+ 			$(".hwzt").text('通话中');
  			thjsTel=true;
  			calling();
 // 			if(stringHr_1){
@@ -159,16 +160,20 @@
  		debugger
  		$(".tooltip_text").text("通话结束...");
  		clearInter();
- 		//layer.msg('呼叫结束', e); //对方挂机，通话结束
+// 		timeStrart=true;
+// 		timeReg=true;
+// 		testStart();
+//		setTimeout(function () {
+//			reg();
+//		}, 2000)
+ 		
  	},
  	'confirmed': function(e) {
  		$(".tooltip_text").text("呼叫建立...");
  		//layer.msg('呼叫建立');
  	}
  };
-
- function testCall() {
- 	//呼入接听
+function inCall () {
 	if (incomingSession) {
 		incomingSession.answer({
 			'mediaConstraints': {
@@ -182,30 +187,32 @@
 			'mediaStream': localStream
 		});
 		incomingSession = null;
-	}else{
-//		外呼拨打
-		var sip_phone_number_ = document.getElementById("sip_phone_number").value.toString();
-	 	var options = {
-	 		'eventHandlers': eventHandlers,
-	 		'mediaConstraints': {
-	 			'audio': true,
-	 			'video': false,
-	 			mandatory: {
-	 				maxWidth: 640,
-	 				maxHeight: 360
-	 			}
-	 		},
-	 		'mediaStream': localStream
-	 	};
-	 	outgoingSession = userAgent.call(sip_phone_number_, options);
-	 	
-	 	var p = '<a  style="background: #24c792; color: #FFFFFF;" href="javascript:;" class="active J_menuTab" data-id="./callScreen/OutCallScreen.html?Number=' + sip_phone_number_+'">外呼弹屏<i class="fa fa-times-circle"></i></a>';
-		$(".J_menuTab").removeClass("active");
-		var nif = '<iframe class="J_iframe J_iframeNew" name="iframe"  width="100%" height="100%" src="./callScreen/OutCallScreen.html?Number=' + sip_phone_number_+'"></iframe>';
-		$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(nif);
-		$(".J_menuTabs .page-tabs-content").append(p);
 	}
 	
+}	
+ function testCall() {
+//		外呼拨打
+	var sip_phone_number_ = document.getElementById("sip_phone_number").value.toString();
+ 	var options = {
+ 		'eventHandlers': eventHandlers,
+ 		'mediaConstraints': {
+ 			'audio': true,
+ 			'video': false,
+ 			mandatory: {
+ 				maxWidth: 640,
+ 				maxHeight: 360
+ 			}
+ 		},
+ 		'mediaStream': localStream
+ 	};
+ 	outgoingSession = userAgent.call(sip_phone_number_, options);
+ 	
+ 	var p = '<a  style="background: #24c792; color: #FFFFFF;" href="javascript:;" class="active J_menuTab" data-id="./callScreen/OutCallScreen.html?Number=' + sip_phone_number_+'">外呼弹屏<i class="fa fa-times-circle"></i></a>';
+	$(".J_menuTab").removeClass("active");
+	var nif = '<iframe class="J_iframe J_iframeNew" name="iframe"  width="100%" height="100%" src="./callScreen/OutCallScreen.html?Number=' + sip_phone_number_+'"></iframe>';
+	$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(nif);
+	$(".J_menuTabs .page-tabs-content").append(p);
+	
  }
 
  function reg() {
@@ -222,11 +229,12 @@
  	setInterval(function() {
  		timeStrart=true;
  		timeReg=true;
- 		testStart();
-		setTimeout(function () {
-			reg();
-		}, 2000)
-	}, 1000*30);
+ 		//testStart();
+ 		reg();
+//		setTimeout(function () {
+//			reg();
+//		}, 2000)
+	}, 1000*60);
  }
 	
 
@@ -239,10 +247,12 @@
 
  function hangup() {
  	debugger
- 	clearInter();
+ 	//clearInter();
  	//window.frames[1].clearInter();
  	$(".tooltip_text").text("挂断...");
  	//console.log('hangup----------->');
+ 	obj.Type = "DropCall";
+ 	Send();
  	userAgent.terminateSessions();
  }
  

CallCenterWeb.UI/login.html

@@ -7,6 +7,7 @@
     <meta name="keywords">
     <meta name="description">
     <meta name="renderer" content="webkit|ie-comp|ie-stand" />
+    <meta name="format-detection" content="telephone=no">
     <link rel="shortcut icon" href="img/32.ico" />
     <script src="Script/Common/huayi.load.js"></script>
     <script src="Script/Common/huayi.config.js"></script>