Merge branch 'master' into WJC

陈嘉乐

2020-11-30 c44b10e4447e84dbdfa9105edf460ef364a8f2b3

 HDL_ON/UI/UI2/1-HomePage/HomePage.cs

@@ -136,7 +136,6 @@
                {
                    System.Threading.Tasks.Task.Run(() =>
                        {
                            DB_ResidenceData.residenceData.GatewayType = 0;
                            DriverLayer.Control.Ins.SearchLoaclGateway();
                        });
                };
@@ -349,8 +348,7 @@

            System.Threading.Tasks.Task.Run(() =>
            {
                DB_ResidenceData.residenceData.GatewayType = 0;
                DriverLayer.Control.Ins.SearchLoaclGateway();
                //DriverLayer.Control.Ins.SearchLoaclGateway();
            });
        }

@@ -703,14 +701,14 @@
                            btnPower.IsSelected = false;
                            Music.SendMethod.Pause(a31player);
                            a31player.A31PlayStatus.status = "pause";
                            a31player.trait_on_off.value = "off";
                            a31player.trait_on_off.curValue = "off";
                        }
                        else
                        {
                            btnPower.IsSelected = true;
                            Music.SendMethod.Play(a31player);
                            a31player.A31PlayStatus.status = "play";
                            a31player.trait_on_off.value = "on";
                            a31player.trait_on_off.curValue = "on";
                        }
                        UpdataFunctionStates(a31player);
                    };