IOS升级xcode14，修复增加远程闪退问题，修复灯光场景（组合调光）无法加载的问题

wxr

2023-04-28 4ae231112f6d8931dd4850f8de382638a032d614

IOS升级xcode14，修复增加远程闪退问题，修复灯光场景（组合调光）无法加载的问题

 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:versionName="1.7.2" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202304261">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.7.2" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202304281">
    <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
    <!--友盟-->
    <!--<uses-sdk android:minSdkVersion="8"></uses-sdk>-->

 HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -100,12 +100,6 @@
      "size" : "83.5x83.5"
    },
    {
      "filename" : "1024.png",
      "idiom" : "ios-marketing",
      "scale" : "1x",
      "size" : "1024x1024"
    },
    {
      "idiom" : "car",
      "scale" : "2x",
      "size" : "60x60"
@@ -114,6 +108,62 @@
      "idiom" : "car",
      "scale" : "3x",
      "size" : "60x60"
    },
    {
      "filename" : "1024.png",
      "idiom" : "ios-marketing",
      "scale" : "1x",
      "size" : "1024x1024"
    },
    {
      "idiom" : "mac",
      "scale" : "1x",
      "size" : "16x16"
    },
    {
      "idiom" : "mac",
      "scale" : "2x",
      "size" : "16x16"
    },
    {
      "idiom" : "mac",
      "scale" : "1x",
      "size" : "32x32"
    },
    {
      "idiom" : "mac",
      "scale" : "2x",
      "size" : "32x32"
    },
    {
      "idiom" : "mac",
      "scale" : "1x",
      "size" : "128x128"
    },
    {
      "idiom" : "mac",
      "scale" : "2x",
      "size" : "128x128"
    },
    {
      "idiom" : "mac",
      "scale" : "1x",
      "size" : "256x256"
    },
    {
      "idiom" : "mac",
      "scale" : "2x",
      "size" : "256x256"
    },
    {
      "idiom" : "mac",
      "scale" : "1x",
      "size" : "512x512"
    },
    {
      "idiom" : "mac",
      "scale" : "2x",
      "size" : "512x512"
    },
    {
      "idiom" : "watch",
@@ -185,6 +235,13 @@
    },
    {
      "idiom" : "watch",
      "role" : "appLauncher",
      "scale" : "2x",
      "size" : "54x54",
      "subtype" : "49mm"
    },
    {
      "idiom" : "watch",
      "role" : "quickLook",
      "scale" : "2x",
      "size" : "86x86",
@@ -212,59 +269,16 @@
      "subtype" : "45mm"
    },
    {
      "idiom" : "watch",
      "role" : "quickLook",
      "scale" : "2x",
      "size" : "129x129",
      "subtype" : "49mm"
    },
    {
      "idiom" : "watch-marketing",
      "scale" : "1x",
      "size" : "1024x1024"
    },
    {
      "idiom" : "mac",
      "scale" : "1x",
      "size" : "16x16"
    },
    {
      "idiom" : "mac",
      "scale" : "2x",
      "size" : "16x16"
    },
    {
      "idiom" : "mac",
      "scale" : "1x",
      "size" : "32x32"
    },
    {
      "idiom" : "mac",
      "scale" : "2x",
      "size" : "32x32"
    },
    {
      "idiom" : "mac",
      "scale" : "1x",
      "size" : "128x128"
    },
    {
      "idiom" : "mac",
      "scale" : "2x",
      "size" : "128x128"
    },
    {
      "idiom" : "mac",
      "scale" : "1x",
      "size" : "256x256"
    },
    {
      "idiom" : "mac",
      "scale" : "2x",
      "size" : "256x256"
    },
    {
      "idiom" : "mac",
      "scale" : "1x",
      "size" : "512x512"
    },
    {
      "idiom" : "mac",
      "scale" : "2x",
      "size" : "512x512"
    }
  ],
  "info" : {

 HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json

@@ -1,255 +1,182 @@
{
  "images": [
  "images" : [
    {
      "orientation": "landscape",
      "extent": "full-screen",
      "size": "1920x1080",
      "scale": "1x",
      "idiom": "tv",
      "minimum-system-version": "9.0"
      "extent" : "full-screen",
      "filename" : "11252436.png",
      "idiom" : "iphone",
      "minimum-system-version" : "11.0",
      "orientation" : "portrait",
      "scale" : "3x",
      "subtype" : "2436h"
    },
    {
      "orientation": "landscape",
      "extent": "full-screen",
      "size": "1920x1080",
      "scale": "2x",
      "idiom": "tv",
      "minimum-system-version": "11.0"
      "extent" : "full-screen",
      "filename" : "24361125.png",
      "idiom" : "iphone",
      "minimum-system-version" : "11.0",
      "orientation" : "landscape",
      "scale" : "3x",
      "subtype" : "2436h"
    },
    {
      "minimum-system-version": "12.0",
      "orientation": "portrait",
      "extent": "full-screen",
      "filename": "12422688.png",
      "size": "414x896",
      "subtype": "1792",
      "scale": "3x",
      "idiom": "iphone"
      "extent" : "full-screen",
      "idiom" : "tv",
      "minimum-system-version" : "11.0",
      "orientation" : "landscape",
      "scale" : "2x"
    },
    {
      "minimum-system-version": "12.0",
      "orientation": "portrait",
      "extent": "full-screen",
      "filename": "8281792.png",
      "size": "276x597.3",
      "subtype": "2688",
      "scale": "3x",
      "idiom": "iphone"
      "extent" : "full-screen",
      "idiom" : "tv",
      "minimum-system-version" : "9.0",
      "orientation" : "landscape",
      "scale" : "1x"
    },
    {
      "minimum-system-version": "12.0",
      "orientation": "landscape",
      "extent": "full-screen",
      "filename": "26881242.png",
      "size": "896x414",
      "subtype": "1792",
      "scale": "3x",
      "idiom": "iphone"
      "extent" : "full-screen",
      "filename" : "12422208.png",
      "idiom" : "iphone",
      "minimum-system-version" : "8.0",
      "orientation" : "portrait",
      "scale" : "3x",
      "subtype" : "736h"
    },
    {
      "minimum-system-version": "12.0",
      "orientation": "landscape",
      "extent": "full-screen",
      "filename": "1792828.png",
      "size": "597.3x276",
      "subtype": "2688",
      "scale": "3x",
      "idiom": "iphone"
      "extent" : "full-screen",
      "filename" : "22081242.png",
      "idiom" : "iphone",
      "minimum-system-version" : "8.0",
      "orientation" : "landscape",
      "scale" : "3x",
      "subtype" : "736h"
    },
    {
      "minimum-system-version": "11.0",
      "orientation": "portrait",
      "extent": "full-screen",
      "filename": "11252436.png",
      "size": "375x812",
      "subtype": "2436h",
      "scale": "3x",
      "idiom": "iphone"
      "extent" : "full-screen",
      "filename" : "7501334.png",
      "idiom" : "iphone",
      "minimum-system-version" : "8.0",
      "orientation" : "portrait",
      "scale" : "2x",
      "subtype" : "667h"
    },
    {
      "minimum-system-version": "11.0",
      "orientation": "landscape",
      "extent": "full-screen",
      "filename": "24361125.png",
      "size": "812x375",
      "subtype": "2436h",
      "scale": "3x",
      "idiom": "iphone"
      "extent" : "full-screen",
      "filename" : "640960.png",
      "idiom" : "iphone",
      "minimum-system-version" : "7.0",
      "orientation" : "portrait",
      "scale" : "2x"
    },
    {
      "minimum-system-version": "8.0",
      "orientation": "portrait",
      "extent": "full-screen",
      "filename": "12422208.png",
      "size": "414x736",
      "subtype": "736h",
      "scale": "3x",
      "idiom": "iphone"
      "extent" : "full-screen",
      "filename" : "6401136.png",
      "idiom" : "iphone",
      "minimum-system-version" : "7.0",
      "orientation" : "portrait",
      "scale" : "2x",
      "subtype" : "retina4"
    },
    {
      "minimum-system-version": "8.0",
      "orientation": "portrait",
      "extent": "full-screen",
      "filename": "7501334.png",
      "size": "375x667",
      "subtype": "667h",
      "scale": "2x",
      "idiom": "iphone"
      "extent" : "full-screen",
      "idiom" : "ipad",
      "minimum-system-version" : "7.0",
      "orientation" : "portrait",
      "scale" : "1x"
    },
    {
      "minimum-system-version": "8.0",
      "orientation": "landscape",
      "extent": "full-screen",
      "filename": "22081242.png",
      "size": "736x414",
      "subtype": "736h",
      "scale": "3x",
      "idiom": "iphone"
      "extent" : "full-screen",
      "idiom" : "ipad",
      "minimum-system-version" : "7.0",
      "orientation" : "landscape",
      "scale" : "1x"
    },
    {
      "minimum-system-version": "7.0",
      "orientation": "portrait",
      "extent": "full-screen",
      "filename": "2048x2732.png",
      "size": "1024x1366",
      "scale": "2x",
      "idiom": "ipad"
      "extent" : "full-screen",
      "idiom" : "ipad",
      "minimum-system-version" : "7.0",
      "orientation" : "portrait",
      "scale" : "2x"
    },
    {
      "minimum-system-version": "7.0",
      "orientation": "portrait",
      "extent": "full-screen",
      "filename": "640960.png",
      "size": "320x480",
      "scale": "2x",
      "idiom": "iphone"
      "extent" : "full-screen",
      "idiom" : "ipad",
      "minimum-system-version" : "7.0",
      "orientation" : "landscape",
      "scale" : "2x"
    },
    {
      "minimum-system-version": "7.0",
      "orientation": "portrait",
      "extent": "full-screen",
      "filename": "6401136.png",
      "size": "320x568",
      "subtype": "retina4",
      "scale": "2x",
      "idiom": "iphone"
      "extent" : "full-screen",
      "filename" : "320480.png",
      "idiom" : "iphone",
      "orientation" : "portrait",
      "scale" : "1x"
    },
    {
      "minimum-system-version": "7.0",
      "orientation": "portrait",
      "extent": "full-screen",
      "size": "768x1024",
      "scale": "1x",
      "idiom": "ipad"
      "extent" : "full-screen",
      "filename" : "640960-1.png",
      "idiom" : "iphone",
      "orientation" : "portrait",
      "scale" : "2x"
    },
    {
      "minimum-system-version": "7.0",
      "orientation": "portrait",
      "extent": "full-screen",
      "size": "768x1024",
      "scale": "2x",
      "idiom": "ipad"
      "extent" : "full-screen",
      "filename" : "6401136-1.png",
      "idiom" : "iphone",
      "orientation" : "portrait",
      "scale" : "2x",
      "subtype" : "retina4"
    },
    {
      "minimum-system-version": "7.0",
      "orientation": "landscape",
      "extent": "full-screen",
      "size": "1024x768",
      "scale": "1x",
      "idiom": "ipad"
      "extent" : "to-status-bar",
      "idiom" : "ipad",
      "orientation" : "portrait",
      "scale" : "1x"
    },
    {
      "minimum-system-version": "7.0",
      "orientation": "landscape",
      "extent": "full-screen",
      "size": "1024x768",
      "scale": "2x",
      "idiom": "ipad"
      "extent" : "full-screen",
      "idiom" : "ipad",
      "orientation" : "portrait",
      "scale" : "1x"
    },
    {
      "orientation": "portrait",
      "extent": "full-screen",
      "filename": "320480.png",
      "size": "320x480",
      "scale": "1x",
      "idiom": "iphone"
      "extent" : "to-status-bar",
      "idiom" : "ipad",
      "orientation" : "landscape",
      "scale" : "1x"
    },
    {
      "orientation": "portrait",
      "extent": "full-screen",
      "filename": "640960-1.png",
      "size": "320x480",
      "scale": "2x",
      "idiom": "iphone"
      "extent" : "full-screen",
      "idiom" : "ipad",
      "orientation" : "landscape",
      "scale" : "1x"
    },
    {
      "orientation": "portrait",
      "extent": "full-screen",
      "filename": "6401136-1.png",
      "size": "320x568",
      "subtype": "retina4",
      "scale": "2x",
      "idiom": "iphone"
      "extent" : "to-status-bar",
      "idiom" : "ipad",
      "orientation" : "portrait",
      "scale" : "2x"
    },
    {
      "orientation": "portrait",
      "extent": "to-status-bar",
      "size": "768x1004",
      "scale": "1x",
      "idiom": "ipad"
      "extent" : "full-screen",
      "idiom" : "ipad",
      "orientation" : "portrait",
      "scale" : "2x"
    },
    {
      "orientation": "portrait",
      "extent": "to-status-bar",
      "size": "768x1004",
      "scale": "2x",
      "idiom": "ipad"
      "extent" : "to-status-bar",
      "idiom" : "ipad",
      "orientation" : "landscape",
      "scale" : "2x"
    },
    {
      "orientation": "portrait",
      "extent": "full-screen",
      "size": "768x1024",
      "scale": "1x",
      "idiom": "ipad"
    },
    {
      "orientation": "portrait",
      "extent": "full-screen",
      "size": "768x1024",
      "scale": "2x",
      "idiom": "ipad"
    },
    {
      "orientation": "landscape",
      "extent": "to-status-bar",
      "size": "1024x748",
      "scale": "1x",
      "idiom": "ipad"
    },
    {
      "orientation": "landscape",
      "extent": "to-status-bar",
      "size": "1024x748",
      "scale": "2x",
      "idiom": "ipad"
    },
    {
      "orientation": "landscape",
      "extent": "full-screen",
      "size": "1024x768",
      "scale": "1x",
      "idiom": "ipad"
    },
    {
      "orientation": "landscape",
      "extent": "full-screen",
      "size": "1024x768",
      "scale": "2x",
      "idiom": "ipad"
      "extent" : "full-screen",
      "idiom" : "ipad",
      "orientation" : "landscape",
      "scale" : "2x"
    }
  ],
  "info": {
    "version": 1,
    "author": "xcode"
  "info" : {
    "author" : "xcode",
    "version" : 1
  }
}
}

 HDL-ON_iOS/Assets.xcassets/device_bg.imageset/Contents.json

@@ -1,47 +1,6 @@
{
  "images" : [
    {
      "idiom" : "universal"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "light"
        }
      ],
      "idiom" : "universal"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "dark"
        }
      ],
      "idiom" : "universal"
    },
    {
      "idiom" : "universal",
      "scale" : "1x"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "light"
        }
      ],
      "idiom" : "universal",
      "scale" : "1x"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "dark"
        }
      ],
      "idiom" : "universal",
      "scale" : "1x"
    },
