Merge branch 'WJC' into wxr7

wxr

2021-09-01 4c0b2ce14b299b3409dfee230a052979c2844de4

 HDL-ON_Android/FengLinVideo/Form/MonitorFragment.cs

@@ -80,7 +80,7 @@
                    unlockImag.Selected = true;
                    JSONObject ht = new JSONObject();
                    ht.Put("command", "open");//固定参数
                    ht.Put("room_id", 123);
                    ht.Put("room_id", VideoActivity.Roomno);
                    ht.Put("devType", 7);
                    mPhone.SendCustomData(ht.ToString());
                }