Merge branch 'WJC' into temp-wxr

wxr

2021-03-31 3532db3610381f37eca1a6ac783d882517847c91

 HDL-ON_Android/FengLinVideo/Form/ReverseCallFragment.cs

@@ -113,6 +113,7 @@
            }
        }

        public static Thread unlockThread = null;//公开出来，关闭activity的时候要结束这个线程，不然会引起崩溃
        /// <summary>
        /// 更新开锁按钮状态,开锁成功，15秒内不给再点击按钮
        /// </summary>
@@ -124,15 +125,28 @@

                unlockImg.Enabled = false;

                new Thread(() =>
                {
                    Thread.Sleep(15 * 1000);
                    Activity.RunOnUiThread(() =>
                    {
                        if (unlockImg != null)
                            unlockImg.Enabled = true;
                    });
                }).Start();
                unlockThread = new Thread(() =>
                  {
                      try
                      {
                          Thread.Sleep(15 * 1000);
                          
                      Activity.RunOnUiThread(() =>
                      {
                          try {
                              if (unlockImg != null)
                                  unlockImg.Enabled = true;
                          }
                          catch { }
                      });

                      }
                      catch { }
                  });//.Start();

                unlockThread.Start();

                PostUnlock();
            }
            catch { }
        }
@@ -218,7 +232,7 @@

                switch (event1)
                {
                    case "EVT_RECV_CUSTOM_DATA":
                    case "EVT_RECV_CUSTOM_DATA":// 开锁成功
                        string data = tp.GetString("data");
                        UpdataUnlockState();
                        break;
@@ -317,7 +331,7 @@
                    Dictionary<string, object> d = new Dictionary<string, object>();
                    d.Add("callId", VideoActivity.CallId);
                    d.Add("images", images);
                    d.Add("imagesName", img_name);
                    d.Add("imagesName", "_Android.jpg");
                    string jsonString = HttpUtil.GetSignRequestJson(d);

                    string url = "/home-wisdom/app/fl/vi/screenshot";
@@ -400,5 +414,27 @@

            }).Start();
        }

        /// <summary>
        /// post 开锁记录
        /// </summary>
        private void PostUnlock()
        {
            new Thread(() =>
            {
                try
                {
                    Dictionary<string, object> d = new Dictionary<string, object>();
                    d.Add("callId", VideoActivity.CallId);//呼叫记录id int
                    string jsonString = HttpUtil.GetSignRequestJson(d);

                    string url = "/home-wisdom/app/fl/vi/unlock";
                    ResponsePackNew response = HttpUtil.RequestHttpsPost(url, jsonString);
                    Log.Info("FengLinVideo", "Post Reject Response code=" + response.Code);
                }
                catch { }

            }).Start();
        }
    }
}