use modelName for detection if eligible for motion pro

Maassoft · May 30, 2021 · a17534a · a17534a
1 parent 4614886
commit a17534a
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 5 deletions.
diff --git a/ColorControl/ColorControl.csproj b/ColorControl/ColorControl.csproj
@@ -27,7 +27,7 @@
     <ProductName>ColorControl</ProductName>
     <PublisherName>Maassoft</PublisherName>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>3.1.0.0</ApplicationVersion>
+    <ApplicationVersion>3.1.1.0</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>

diff --git a/ColorControl/LgDevice.cs b/ColorControl/LgDevice.cs
@@ -34,6 +34,9 @@ class LgDevice
         [JsonIgnore]
         private Dictionary<string, Func<bool>> _invokableActions = new Dictionary<string, Func<bool>>();
 
+        [JsonIgnore]
+        public string ModelName { get; private set; }
+
         [JsonConstructor]
         public LgDevice(string name, string ipAddress, string macAddress, bool isCustom = true, bool isDummy = false)
         {
@@ -60,7 +63,14 @@ public async Task<bool> Connect(int retries = 3)
 
                 //Test();
                 //_lgTvApi.Test3();
-                //_lgTvApi.SetSystemSettings();
+                if (_lgTvApi != null)
+                {
+                    var info = await _lgTvApi.GetSystemInfo("modelName");
+                    if (info != null)
+                    {
+                        ModelName = info.modelName;
+                    }
+                }
                 return _lgTvApi != null;
             }
             catch (Exception ex)

diff --git a/ColorControl/MainForm.cs b/ColorControl/MainForm.cs
@@ -2440,7 +2440,8 @@ private void chkLgRemoteControlShow_CheckedChanged(object sender, EventArgs e)
 
         private void mnuLgExpert_Opening(object sender, CancelEventArgs e)
         {
-            mnuLgOLEDMotionPro.Visible = _lgService.SelectedDevice?.Name.Contains("C9") ?? _lgService.SelectedDevice?.Name.Contains("B9") ?? false;
+            var device = _lgService.SelectedDevice;
+            mnuLgOLEDMotionPro.Visible = device?.ModelName != null ? (device.ModelName.Contains("C9") || device.ModelName.Contains("B9")) : false;
 
             if (mnuLgExpertBacklight.DropDownItems.Count == 0)
             {

diff --git a/ColorControl/Properties/AssemblyInfo.cs b/ColorControl/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.1.0.0")]
-[assembly: AssemblyFileVersion("3.1.0.0")]
+[assembly: AssemblyVersion("3.1.1.0")]
+[assembly: AssemblyFileVersion("3.1.1.0")]
diff --git a/ColorControl/lgtv/LgTvApi.cs b/ColorControl/lgtv/LgTvApi.cs
@@ -417,6 +417,19 @@ private async Task ExecuteRequest(string lunauri, object @params)
             }
         }
 
+        public async Task<dynamic> GetSystemInfo(params string[] keys)
+        {
+            var payload = new
+            {
+                keys = keys
+            };
+
+            var requestMessage = new RequestMessage("ssap://system/getSystemInfo", payload);
+            var command = _connection.SendCommandAsync(requestMessage);
+            var res = await command;
+            return res;
+        }
+
         public void Close()
         {
             _connection.Close();