2021-08-18 1.完善Android对接LinphoneSDK 2.完善SIP相关接口对接

JLChen

2021-08-18 c8c33200e43f05136eca9fc8ff4942f8def31cc6

 HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs

@@ -258,7 +258,7 @@
                                        }
                                    }
                                    break;
                                case SPK.SensoruUtrasonic:
                                case SPK.SensorUtrasonic:
                                    {
                                        string str = "";
                                        foreach (var dic in dicList)
@@ -315,7 +315,7 @@
                                        }
                                    }
                                    break;
                                case SPK.SenesorEnvironment:
                                case SPK.SensorEnvironment:
                                    {
                                        string strtext = "";
                                        foreach (var dic in dicList)
@@ -599,7 +599,7 @@
                            {
                                //用sid找到设备；
                                var device = LogicMethod.CurrLogicMethod.GetDevice(inputCondition.sid);
                                if (device.spk == SPK.SenesorEnvironment)
                                if (device.spk == SPK.SensorEnvironment)
                                {
                                    //这个设备比较特殊
                                    ConditionDeviceFunList conditionDeviceFunList = new ConditionDeviceFunList();
@@ -1549,7 +1549,7 @@
                        }
                    }
                    break;
                case SPK.SensoruUtrasonic:
                case SPK.SensorUtrasonic:
                    {
                        foreach (var dic in dicList)
                        {
@@ -1782,6 +1782,11 @@
                        }
                        break;
                }

                if (!MainView.IsGatewayType)
                {
                    name +=Language.StringByID(StringId.push);
                }
            }
            catch { }
            return name;