parent: 7a23bcdf | 补丁 | 提交 | show whitespace
WJC
2019-12-20 313ca44a4c4fc9cecbe145c80b26f16af836b7bf 
2019-12-20-1

修改空调问题，请合并代码
5个文件已修改
127 ■■■■■ 已修改文件
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ZigbeeApp/Shared/Common/ZigbeeColor.cs 补丁 | 查看 | 原始文档 | blame | 历史
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml


@@ -1,30 +1,28 @@


<Properties StartupConfiguration="{F1296E2C-3777-4385-85B2-DA77617E3178}|Default">


  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.SelectDevice" />


  <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.SelectDevice" />


  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs">


  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/LogicIfon.cs">


    <Files>


      <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="2023" Column="42" />


      <File FileName="Shared/Phone/Device/Logic/DeviceStateCondition.cs" />


      <File FileName="Shared/Phone/Device/Logic/LogicDevicePage.cs" />


      <File FileName="Shared/Phone/Device/Logic/MemberList.cs" Line="144" Column="45" />


      <File FileName="Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs" Line="311" Column="75" />


      <File FileName="Shared/Phone/Device/Logic/LogicDevicePage.cs" Line="2098" Column="37" />


      <File FileName="Shared/Common/ZigbeeColor.cs" Line="312" Column="60" />


      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs" Line="2029" Column="21" />


      <File FileName="Shared/Phone/Device/Logic/LogicIfon.cs" Line="130" Column="6" />


    </Files>


    <Pads>


      <Pad Id="ProjectPad">


        <State name="__root__">


          <Node name="GateWay" expanded="True">


            <Node name="GateWay.Droid" expanded="True">


              <Node name="Resources" expanded="True" />


            </Node>


            <Node name="Home.IOS" expanded="True" />


            <Node name="Shared" expanded="True">


              <Node name="Common" expanded="True" />


              <Node name="Phone" expanded="True">


                <Node name="Device" expanded="True">


                  <Node name="Logic" expanded="True" />


                </Node>


                <Node name="UserCenter" expanded="True">


                  <Node name="Device" expanded="True">


                    <Node name="Bind" expanded="True">


                      <Node name="AddDevicePage.cs" selected="True" />


                    </Node>


                  <Node name="Logic" expanded="True">


                    <Node name="DoorLockLogic" expanded="True" />


                    <Node name="LogicIfon.cs" selected="True" />


                  </Node>


                </Node>


              </Node>


@@ -38,7 +36,9 @@


  <MonoDevelop.Ide.DebuggingService.PinnedWatches />


  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />


  <MonoDevelop.Ide.DebuggingService.Breakpoints>


    <BreakpointStore />


    <BreakpointStore>


      <Breakpoint file="/Users/hdl/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs" relfile="Shared/Phone/Device/Logic/LogicIfon.cs" line="130" column="1" />


    </BreakpointStore>


  </MonoDevelop.Ide.DebuggingService.Breakpoints>


  <MultiItemStartupConfigurations />


</Properties>




 ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml


@@ -35,7 +35,6 @@


    <uses-permission android:name="android.permission.READ_PHONE_STATE" />


    <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />


    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />


    <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />


    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />


    <uses-permission android:name="android.permission.WRITE_SETTINGS" />


    <uses-permission android:name="android.permission.VIBRATE" />


@@ -62,25 +61,20 @@


    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />


    <uses-permission android:name="android.permission.FLASHLIGHT" />


    <uses-permission android:name="android.permission.READ_LOGS" />


    <uses-permission android:name="android.permission.WRITE_OWNER_DATA" />


    <uses-permission android:name="android.permission.RECORD_AUDIO" />


    <!-- elian -->


    <uses-permission android:name="android.permission.NET_ADMIN" />


    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />


    <!-- elian结束 -->


    <!-- 安装apk-->


    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />


    <!--极光推送 Required  一些系统要求的权限，如访问网络等-->


    <!-- Required  一些系统要求的权限，如访问网络等-->


    <uses-permission android:name="com.hdl.home.permission.JPUSH_MESSAGE" />


    <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />


    <uses-permission android:name="android.permission.INTERNET" />


    <uses-permission android:name="android.permission.READ_PHONE_STATE" />


    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />


    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />


    <uses-permission android:name="android.permission.WRITE_SETTINGS" />


    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />


    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />


    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />


    <!-- Optional for location -->


    <uses-permission android:name="android.permission.VIBRATE" />




 ZigbeeApp/Shared/Common/ZigbeeColor.cs

