合并乐橙代码

wei

2021-07-06 533735b4bbaea0f7a87ccd3d1781ea7d469f75b5

合并乐橙代码

 .vs/HDL_APP_Project/xs/UserPrefs.xml

@@ -1,14 +1,41 @@
<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget." />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs">
<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs">
    <Files>
      <File FileName="HDL_ON/Entity/Enumerative/Command.cs" Line="16" Column="1" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs" Line="200" Column="80" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs" Line="34" Column="13" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Electrical/StbPage.cs" Line="664" Column="55" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Electrical/PjtPage.cs" Line="327" Column="10" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs" Line="342" Column="1" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs" Line="335" Column="45" />
      <File FileName="HDL_ON/Entity/Function/Function.cs" Line="1242" Column="19" />
      <File FileName="HDL_ON/Entity/FunctionList.cs" Line="199" Column="50" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs" Line="368" Column="49" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs" Line="1" Column="1" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="HDL_APP_Project" expanded="True" />
          <Node name="HDL_APP_Project" expanded="True">
            <Node name="HDL_ON" expanded="True">
              <Node name="DAL" expanded="True">
                <Node name="Server" expanded="True" />
              </Node>
              <Node name="Entity" expanded="True">
                <Node name="Enumerative" expanded="True" />
                <Node name="Function" expanded="True" />
              </Node>
              <Node name="UI" expanded="True">
                <Node name="UI2" expanded="True">
                  <Node name="3-Intelligence" expanded="True">
                    <Node name="Automation" expanded="True">
                      <Node name="ConditionDeviceFunList.cs" selected="True" />
                    </Node>
                    <Node name="Scene" expanded="True" />
                  </Node>
                </Node>
              </Node>
            </Node>
          </Node>
        </State>
      </Pad>
    </Pads>
@@ -19,10 +46,12 @@
    <String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
    <String>Shared.IOS/Shared.IOS.csproj</String>
  </DisabledProjects>
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.822QECU5228FU" />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore />
    <BreakpointStore>
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs" line="42" column="1" />
    </BreakpointStore>
  </MonoDevelop.Ide.DebuggingService.Breakpoints>
  <MultiItemStartupConfigurations />
</Properties>

 DLL/LC/IOS/Shared.IOS.LCVideoOnSDK.dll

Binary files differ

 HDL-ON_Android/Assets/Language.ini

@@ -1704,7 +1704,7 @@
1152=不能自己过户给自己
1153=终止
1154=正在过户给用户,请稍后...
1155=用户{0}已经成为住宅行管理员
1155=用户{0}已经成为住宅新管理员
1156=该住宅的信息将在您的账号中删除
1157=过户失败
1158=请重新尝试

 HDL-ON_Android/Properties/AndroidManifest.xml

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202107023" android:versionName="1.2.202107023" package="com.hdl.onpro">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202107052" android:versionName="1.2.202107052" package="com.hdl.onpro">
    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="29" />
    <!--  可视对讲权限-->
    <uses-permission android:name="android.permission.CAMERA" />

 HDL-ON_iOS/AppDelegate.cs

