2020-7-14-1

陈嘉乐

2020-07-14 d3266109e296abd22d65bc240457bebd75b226bc

2020-7-14-1

没网时启动APP抛异常

 .DS_Store

Binary files differ

 ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml

@@ -1,46 +1,37 @@
<Properties StartupConfiguration="{F1296E2C-3777-4385-85B2-DA77617E3178}|Default">
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.5c86e4357d63" />
  <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/VideoIntercom/VideoMachine.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="Home.Ios/AppDelegate.cs">
    <Files>
      <File FileName="Shared/Phone/Device/VideoIntercom/VideoMachine.cs" Line="114" Column="10" IsPinned="True" />
      <File FileName="Shared/Common/CommonPage.cs" IsPinned="True" />
      <File FileName="Shared/Phone/Category/CategoryMainForm.cs" />
      <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="1236" Column="55" />
      <File FileName="Shared/Phone/MainPage/HomeMainPageForm.cs" />
      <File FileName="Home.Ios/ESVideo.cs" Line="50" Column="66" />
      <File FileName="Home.Ios/AppDelegate.cs" Line="68" Column="1" />
      <File FileName="Shared/Phone/Device/VideoIntercom/VideoMachine.cs" Line="181" Column="41" IsPinned="True" />
      <File FileName="Shared/Common/CommonPage.cs" Line="238" Column="74" IsPinned="True" />
      <File FileName="Shared/Phone/Category/CategoryMainForm.cs" Line="1" Column="1" />
      <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="1302" Column="83" />
      <File FileName="Shared/Phone/MainPage/HomeMainPageForm.cs" Line="159" Column="39" />
      <File FileName="Home.Ios/AppDelegate.cs" Line="207" Column="23" />
      <File FileName="GateWay.Droid/Application.cs" />
      <File FileName="Shared/Phone/MainPage/ListRoomViewFrom.cs" />
      <File FileName="Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs" />
      <File FileName="Shared/Phone/UserView/HomePage.cs" />
      <File FileName="Shared/Phone/UserView/UserPage.cs" Line="32" Column="42" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="GateWay" expanded="True">
            <Node name="Home.IOS" expanded="True">
              <Node name="References" expanded="True" />
              <Node name="Resources" expanded="True" />
              <Node name="AppDelegate.cs" selected="True" />
            </Node>
            <Node name="Shared" expanded="True">
              <Node name="Common" expanded="True" />
              <Node name="Phone" expanded="True">
                <Node name="Category" expanded="True" />
                <Node name="CommonForm" expanded="True" />
                <Node name="Device" expanded="True">
                  <Node name="Logic" expanded="True" />
                  <Node name="VideoIntercom" expanded="True">
                    <Node name="VideoMachine.cs" selected="True" />
                  </Node>
                  <Node name="VideoIntercom" expanded="True" />
                </Node>
                <Node name="MainPage" expanded="True" />
                <Node name="SmartSound" expanded="True">
                  <Node name="Util" expanded="True" />
                </Node>
                <Node name="UserCenter" expanded="True">
                  <Node name="Abount" expanded="True" />
                  <Node name="CommonBase" expanded="True">
                    <Node name="Common" expanded="True" />
                    <Node name="Logic" expanded="True" />
                  </Node>
                </Node>
                <Node name="UserView" expanded="True" />
              </Node>
            </Node>
          </Node>
@@ -48,16 +39,9 @@
      </Pad>
    </Pads>
  </MonoDevelop.Ide.Workbench>
  <MonoDevelop.Ide.ItemProperties.Home.IOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.D4411691-F5B8-40F4-97C1-964F33115DBC" />
  <MonoDevelop.Ide.DebuggingService.PinnedWatches>
    <Watch file="../../../Home.Ios/AppDelegate.cs" line="113" offsetX="-1" offsetY="-1" expression="application.ApplicationState" liveUpdate="False" />
    <Watch file="../../../Home.Ios/AppDelegate.cs" line="113" offsetX="-1" offsetY="-1" expression="application.ApplicationState" liveUpdate="False" />
    <Watch file="../../../Home.Ios/AppDelegate.cs" line="113" offsetX="-1" offsetY="-1" expression="application.ApplicationState" liveUpdate="False" />
    <Watch file="../../../Home.Ios/AppDelegate.cs" line="113" offsetX="-1" offsetY="-1" expression="application.ApplicationState" liveUpdate="False" />
    <Watch file="../../../Home.Ios/AppDelegate.cs" line="104" offsetX="-1" offsetY="-1" expression="application.ApplicationState" liveUpdate="False" />
    <Watch file="../../../Home.Ios/AppDelegate.cs" line="113" offsetX="-1" offsetY="-1" expression="application.ApplicationState" liveUpdate="False" />
  </MonoDevelop.Ide.DebuggingService.PinnedWatches>
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhoneSimulator" />
  <MonoDevelop.Ide.ItemProperties.Home.IOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.913cb77b0eef11c9119c61a02bc00fec01bf67d6" />
  <MonoDevelop.Ide.DebuggingService.PinnedWatches />
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore />
  </MonoDevelop.Ide.DebuggingService.Breakpoints>

 ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide

Binary files differ

 ZigbeeApp/Shared/Phone/Device/Logic/Send.cs

@@ -1238,11 +1238,15 @@
        /// <returns></returns>
        public static async System.Threading.Tasks.Task<string> HttpWebRequest(string getUrl, string str, string method, int second = 3, bool _bool = false)
        {

            HttpWebRequest request = WebRequest.Create(getUrl) as HttpWebRequest; //创建请求
            request.Method = method; //请求方式为POST/GET
            request.ContentType = "application/json"; 
            request.Timeout = second * 1000;//超时时间
            if (_bool) {
            try
            {
                if (_bool)
                {
                //用于高胜可视对讲接口
                request.Headers.Add("Authorization", Config.Instance.Token);
            }
@@ -1268,6 +1272,11 @@
            string content = sr.ReadToEnd(); //获得响应字符串
            return content;
        }
            catch
            {
                return null;
            }
        }
        /// <summary>
        /// 请求服务器的方法
        /// </summary>

 ZigbeeApp/Shared/Phone/Device/VideoIntercom/VideoMachine.cs

@@ -115,7 +115,7 @@
        /// <summary>
        /// 判断账号是否支持可视对讲
        /// </summary>
        /// <param name="topFrameLayout"></param>
        /// <param name="topFrameLayout">可视对讲图标的父控件</param>
        public async static void AccountSupportVideo(FrameLayout topFrameLayout)
        {
            var jobject = new JObject();
@@ -166,9 +166,6 @@
                }
                catch { }
            }



        }
        /// <summary>
        /// 获取可视对讲列表