old mode 100755
new mode 100644



 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs


@@ -1756,8 +1756,14 @@


                        Dictionary<string, string> temperaturedictionary = new Dictionary<string, string>();


                        Dictionary<string, string> modedictionary = new Dictionary<string, string>();


                        Dictionary<string, string> speeddictionary = new Dictionary<string, string>();


                     




                        dictionary(temperaturedictionary, "TaskType", "5");


                        dictionary(modedictionary, "TaskType", "5");


                        dictionary(modedictionary, "Data1", "3");


                        dictionary(speeddictionary, "TaskType", "5");


                        dictionary(speeddictionary, "Data1", "6");


                        taskListInfo.Add(temperaturedictionary);


                        taskListInfo.Add(modedictionary);


                        taskListInfo.Add(speeddictionary);


                        #endregion




                        #region  空调View


@@ -1806,15 +1812,14 @@


                        };


                        devicefra.AddChidren(PickerViewfra);






                        //遮挡空调滑动view；


                        var pausePickerViewfra = new FrameLayout


                        {


                            Y = openframelayout.Bottom,


                            Height = Application.GetRealHeight(600),


                            BackgroundColor = 0x60ffffff,


                        };


                        devicefra.AddChidren(pausePickerViewfra);








                        var mUIPickerView = new UIPickerView


                        {


@@ -1849,6 +1854,9 @@


                            mList1.Add(i.ToString() + " " + "℃");


                        }


                        mUIPickerView.setNPicker(mList1, mList2, mList3);


                        mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 0);


                        mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 1);


                        mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 2);


                        ///默认状态






@@ -1887,9 +1895,13 @@


                        #endregion








                        //默认26,自动,中风


                        int indextemperature = 10, indexmode = 2, indexspeed = 1;


                        mUIPickerView.OnSelectChangeEvent += (s1, s2, s3) =>


                        {


                            indextemperature = s1;


                            indexmode = s2;


                            indexspeed = s3;


                            if (openBtnSelected.Visible)


                            {


                                SelectedDeviceStatusaction = "yes";


@@ -1907,14 +1919,16 @@


                        };




                        #endregion


                        //默认26,自动,中风


                        int indextemperature = 10, indexmode = 2, indexspeed = 1;


                     


                        if (edit && TaskList != null)


                        {


                            foreach (var value in TaskList)


                            {


                                if (TaskList.Count == 1)


                                {


                                    mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 0);


                                    mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 1);


                                    mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 2);


                                    //数组只有一个元素说明当前空调状态为关；


                                    openBtnSelected.Visible = false;


                                    closeBtnSelected.Visible = true;


@@ -1925,6 +1939,9 @@


                                }


                                else


                                {


                                    mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnSelectedColor, 0);


                                    mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnSelectedColor, 1);


                                    mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnSelectedColor, 2);


                                    openBtnSelected.Visible = true;


                                    closeBtnSelected.Visible = false;


                                    pausePickerViewfra.Height = Application.GetRealHeight(0);


@@ -2018,6 +2035,9 @@


                        ///确认事件


                        EventHandler<MouseEventArgs> openclick = (sender, e) =>


                        {


                            mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnSelectedColor, 0);


                            mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnSelectedColor, 1);


                            mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnSelectedColor, 2);


                            //清除之前数据；


                            taskListInfo.Clear();


                            //加载新数据；


@@ -2051,7 +2071,9 @@


                        ///取消事件


                        EventHandler<MouseEventArgs> closeclick = (sender, e) =>


                        {




                            mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 0);


                            mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 1);


                            mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 2);


                            //清除之前数据；


                            taskListInfo.Clear();


                            dictionary(modedictionary, "TaskType", "5");




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


@@ -1754,8 +1754,15 @@


                       var temperaturedictionary = new Dictionary<string, string>();


                       var modedictionary = new Dictionary<string, string>();


                        var speeddictionary = new Dictionary<string, string>();


                        dictionary(temperaturedictionary, "TaskType", "5");


                        dictionary(modedictionary, "TaskType", "5");


                        dictionary(modedictionary, "Data1", "3");


                        dictionary(speeddictionary, "TaskType", "5");


                        dictionary(speeddictionary, "Data1", "6");


                        taskListInfo.Add(temperaturedictionary);


                        taskListInfo.Add(modedictionary);


                        taskListInfo.Add(speeddictionary);


                        #endregion




                        #region  空调View




                        devicefra.Y = Application.GetRealHeight(1920 - 600 - 210 - 160*2);