@@ -245,6 +245,7 @@

        public override bool FinishedLaunching(UIApplication application, NSDictionary launchOptions)
        {
            Console.WriteLine("111111111111");
            SetCurrentLanguage();
            //Shared.Application.FontSize = 12;
            //Bugly.Bugly.StartWithAppId("b58fb35436");

 HDL-ON_iOS/HDL-ON_iOS.csproj

@@ -54,7 +54,6 @@
        <MtouchLink>SdkOnly</MtouchLink>
        <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
        <MtouchEnableSGenConc>false</MtouchEnableSGenConc>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<CodesignProvision>On+Dev-20210616-1</CodesignProvision>
    </PropertyGroup>
    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">

 HDL-ON_iOS/Info.plist

@@ -104,9 +104,9 @@
    <key>UIStatusBarStyle</key>
    <string>UIStatusBarStyleLightContent</string>
    <key>CFBundleShortVersionString</key>
    <string>1.2.202107023</string>
    <string>1.2.202107052</string>
    <key>CFBundleVersion</key>
    <string>1.2.07023</string>
    <string>1.2.07052</string>
    <key>NSLocationWhenInUseUsageDescription</key>
    <string>Use geographic location to provide services such as weather</string>
    <key>NSAppleMusicUsageDescription</key>

 HDL-ON_iOS/Resources/Language.ini

@@ -1703,7 +1703,7 @@
1152=不能自己过户给自己
1153=终止
1154=正在过户给用户,请稍后...
1155=用户{0}已经成为住宅行管理员
1155=用户{0}已经成为住宅新管理员
1156=该住宅的信息将在您的账号中删除
1157=过户失败
1158=请重新尝试
@@ -1802,7 +1802,7 @@
6016=离线
6017=版本号
6018=请输入遥控器名称
6019=提示：遥控器创建后可在功能-电器分类{\r\n}查找使用
6019=提示：遥控器创建后可在功能-电器分类，查找使用
6020=推荐按键
6021=请输入按键名称
6022=下一步

 HDL-ON_iOS/ViewController.cs

@@ -24,6 +24,7 @@

        public override void ViewDidLoad()
        {
            Console.WriteLine("qidong 1111");
            base.ViewDidLoad();

            HDL_ON.MainPage.Show();

 HDL_ON/DAL/Server/HttpUtil.cs

@@ -18,8 +18,8 @@
        /// 公共域名就近解析
        /// 
        /// </summary>
        //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
        public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
        public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
        //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
        /// <summary>
        /// RegionMark
        /// </summary>
@@ -329,10 +329,6 @@
                    urlHead = OnAppConfig.Instance.RequestHttpsHost;
                }
                string requestFullUrl = urlHead + apiPath;

                ////**************测试**************
                //string requestFullUrl = GlobalRequestHttpsHost + apiPath;
                ////**************测试**************

                RestClient client = new RestClient(requestFullUrl);
                RestRequest request = new RestRequest(Method.POST);

 HDL_ON/Entity/Function/Function.cs

@@ -1164,7 +1164,7 @@
        /// <summary>
        /// 超声波传感器
        /// </summary>
        public const string SensoruUtrasonic = "sensor.ultrasonic";
        public const string SensorUtrasonic = "sensor.ultrasonic";
        /// <summary>
        /// （干接点）
        /// </summary>
@@ -1173,10 +1173,6 @@
        /// 毫米波传感器
        /// </summary>
        public const string SenesorMegahealth = "sensor.megahealth";
        /// <summary>
        /// 环境检测传感器
        /// </summary>
        public const string SenesorEnvironment = "sensor.environment";
        /// <summary>
        /// 安防传感器spk列表
        /// </summary>
@@ -1220,6 +1216,13 @@
        /// 湿度传感器
        /// </summary>
        public const string SensorHumidity = "sensor.humidity";
        /// <summary>
        /// 环境传感器
        /// 环境检测传感器
        /// 特殊类spk
        /// 该spk功能是环境传感器功能的集成
        /// </summary>
        public const string SensorEnvironment = "sensor.environment";

        /// <summary>
        /// 环境传感器spk列表

 HDL_ON/Entity/FunctionList.cs

@@ -184,7 +184,6 @@
        /// <para>false:直接无条件添加</para></param>
        public void IniFunctionList(string filePath, bool checkRepeat = false)
        {
            //MainPage.Log("12346890sdkxghjkl");
            // todo 增加设备，增加功能进功能列表
            if (filePath.StartsWith("FunctionData_"))
            {

 HDL_ON/UI/MainPage.cs

@@ -25,7 +25,7 @@
        /// <summary>
        /// 版本号
        /// </summary>
        public static string VersionString = "1.2.0702";
        public static string VersionString = "1.2.0705";
        ///// <summary>
        ///// 客户端类型
        ///// </summary>

 HDL_ON/UI/UI1-Login/LoginPage.cs

@@ -221,7 +221,7 @@
                    //etAccount.Text = "15217626103";//
                    //etAccount.Text = "13682244600";//波哥
                    //etAccount.Text = "13168123446";//昆明金茂项目，新风问题
                    etAccount.Text = "551775569@.com";
                    etAccount.Text = "551775569@qq.com";
                    //etAccount.Text = "13168123446";
                    //etAccount.Text = "13676202754";//巴林服务器
                    //etAccount.Text = "13602944661";//kx

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

@@ -150,7 +150,7 @@
                        }
                    }
                    break;
                case SPK.SensoruUtrasonic:
                case SPK.SensorUtrasonic:
                    {

                        LogicView.FunTypeView view = new LogicView.FunTypeView();
@@ -278,7 +278,7 @@
                    case SPK.SensorDuiShe:
                    case SPK.SensorPir:
                    case SPK.SensorDoorWindow:
                    case SPK.SensoruUtrasonic:
                    case SPK.SensorUtrasonic:
                        {
                            keyVlaue = "status";
                        }

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

@@ -256,7 +256,7 @@
                                        }
                                    }
                                    break;
                                case SPK.SensoruUtrasonic:
                                case SPK.SensorUtrasonic:
                                    {
                                        string str = "";
                                        foreach (var dic in dicList)
@@ -1348,7 +1348,7 @@
                        }
                    }
                    break;
                case SPK.SensoruUtrasonic:
                case SPK.SensorUtrasonic:
                    {
                        foreach (var dic in dicList)
                        {

 HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs

@@ -606,7 +606,8 @@
                else
                {
                    //跳转到逻辑界面
                    UI2.Intelligence.Automation.MainView.SkipAddLogicPage();
                    UI2.Intelligence.Automation.MainView logicMainView = new UI2.Intelligence.Automation.MainView();
                    logicMainView.SkipAddLogicPage();
                }
            };
        }

 HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs

