2021-02-05 1.编译冲突修改

JLChen

2021-02-05 1a0a7f736c6d2e7129e7591d40bed67ec7c0f09a

 HDL_ON/Common/ApiUtlis.cs

@@ -165,7 +165,7 @@
                            for (int i = 0; i < FunctionList.List.GetDeviceFunctionList().Count;)
                            {
                                var localFunction = FunctionList.List.GetDeviceFunctionList()[i];
                                if (localFunction.Spk_Prefix == FunctionCategory.Music|| string.IsNullOrEmpty(localFunction.Spk_Prefix))
                                if (localFunction.Spk_Prefix == FunctionCategory.Music || string.IsNullOrEmpty(localFunction.Spk_Prefix))
                                {
                                    i++;
                                    continue;
@@ -304,6 +304,10 @@
                        waitPage.Hide();
                        waitPage.RemoveFromParent();
                    });
                    //不考虑网关情况，直接订阅
                    DAL.Mqtt.MqttClient.InitState();

                    FunctionList.List.Read3tyFunctionStatus();
                }
            });
            downloadDataThread.IsBackground = true;