@@ -1802,11 +1809,12 @@


                        };


                        devicefra.AddChidren(PickerViewfra);






                        //遮挡空调滑动view；


                        var pausePickerViewfra= new FrameLayout


                        {


                            Y = openframelayout.Bottom,


                            Height = Application.GetRealHeight(600),


                            BackgroundColor=0x60ffffff,


                        };


                        devicefra.AddChidren(pausePickerViewfra);




@@ -1882,9 +1890,13 @@


                        closerowlayout.AddChidren(closeBtnSelected);


                        #endregion






                        //默认26,自动,中风


                        int indextemperature = 10, indexmode = 2, indexspeed = 1;


                        mUIPickerView.OnSelectChangeEvent += (s1, s2, s3) =>


                        {


                            indextemperature = s1;


                            indexmode = s2;


                            indexspeed = s3;


                            if (openBtnSelected.Visible)


                            {


                                SelectedDeviceStatusaction = "yes";


@@ -1896,14 +1908,13 @@


                                dictionary(temperaturedictionary, "Data2", a.ToString());




                                SpeedState(speedstring, speeddictionary);






                            }


                        };


                        


                       mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 0);


                        mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 1);


                        mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 2);


                        #endregion


                        //默认26,自动,中风


                        int indextemperature = 10, indexmode = 2, indexspeed = 1;


                       


                        if (edit && TaskList != null)


                        {


                       


@@ -1911,6 +1922,9 @@


                            {


                                if (TaskList.Count == 1)


                                {


                                    mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 0);


                                    mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 1);


                                    mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 2);


                                    //数组只有一个元素说明当前空调状态为关；


                                    openBtnSelected.Visible = false;


                                    closeBtnSelected.Visible = true;


@@ -1924,6 +1938,9 @@


                                    openBtnSelected.Visible = true;


                                    closeBtnSelected.Visible = false;


                                    pausePickerViewfra.Height = Application.GetRealHeight(0);


                                    mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnSelectedColor, 0);


                                    mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnSelectedColor, 1);


                                    mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnSelectedColor, 2);


                                }






@@ -1997,7 +2014,7 @@


                                        }


                                        indexspeed = mList3.IndexOf(speedtext);


                                    }


                                    //4---设置加热度数;5---设置制冷、除湿度数;7---设置自动度数


                                    //4-设置加热度数;5-设置制冷、除湿度数;7-设置自动度数


                                    else if (value["Data1"] == "4" || value["Data1"] == "5" || value["Data1"] == "7")


                                    {


                                        var s = int.Parse(value["Data2"]) / 100;


@@ -2015,6 +2032,14 @@


                        ///确认事件


                        EventHandler<MouseEventArgs> openclick = (sender, e) =>


                        {


                            mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnSelectedColor, 0);


                            mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnSelectedColor, 1);


                            mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnSelectedColor, 2);


                            mUIPickerView.setCurrentItems(indextemperature, indexmode, indexspeed);


                            pausePickerViewfra.Height = Application.GetRealHeight(0);


                            SelectedDeviceStatusaction = "yes";


                            openBtnSelected.Visible = true;


                            closeBtnSelected.Visible = false;


                            //清除之前数据；


                            taskListInfo.Clear();


                            //加载新数据；


@@ -2026,10 +2051,7 @@


                            taskListInfo.Add(temperaturedictionary);


                            taskListInfo.Add(modedictionary);


                            taskListInfo.Add(speeddictionary);


                            pausePickerViewfra.Height = Application.GetRealHeight(0);


                            SelectedDeviceStatusaction = "yes";


                            openBtnSelected.Visible = true;


                            closeBtnSelected.Visible = false;


                          


                            var temperature = mList1[indextemperature].Split(' ')[0];


                            var modestring = mList2[indexmode].Split(' ')[0];


                            var speedstring = mList3[indexspeed].Split(' ')[0];


@@ -2048,7 +2070,10 @@


                        ///取消事件


                        EventHandler<MouseEventArgs> closeclick = (sender, e) =>


                        {


              


                            mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 0);


                            mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 1);


                            mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 2);


                            mUIPickerView.setCurrentItems(indextemperature, indexmode, indexspeed);


                            //清除之前数据；


                            taskListInfo.Clear();


                            dictionary(modedictionary, "TaskType", "5");