@@ -331,6 +331,8 @@

            functionListView = new VerticalScrolViewLayout() {
                Height = 0,
                ScrollEnabled  = false,
               BackgroundColor = 0xffff0000
            };
            contentView.AddChidren(functionListView);


 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs

@@ -82,7 +82,7 @@
            quyuPatchView.frameLayout.Y = namePatchView.frameLayout.Bottom;
            this.AddChidren(quyuPatchView.FLayoutView());
            quyuPatchView.btnText1.TextID = StringId.suoshuquyu;
            quyuPatchView.btnText2.Text = Intelligence.Automation.LogicMethod.CurrLogicMethod.GetGetRoomName(GetFunction(control.deviceId));
            quyuPatchView.btnText2.Text = Intelligence.Automation.LogicMethod.GetGetRoomName(GetFunction(control.deviceId));

            //继续添加
            Button addBtn = new Button
@@ -137,7 +137,7 @@
                method.ManagementPosition(GetFunction(control.deviceId), () =>
                {
                    //更新区域
                    quyuPatchView.btnText2.Text = Intelligence.Automation.LogicMethod.CurrLogicMethod.GetGetRoomName(GetFunction(control.deviceId));
                    quyuPatchView.btnText2.Text = Intelligence.Automation.LogicMethod.GetGetRoomName(GetFunction(control.deviceId));
                });
            };
            //继续添加点击事件

 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/EditControl.cs

@@ -43,7 +43,7 @@
            //遥控器所属区域:
            FrameLayout50 areaFLayout = new FrameLayout50(); 
            areaFLayout.btnText.Text = Language.StringByID(StringId.yaokongqiquyu);
            areaFLayout.btnEditText.Text = Intelligence.Automation.LogicMethod.CurrLogicMethod.GetGetRoomName(control);
            areaFLayout.btnEditText.Text = Intelligence.Automation.LogicMethod.GetGetRoomName(control);
            areaFLayout.frameLayout.Y = editNameFLayout.frameLayout.Bottom;
            viewLayout.AddChidren(areaFLayout.FLayoutView());
            #endregion
@@ -77,7 +77,7 @@
                method.ManagementPosition(control, () =>
                {
                    //更新区域
                    areaFLayout.btnEditText.Text = Intelligence.Automation.LogicMethod.CurrLogicMethod.GetGetRoomName(control);
                    areaFLayout.btnEditText.Text = Intelligence.Automation.LogicMethod.GetGetRoomName(control);
                });
            };
            #endregion

 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs

@@ -197,7 +197,7 @@
                //遥控器名称
                controlView.nameBtn.Text = control.name;
                //遥控器存放区域
                controlView.areaBtn.Text = Intelligence.Automation.LogicMethod.CurrLogicMethod.GetGetRoomName(control);
                controlView.areaBtn.Text = Intelligence.Automation.LogicMethod.GetGetRoomName(control);
                //标记遥控器
                controlView.delBtn.Tag = control;
                //删除点击事件
@@ -236,7 +236,7 @@
                    {
                        //回调更新名字/区域
                        controlView.nameBtn.Text = device.name;
                        controlView.areaBtn.Text = Intelligence.Automation.LogicMethod.CurrLogicMethod.GetGetRoomName(device);
                        controlView.areaBtn.Text = Intelligence.Automation.LogicMethod.GetGetRoomName(device);

                    });
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;

 HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs

@@ -196,8 +196,10 @@
                Height = Application.GetRealWidth(40),
                UnSelectedImagePath = "FunctionIcon/AC/SweepIconNullOn.png",
            };
            if (device.GetAttribute(FunctionAttributeKey.Swing) != null)
            {
            FrameWhiteCentet1.AddChidren(btnSwing);

            }


            btnWindSpeed = new Button()
