Merge remote-tracking branch 'origin/newBranch1' into CJL-Linphone

JLChen

2021-10-15 df3906c03db154e8622b7caeaa3bf93b67c6d40a

 HDL_ON/UI/UI2/2-Classification/FunctionPage.cs

@@ -164,7 +164,7 @@
            functionListView.RemoveAll();
            foreach (var function in showList)
            {
                if(function.spk == SPK.SensorDryContact)
                if(function.spk == SPK.SensorDryContact|| function.spk == SPK.SensorDryContact2)
                {
                    continue;
                }