2020-08-12-1

陈嘉乐

2020-08-12 85ea6e4d86345d4d23acb2d86bb71cc5a8591d48

 ZigbeeApp/GateWay.Droid/VideoActivity.cs

@@ -165,7 +165,30 @@
        {
            if (v.Equals(ivBack))
            {
                try
                {
                    //if (mPhone != null)
                    //    mPhone.HangUp();
                    //else
                this.Finish();
                }
                catch (Exception e) { string error = e.Message; }
            }
        }

        public override void OnBackPressed()
        {
            try
            {
                bool ssss=mPhone.IsCalling;
                if (mPhone != null)
                    mPhone.HangUp();
                else
                    this.Finish();
            }
            catch (Exception e)
            {
                string error = e.Message;
            }
        }      

@@ -325,8 +348,12 @@
                        hideRemoteVideo();
                        if (mPhone != null)
                        {
                            try
                            {
                            mPhone.StopStream();
                        }
                            catch { }
                        }
                        showTipDialog("提示","已挂断","确认");
                        break;
                    case "EVT_RECV_CUSTOM_DATA":