@@ -327,8 +329,7 @@
                    btnModeIcon.IsSelected = btnModeText.IsSelected = true;
                    device.SetAttrState(FunctionAttributeKey.Mode, m);
                    btnMode.UnSelectedImagePath = acFunction.GetModeIconPath(m);
                    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                    //btnMode.UnSelectedImagePath = btnModeIcon.UnSelectedImagePath;
                    Dictionary<string, string> d = new Dictionary<string, string>();
                    d.Add(FunctionAttributeKey.Mode, m);
                    Control.Ins.SendWriteCommand(device, d);
                    dialog.Close();
@@ -594,8 +595,8 @@
                {
                    Gravity = Gravity.CenterHorizontal,
                    Y = Application.GetRealHeight(334 + 80),
                    Width = Application.GetRealWidth(30),
                    Height = Application.GetRealWidth(30),
                    Width = Application.GetRealWidth(35),
                    Height = Application.GetRealWidth(35),
                    UnSelectedImagePath = "FunctionIcon/AC/More.png",
                };
                FrameWhiteCentet1.AddChidren(btnMore);

 HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs

@@ -31,7 +31,7 @@

            //初始化第一个索引页的内容
            this.InitFrameWhiteContent1();
            ;
            
        }

        /// <summary>
@@ -184,7 +184,7 @@

            btnTitle = new Button()
            {
                Y = btnIcon.Bottom,
                Y = Application.GetRealWidth(28),
                Text = title,
                Height = Application.GetRealHeight(30),
                TextColor = CSS_Color.TextualColor,

 HDL_ON/UI/UI2/FuntionControlView/Electrical/PjtPage.cs

@@ -322,8 +322,6 @@
            #endregion

            new TopViewDiv(bodyView, Language.StringByID(StringId.PJT)).LoadTopView_FunctionTop(device, actionRefresh);
            DriverLayer.Control.Ins.SendReadCommand(device);

            LoadEventList();

        }
@@ -344,8 +342,8 @@

            var bodyView = new FrameLayout()
            {
                Y = Application.GetRealHeight(427),//667
                Height = Application.GetRealHeight(240),
                Y = Application.GetRealHeight(417),//667
                Height = Application.GetRealHeight(250),
                BackgroundColor = CSS_Color.MainBackgroundColor,
            };
            div.AddChidren(bodyView);
@@ -355,6 +353,7 @@
                Y = Application.GetRealHeight(16),
                Gravity = Gravity.CenterHorizontal,
                Width = Application.GetRealWidth(296 + 200),
                Height = Application.GetRealHeight(234),
            };
            bodyView.AddChidren(contentView);

@@ -503,9 +502,6 @@

            dialog.Show();
        }



        
        /// <summary>
        /// 加载事件列表

 HDL_ON/UI/UI2/FuntionControlView/Electrical/StbPage.cs

@@ -317,8 +317,8 @@
            {
                X = Application.GetRealWidth(116),
                Y = Application.GetRealHeight(466),
                Width = Application.GetRealWidth(32),
                Height = Application.GetRealWidth(32),
                Width = Application.GetRealWidth(35),
                Height = Application.GetRealWidth(35),
                UnSelectedImagePath = "FunctionIcon/AC/More.png",
            };
            controlView.AddChidren(btnMore);
@@ -341,8 +341,6 @@
            LoadEventList();

            new TopViewDiv(bodyView, Language.StringByID(StringId.STB)).LoadTopView_FunctionTop(device, actionRefresh);
            Control.Ins.SendReadCommand(device);

        }


@@ -652,8 +650,8 @@

            var bodyView = new FrameLayout()
            {
                Y = Application.GetRealHeight(427),//667
                Height = Application.GetRealHeight(240),
                Y = Application.GetRealHeight(417),//667
                Height = Application.GetRealHeight(250),
                BackgroundColor = CSS_Color.MainBackgroundColor,
            };
            div.AddChidren(bodyView);
@@ -663,6 +661,7 @@
                Y = Application.GetRealHeight(16),
                Gravity = Gravity.CenterHorizontal,
                Width = Application.GetRealWidth(296 + 200),
                Height = Application.GetRealHeight(234),
            };
            bodyView.AddChidren(contentView);


 HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs

@@ -339,7 +339,6 @@
            LoadEventList();

            new TopViewDiv(bodyView, Language.StringByID(StringId.TV)).LoadTopView_FunctionTop(function, actionRefresh);
            DriverLayer.Control.Ins.SendReadCommand(function);

        }