@@ -51,554 +10,8 @@
      "scale" : "2x"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "light"
        }
      ],
      "idiom" : "universal",
      "scale" : "2x"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "dark"
        }
      ],
      "idiom" : "universal",
      "scale" : "2x"
    },
    {
      "idiom" : "universal",
      "scale" : "3x"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "light"
        }
      ],
      "idiom" : "universal",
      "scale" : "3x"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "dark"
        }
      ],
      "idiom" : "universal",
      "scale" : "3x"
    },
    {
      "idiom" : "iphone"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "light"
        }
      ],
      "idiom" : "iphone"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "dark"
        }
      ],
      "idiom" : "iphone"
    },
    {
      "idiom" : "iphone",
      "scale" : "1x"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "light"
        }
      ],
      "idiom" : "iphone",
      "scale" : "1x"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "dark"
        }
      ],
      "idiom" : "iphone",
      "scale" : "1x"
    },
    {
      "idiom" : "iphone",
      "scale" : "2x"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "light"
        }
      ],
      "idiom" : "iphone",
      "scale" : "2x"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "dark"
        }
      ],
      "idiom" : "iphone",
      "scale" : "2x"
    },
    {
      "idiom" : "iphone",
      "scale" : "3x"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "light"
        }
      ],
      "idiom" : "iphone",
      "scale" : "3x"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "dark"
        }
      ],
      "idiom" : "iphone",
      "scale" : "3x"
    },
    {
      "idiom" : "iphone",
      "scale" : "1x",
      "subtype" : "retina4"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "light"
        }
      ],
      "idiom" : "iphone",
      "scale" : "1x",
      "subtype" : "retina4"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "dark"
        }
      ],
      "idiom" : "iphone",
      "scale" : "1x",
      "subtype" : "retina4"
    },
    {
      "idiom" : "iphone",
      "scale" : "2x",
      "subtype" : "retina4"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "light"
        }
      ],
      "idiom" : "iphone",
      "scale" : "2x",
      "subtype" : "retina4"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "dark"
        }
      ],
      "idiom" : "iphone",
      "scale" : "2x",
      "subtype" : "retina4"
    },
    {
      "idiom" : "iphone",
      "scale" : "3x",
      "subtype" : "retina4"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "light"
        }
      ],
      "idiom" : "iphone",
      "scale" : "3x",
      "subtype" : "retina4"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "dark"
        }
      ],
      "idiom" : "iphone",
      "scale" : "3x",
      "subtype" : "retina4"
    },
    {
      "idiom" : "ipad"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "light"
        }
      ],
      "idiom" : "ipad"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "dark"
        }
      ],
      "idiom" : "ipad"
    },
    {
      "idiom" : "ipad",
      "scale" : "1x"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "light"
        }
      ],
      "idiom" : "ipad",
      "scale" : "1x"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "dark"
        }
      ],
      "idiom" : "ipad",
      "scale" : "1x"
    },
    {
      "idiom" : "ipad",
      "scale" : "2x"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "light"
        }
      ],
      "idiom" : "ipad",
      "scale" : "2x"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "dark"
        }
      ],
      "idiom" : "ipad",
      "scale" : "2x"
    },
    {
      "idiom" : "car"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "light"
        }
      ],
      "idiom" : "car"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "dark"
        }
      ],
      "idiom" : "car"
    },
    {
      "idiom" : "car",
      "scale" : "2x"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "light"
        }
      ],
      "idiom" : "car",
      "scale" : "2x"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "dark"
        }
      ],
      "idiom" : "car",
      "scale" : "2x"
    },
    {
      "idiom" : "car",
      "scale" : "3x"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "light"
        }
      ],
      "idiom" : "car",
      "scale" : "3x"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "dark"
        }
      ],
      "idiom" : "car",
      "scale" : "3x"
    },
    {
      "idiom" : "watch"
    },
    {
      "idiom" : "watch",
      "screen-width" : "<=145"
    },
    {
      "idiom" : "watch",
      "screen-width" : ">161"
    },
    {
      "idiom" : "watch",
      "screen-width" : ">145"
    },
    {
      "idiom" : "watch",
      "screen-width" : ">183"
    },
    {
      "idiom" : "watch",
      "scale" : "2x"
    },
    {
      "idiom" : "watch",
      "scale" : "2x",
      "screen-width" : "<=145"
    },
    {
      "idiom" : "watch",
      "scale" : "2x",
      "screen-width" : ">161"
    },
    {
      "idiom" : "watch",
      "scale" : "2x",
      "screen-width" : ">145"
    },
    {
      "idiom" : "watch",
      "scale" : "2x",
      "screen-width" : ">183"
    },
    {
      "idiom" : "mac"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "light"
        }
      ],
      "idiom" : "mac"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "dark"
        }
      ],
      "idiom" : "mac"
    },
    {
      "idiom" : "mac",
      "scale" : "1x"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "light"
        }
      ],
      "idiom" : "mac",
      "scale" : "1x"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "dark"
        }
      ],
      "idiom" : "mac",
      "scale" : "1x"
    },
    {
      "idiom" : "mac",
      "scale" : "2x"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "light"
        }
      ],
      "idiom" : "mac",
      "scale" : "2x"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "dark"
        }
      ],
      "idiom" : "mac",
      "scale" : "2x"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "light"
        }
      ],
      "idiom" : "watch"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "dark"
        }
      ],
      "idiom" : "watch"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "light"
        }
      ],
      "idiom" : "watch",
      "scale" : "2x"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "dark"
        }
      ],
      "idiom" : "watch",
      "scale" : "2x"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "light"
        }
      ],
      "idiom" : "watch",
      "scale" : "2x",
      "screen-width" : "<=145"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "dark"
        }
      ],
      "idiom" : "watch",
      "scale" : "2x",
      "screen-width" : "<=145"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "light"
        }
      ],
      "idiom" : "watch",
      "scale" : "2x",
      "screen-width" : ">145"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "dark"
        }
      ],
      "idiom" : "watch",
      "scale" : "2x",
      "screen-width" : ">145"
    }
  ],
  "info" : {

 HDL-ON_iOS/HDL-ON_iOS.csproj

@@ -461,6 +461,14 @@
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\12422208.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\7501334.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\22081242.png" />
        <ImageAsset Include="Resources\Assets.xcassets\Contents.json" />
        <ImageAsset Include="Resources\Assets.xcassets\launchIcon2.imageset\Contents.json" />
        <ImageAsset Include="Resources\Assets.xcassets\launchIcon2.imageset\launchIcon2.png" />
        <ImageAsset Include="Resources\Assets.xcassets\launchIcon.imageset\launchIcon.png" />
        <ImageAsset Include="Resources\Assets.xcassets\launchIcon.imageset\Contents.json" />
        <ImageAsset Include="Resources\Assets.xcassets\launchIcon1.imageset\launchIcon1.png" />
        <ImageAsset Include="Resources\Assets.xcassets\launchIcon1.imageset\Contents.json" />
        <ImageAsset Include="Resources\Assets.xcassets\.DS_Store" />
    </ItemGroup>
    <ItemGroup>
        <Folder Include="Resources\" />
@@ -1580,6 +1588,7 @@
      <BundleResource Include="Resources\Phone\FunctionIcon\Icon\securitydoorezviz.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\VideoDoorlockClose1.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\VideoDoorLockOpen1.png" />
      <BundleResource Include="Resources\.DS_Store" />
    </ItemGroup>
    <ItemGroup>
      <ITunesArtwork Include="iTunesArtwork" />

 HDL-ON_iOS/LaunchScreen.storyboard

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
    <device id="retina6_1" orientation="portrait" appearance="light"/>
    <dependencies>
        <deployment identifier="iOS"/>
        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
    </dependencies>
    <scenes>
@@ -19,12 +19,37 @@
                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="gAz-Vf-lRO">
                                <rect key="frame" x="111" y="366" width="176" height="139"/>
                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launchIcon1" translatesAutoresizingMaskIntoConstraints="NO" id="9nT-Fx-4qG">
                                <rect key="frame" x="240" y="48" width="174" height="162"/>
                                <constraints>
                                    <constraint firstAttribute="width" constant="174" id="YFZ-tm-Sjh"/>
                                    <constraint firstAttribute="height" constant="162" id="i7v-Bl-YJn"/>
                                </constraints>
                            </imageView>
                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launchIcon2" translatesAutoresizingMaskIntoConstraints="NO" id="dJG-xt-76U">
                                <rect key="frame" x="0.0" y="663" width="103" height="165"/>
                                <constraints>
                                    <constraint firstAttribute="width" constant="103" id="Mee-eE-gBJ"/>
                                    <constraint firstAttribute="height" constant="165" id="v86-9G-Ngl"/>
                                </constraints>
                            </imageView>
                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launchIcon" translatesAutoresizingMaskIntoConstraints="NO" id="gAz-Vf-lRO">
                                <rect key="frame" x="101" y="362" width="212" height="172"/>
                                <constraints>
                                    <constraint firstAttribute="height" constant="172" id="1dy-BP-0hc"/>
                                    <constraint firstAttribute="width" constant="212" id="IFI-Nv-6iF"/>
                                </constraints>
                            </imageView>
                        </subviews>
                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                        <constraints>
                            <constraint firstItem="dJG-xt-76U" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="A1f-1j-aJ5"/>
                            <constraint firstItem="gAz-Vf-lRO" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="GAY-53-0IG"/>
                            <constraint firstAttribute="trailing" secondItem="9nT-Fx-4qG" secondAttribute="trailing" id="W0G-jB-s4B"/>
                            <constraint firstItem="9nT-Fx-4qG" firstAttribute="top" secondItem="Llm-lL-Icb" secondAttribute="bottom" id="eg7-2m-rvD"/>
                            <constraint firstItem="xb3-aO-Qok" firstAttribute="top" secondItem="dJG-xt-76U" secondAttribute="bottom" constant="34" id="mX9-qo-4vp"/>
                            <constraint firstItem="gAz-Vf-lRO" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="oTs-PN-mAs"/>
                        </constraints>
                    </view>
                </viewController>
                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -32,4 +57,9 @@
            <point key="canvasLocation" x="52.173913043478265" y="375"/>
        </scene>
    </scenes>
    <resources>
        <image name="launchIcon" width="550" height="550"/>
        <image name="launchIcon1" width="610" height="570"/>
        <image name="launchIcon2" width="326" height="578"/>
    </resources>
</document>

 HDL-ON_iOS/Resources/Assets.xcassets/Contents.json

New file
@@ -0,0 +1,6 @@
{
  "info" : {
    "author" : "xcode",
    "version" : 1
  }
}

 HDL-ON_iOS/Resources/Assets.xcassets/launchIcon.imageset/Contents.json

New file
@@ -0,0 +1,21 @@
{
  "images" : [
    {
      "filename" : "launchIcon.png",
      "idiom" : "universal",
      "scale" : "1x"
    },
    {
      "idiom" : "universal",
      "scale" : "2x"
    },
    {
      "idiom" : "universal",
      "scale" : "3x"
    }
  ],
  "info" : {
    "author" : "xcode",
    "version" : 1
  }
}

 HDL-ON_iOS/Resources/Assets.xcassets/launchIcon.imageset/launchIcon.png

 HDL-ON_iOS/Resources/Assets.xcassets/launchIcon1.imageset/Contents.json

New file
@@ -0,0 +1,21 @@
{
  "images" : [
    {
      "filename" : "launchIcon1.png",
      "idiom" : "universal",
      "scale" : "1x"
    },
    {
      "idiom" : "universal",
      "scale" : "2x"
    },
    {
      "idiom" : "universal",
      "scale" : "3x"
    }
  ],
  "info" : {
    "author" : "xcode",
    "version" : 1
  }
}

 HDL-ON_iOS/Resources/Assets.xcassets/launchIcon1.imageset/launchIcon1.png

 HDL-ON_iOS/Resources/Assets.xcassets/launchIcon2.imageset/Contents.json

New file
@@ -0,0 +1,21 @@
{
  "images" : [
    {
      "filename" : "launchIcon2.png",
      "idiom" : "universal",
      "scale" : "1x"
    },
    {
      "idiom" : "universal",
      "scale" : "2x"
    },
    {
      "idiom" : "universal",
      "scale" : "3x"
    }
  ],
  "info" : {
    "author" : "xcode",
    "version" : 1
  }
}

 HDL-ON_iOS/Resources/Assets.xcassets/launchIcon2.imageset/launchIcon2.png

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

@@ -28,6 +28,7 @@
        #endregion

        List<Function> functionList;
        int titleId;

        public FunctionPage()
        {
@@ -35,8 +36,9 @@
            functionList = new List<Function>();
        }

        public void LoadPage(int titleId)
        public void LoadPage(int titleId_out)
        {
            this.titleId = titleId_out;

            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
            if (titleId == StringId.Lights && !DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl)
@@ -145,16 +147,7 @@
                functionList.AddRange(FunctionList.List.GetLightList());


                var lightScene = FunctionList.List.scenes.FindAll((obj) => obj.sceneType == SceneType.LightScene);

                foreach (var scene in lightScene)
                {
                    functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });

                    var sceneRow = new SceneControlZone(scene);
                    functionListView.AddChidren(sceneRow);
                    sceneRow.LoadView();
                }

            }
            else if (titleId == StringId.AC)
@@ -200,22 +193,7 @@
            LoadDialog_ChangeFloor();


            #region 加载组合调光场景
            if (titleId == StringId.Lights)
            {
                foreach (var lightScene in FunctionList.List.scenes)
                {
                    if (lightScene.sceneType == SceneType.LightScene)
                        if (lightScene != null)
                        {
                            functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
                            var sceneRow = new SceneControlZone(lightScene);
                            functionListView.AddChidren(sceneRow);
                            sceneRow.LoadView();
                        }
                }
            }
            #endregion
        

        }
        /// <summary>
@@ -241,8 +219,24 @@
                        {
                            showCount = -1;
                            functionListView.RemoveAll();
                            #region 加载组合调光场景
                            if (titleId == StringId.Lights)
                            {
                                foreach (var lightScene in FunctionList.List.scenes)
                                {
                                    if (lightScene.sceneType == SceneType.LightScene)
                                        if (lightScene != null)
                                        {
                                            var sceneRow = new SceneControlZone(lightScene);
                                            functionListView.AddChidren(sceneRow);
                                            sceneRow.LoadView();
                                            functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
                                        }
                                }
                            }
                            #endregion
                        }
                        for(var i = 0;i<50;i++)
                        for (var i = 0;i<50;i++)
                        //foreach (var function in showList)
                        {
                            showCount++;

 SiriIntents/SiriIntents.csproj

@@ -79,7 +79,7 @@
    <MtouchArch>ARM64</MtouchArch>

    <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>

    <MtouchVerbosity></MtouchVerbosity>

    <CodesignProvision>OnProSiri230308-2-Dev</CodesignProvision>

    <CodesignProvision>OnProSiri230417-1-Dev</CodesignProvision>

  </PropertyGroup>

  <ItemGroup>

    <Reference Include="System" />


 SiriIntentsUI/SiriIntentsUI.csproj

@@ -83,7 +83,7 @@
    <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>

    <MtouchVerbosity></MtouchVerbosity>

    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

    <CodesignProvision>OnProSiriUI230308-2-Dev</CodesignProvision>

    <CodesignProvision>OnProSiriUI230417-1-Dev</CodesignProvision>

  </PropertyGroup>

  <ItemGroup>

    <Reference Include="System" />