diff --git a/DeviceDetector.php b/DeviceDetector.php index 309a8b20ea..89eec3f351 100644 --- a/DeviceDetector.php +++ b/DeviceDetector.php @@ -1070,7 +1070,12 @@ protected function parseDevice(): void /** * All devices that contain Andr0id in string are assumed to be a tv */ - if ($this->matchUserAgent('Andr0id|(?:Android(?: UHD)?|(?device, [ + AbstractDeviceParser::DEVICE_TYPE_TV, + AbstractDeviceParser::DEVICE_TYPE_PERIPHERAL, + ]) && $this->matchUserAgent('Andr0id|(?:Android(?: UHD)?|Google) TV|\(lite\) TV|BRAVIA| TV$'); + + if ($hasDeviceTvType) { $this->device = AbstractDeviceParser::DEVICE_TYPE_TV; } diff --git a/Tests/fixtures/peripheral.yml b/Tests/fixtures/peripheral.yml index 76c91964ec..4bacae6d4c 100644 --- a/Tests/fixtures/peripheral.yml +++ b/Tests/fixtures/peripheral.yml @@ -1666,3 +1666,39 @@ model: Screeneo U5 os_family: Android browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; Android 10; STI6110 Build/QT; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/124.0.6367.123 YaBrowser/24.10.0.358 (lite) TV Safari/537.36 + os: + name: Android + version: "10" + platform: "" + client: + type: browser + name: Yandex Browser Lite + version: 24.10.0.358 + engine: Blink + engine_version: 124.0.6367.123 + device: + type: peripheral + brand: Epson + model: EF-100 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 10; XK03H Build/QX; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/126.0.6478.133 YaBrowser/24.1.2.221 (lite) TV Safari/537.36 + os: + name: Android + version: "10" + platform: "" + client: + type: browser + name: Yandex Browser Lite + version: 24.1.2.221 + engine: Blink + engine_version: 126.0.6478.133 + device: + type: peripheral + brand: XGIMI + model: Horizon Pro + os_family: Android + browser_family: Unknown diff --git a/Tests/fixtures/tv-3.yml b/Tests/fixtures/tv-3.yml index 961d511f8a..a52a63a145 100644 --- a/Tests/fixtures/tv-3.yml +++ b/Tests/fixtures/tv-3.yml @@ -9165,24 +9165,6 @@ model: 43LE7052D os_family: Android browser_family: Chrome -- - user_agent: Mozilla/5.0 (Linux; Android 10; XK03H Build/QX; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/126.0.6478.133 YaBrowser/24.1.2.221 (lite) TV Safari/537.36 - os: - name: Android - version: "10" - platform: "" - client: - type: browser - name: Yandex Browser Lite - version: 24.1.2.221 - engine: Blink - engine_version: 126.0.6478.133 - device: - type: tv - brand: XGIMI - model: Horizon Pro - os_family: Android - browser_family: Unknown - user_agent: Mozilla/5.0 (Linux; Android 10; SEI600GO) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.88 Mobile Safari/537.36 os: diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index cea8ee59d3..d208b97720 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -38158,9 +38158,13 @@ Novex: # Epson (epson.com) Epson: - regex: 'Projector(?:[);/ ]|$)' + regex: '(?:Projector|STI6110)(?:[);/ ]|$)' device: 'peripheral' - model: 'HA14A LCD Projector' # sti6200-d101 + models: + - regex: 'Projector' + model: 'HA14A LCD Projector' # sti6200-d101 + - regex: 'STI6110' + model: 'EF-100' # Askey # Awow or AWOW (awowtech.com) Awow: