Merge branch 'Dev-Wxr' into wjc

wjc

2023-04-12 f58a0928df594adb6c9bff6dbc4cb3c37babd104

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

@@ -4,393 +4,272 @@
      "idiom": "universal"
    },
    {
      "scale": "1x",
      "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"
    },
    {
      "filename": "device_bg.png",
      "scale": "2x",
      "idiom": "universal"
      "idiom" : "universal",
      "scale" : "2x"
    },
    {
      "scale": "3x",
      "idiom": "universal"
      "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",
      "idiom": "iphone"
      "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",
      "idiom": "iphone"
      "subtype" : "retina4"
    },
    {
      "subtype": "retina4",
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "light"
        }
      ],
      "idiom" : "iphone",
      "scale": "2x",
      "idiom": "iphone"
      "subtype" : "retina4"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "dark"
        }
      ],
      "idiom" : "iphone",
      "scale" : "2x",
      "subtype" : "retina4"
    },
    {
      "idiom" : "iphone",
      "scale": "3x",
      "idiom": "iphone"
      "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"
    },
    {
      "scale": "1x",
      "idiom": "ipad"
    },
    {
      "scale": "2x",
      "idiom": "ipad"
    },
    {
      "idiom": "watch"
    },
    {
      "scale": "2x",
      "idiom": "watch"
    },
    {
      "screenWidth": "{130,145}",
      "scale": "2x",
      "idiom": "watch"
    },
    {
      "screenWidth": "{146,165}",
      "scale": "2x",
      "idiom": "watch"
    },
    {
      "idiom": "mac"
    },
    {
      "scale": "1x",
      "idiom": "mac"
    },
    {
      "scale": "2x",
      "idiom": "mac"
    },
    {
      "idiom": "car"
    },
    {
      "scale": "2x",
      "idiom": "car"
    },
    {
      "scale": "3x",
      "idiom": "car"
    },
    {
      "appearances": [
        {
          "appearance": "luminosity",
          "value": "dark"
        }
      ],
      "idiom": "universal"
    },
    {
      "appearances": [
        {
          "appearance": "luminosity",
          "value": "dark"
        }
      ],
      "scale": "1x",
      "idiom": "universal"
    },
    {
      "appearances": [
        {
          "appearance": "luminosity",
          "value": "dark"
        }
      ],
      "scale": "2x",
      "idiom": "universal"
    },
    {
      "appearances": [
        {
          "appearance": "luminosity",
          "value": "dark"
        }
      ],
      "scale": "3x",
      "idiom": "universal"
    },
    {
      "appearances": [
        {
          "appearance": "luminosity",
          "value": "dark"
        }
      ],
      "idiom": "iphone"
    },
    {
      "appearances": [
        {
          "appearance": "luminosity",
          "value": "dark"
        }
      ],
      "scale": "1x",
      "idiom": "iphone"
    },
    {
      "appearances": [
        {
          "appearance": "luminosity",
          "value": "dark"
        }
      ],
      "scale": "2x",
      "idiom": "iphone"
    },
    {
      "subtype": "retina4",
      "appearances": [
        {
          "appearance": "luminosity",
          "value": "dark"
        }
      ],
      "scale": "2x",
      "idiom": "iphone"
    },
    {
      "appearances": [
        {
          "appearance": "luminosity",
          "value": "dark"
        }
      ],
      "scale": "3x",
      "idiom": "iphone"
    },
    {
      "appearances": [
        {
          "appearance": "luminosity",
          "value": "dark"
        }
      ],
      "idiom": "ipad"
    },
    {
      "appearances": [
        {
          "appearance": "luminosity",
          "value": "dark"
        }
      ],
      "scale": "1x",
      "idiom": "ipad"
    },
    {
      "appearances": [
        {
          "appearance": "luminosity",
          "value": "dark"
        }
      ],
      "scale": "2x",
      "idiom": "ipad"
    },
    {
      "appearances": [
        {
          "appearance": "luminosity",
          "value": "dark"
        }
      ],
      "idiom": "watch"
    },
    {
      "appearances": [
        {
          "appearance": "luminosity",
          "value": "dark"
        }
      ],
      "scale": "2x",
      "idiom": "watch"
    },
    {
      "screenWidth": "{130,145}",
      "appearances": [
        {
          "appearance": "luminosity",
          "value": "dark"
        }
      ],
      "scale": "2x",
      "idiom": "watch"
    },
    {
      "screenWidth": "{146,165}",
      "appearances": [
        {
          "appearance": "luminosity",
          "value": "dark"
        }
      ],
      "scale": "2x",
      "idiom": "watch"
    },
    {
      "appearances": [
        {
          "appearance": "luminosity",
          "value": "dark"
        }
      ],
      "idiom": "mac"
    },
    {
      "appearances": [
        {
          "appearance": "luminosity",
          "value": "dark"
        }
      ],
      "scale": "1x",
      "idiom": "mac"
    },
    {
      "appearances": [
        {
          "appearance": "luminosity",
          "value": "dark"
        }
      ],
      "scale": "2x",
      "idiom": "mac"
    },
    {
      "appearances": [
        {
          "appearance": "luminosity",
          "value": "dark"
        }
      ],
      "idiom": "car"
    },
    {
      "appearances": [
        {
          "appearance": "luminosity",
          "value": "dark"
        }
      ],
      "scale": "2x",
      "idiom": "car"
    },
    {
      "appearances": [
        {
          "appearance": "luminosity",
          "value": "dark"
        }
      ],
      "scale": "3x",
      "idiom": "car"
    },
    {
      "appearances": [
        {
          "appearance": "luminosity",
          "value": "light"
        }
      ],
      "idiom": "universal"
    },
    {
      "appearances": [
        {
          "appearance": "luminosity",
          "value": "light"
        }
      ],
      "scale": "1x",
      "idiom": "universal"
    },
    {
      "appearances": [
        {
          "appearance": "luminosity",
          "value": "light"
        }
      ],
      "scale": "2x",
      "idiom": "universal"
    },
    {
      "appearances": [
        {
          "appearance": "luminosity",
          "value": "light"
        }
      ],
      "scale": "3x",
      "idiom": "universal"
    },
    {
      "appearances": [
        {
          "appearance": "luminosity",
          "value": "light"
        }
      ],
      "idiom": "iphone"
    },
    {
      "appearances": [
        {
          "appearance": "luminosity",
          "value": "light"
        }
      ],
      "scale": "1x",
      "idiom": "iphone"
    },
    {
      "appearances": [
        {
          "appearance": "luminosity",
          "value": "light"
        }
      ],
      "scale": "2x",
      "idiom": "iphone"
    },
    {
      "subtype": "retina4",
      "appearances": [
        {
          "appearance": "luminosity",
          "value": "light"
        }
      ],
      "scale": "2x",
      "idiom": "iphone"
    },
    {
      "appearances": [
        {
          "appearance": "luminosity",
          "value": "light"
        }
      ],
      "scale": "3x",
      "idiom": "iphone"
    },
    {
      "appearances": [
@@ -405,21 +284,14 @@
      "appearances": [
        {
          "appearance": "luminosity",
          "value": "light"
          "value" : "dark"
        }
      ],
      "scale": "1x",
      "idiom": "ipad"
    },
    {
      "appearances": [
        {
          "appearance": "luminosity",
          "value": "light"
        }
      ],
      "scale": "2x",
      "idiom": "ipad"
      "idiom" : "ipad",
      "scale" : "1x"
    },
    {
      "appearances": [
@@ -428,7 +300,22 @@
          "value": "light"
        }
      ],
      "idiom": "watch"
      "idiom" : "ipad",
      "scale" : "1x"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "dark"
        }
      ],
      "idiom" : "ipad",
      "scale" : "1x"
    },
    {
      "idiom" : "ipad",
      "scale" : "2x"
    },
    {
      "appearances": [
@@ -437,59 +324,21 @@
          "value": "light"
        }
      ],
      "scale": "2x",
      "idiom": "watch"
    },
    {
      "screenWidth": "{130,145}",
      "appearances": [
        {
          "appearance": "luminosity",
          "value": "light"
        }
      ],
      "scale": "2x",
      "idiom": "watch"
    },
    {
      "screenWidth": "{146,165}",
      "appearances": [
        {
          "appearance": "luminosity",
          "value": "light"
        }
      ],
      "scale": "2x",
      "idiom": "watch"
      "idiom" : "ipad",
      "scale" : "2x"
    },
    {
      "appearances": [
        {
          "appearance": "luminosity",
          "value": "light"
          "value" : "dark"
        }
      ],
      "idiom": "mac"
      "idiom" : "ipad",
      "scale" : "2x"
    },
    {
      "appearances": [
        {
          "appearance": "luminosity",
          "value": "light"
        }
      ],
      "scale": "1x",
      "idiom": "mac"
    },
    {
      "appearances": [
        {
          "appearance": "luminosity",
          "value": "light"
        }
      ],
      "scale": "2x",
      "idiom": "mac"
      "idiom" : "car"
    },
    {
      "appearances": [
@@ -504,11 +353,14 @@
      "appearances": [
        {
          "appearance": "luminosity",
          "value": "light"
          "value" : "dark"
        }
      ],
      "scale": "2x",
      "idiom": "car"
    },
    {
      "idiom" : "car",
      "scale" : "2x"
    },
    {
      "appearances": [
@@ -517,12 +369,240 @@
          "value": "light"
        }
      ],
      "scale": "3x",
      "idiom": "car"
      "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": {
    "version": 1,
    "author": "xcode"
    "author" : "xcode",
    "version" : 1
  }
}