From 8a56cea799c6fb9c66f77ac899f41c42775d9c4e Mon Sep 17 00:00:00 2001
From: Tutik Alexsandr <sanchezzzhak@ya.ru>
Date: Tue, 29 Mar 2022 19:00:14 +0300
Subject: [PATCH] Detect new brands: YU Fly, VOGA, Haipai, Huagan, TD Tech and
 Detect devices for several existing brands (#7069)

* feat(device) detect new brand YU Fly: F9
feat(device) detect brand OPPO: Reno 3 Pro (PCRT00)
feat(device) detect brand Huawei: Smart Watch 2 Sport (LEO-DLXX)

* feat(device) detect new brand VOGA: V (55909)
feat(device) detect brand Huawei: C3 9.6" (BZA-L00)

* feat(device) detect new brand Haipai: Noble S6
feat(device) detect new brand Huagan: HT6
feat(device) detect brand Huawei: Mate S (CRR-UL20, CRR-CL00), Honor X30 Max (KKG-AN70), Honor Magic 5 (MGI-AN00)
feat(device) detect brand OnePlus: Nord CE 2 (IV2201), 10 Pro Extreme Edition (NE2210)
feat(device) detect brand Vivo: iQOO 9 Pro (V2172A), iQOO U5 (V2165A), Y55s (2021) (V2164A), Y12 Pro (V2163A)
feat(device) detect brand ZTE: Blade S30 (9030N), Voyage 20 Pro (9040N)
feat(device) detect brand Unihertz: Titan Pocket

* feat(device) detect brand Huawei: Honor Play 30 Plus (CMA-AN00)
feat(device) detect brand Motorola: Edge S30 (XT2175-2), Moto G51 (XT2171-3)

* feat(device) detect new brand TD Tech: N8 Pro (NAT-TN70)
feat(device) detect brand Teclast: P20HD (N6H5)
feat(device) detect brand ZTE: Axon 11 5G (A2021H), Axon 10s Pro 5G (A2020 SP),
 Axon 11 SE 5G (9000N), Blade V2021 5G (8012N)
feat(device) detect brand Xiaomi: Redmi 10 Prime (2022) (22011119TI), MiTV Q1 (MiTV-MTEQ0)
feat(device) detect brand Huawei: Honor Play 5 Vitality (NEW-AN90), Honor X30 (ANY-AN00),
 Honor Pad V7 10.4" WiFi (KRJ2-W09), Honor Pad V7 10.4" 5G (KRJ2-AN00),
 Honor Pad V7 Pro 11" WiFi (BRT-W09), Honor Pad V7 Pro 11" 5G (BRT-AN09)
---
 Parser/Device/AbstractDeviceParser.php |   5 +
 Tests/fixtures/smartphone-19.yml       |  18 -
 Tests/fixtures/smartphone-29.yml       | 604 +++++++++++++++++++++++++
 Tests/fixtures/tablet-1.yml            |   2 +-
 Tests/fixtures/tablet-7.yml            | 143 +++++-
 Tests/fixtures/tv-1.yml                |  18 +
 Tests/fixtures/wearable.yml            |  18 +
 regexes/device/mobiles.yml             | 136 +++++-
 8 files changed, 903 insertions(+), 41 deletions(-)

diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php
index a3ae887b4d..35903350af 100644
--- a/Parser/Device/AbstractDeviceParser.php
+++ b/Parser/Device/AbstractDeviceParser.php
@@ -482,6 +482,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         '9Z' => 'H96',
         'HF' => 'Hafury',
         'HA' => 'Haier',
+        'XH' => 'Haipai',
         'HE' => 'HannSpree',
         'HK' => 'Hardkernel',
         'HS' => 'Hasee',
@@ -514,6 +515,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'WH' => 'Honeywell',
         'HP' => 'HP',
         'HT' => 'HTC',
+        'QZ' => 'Huagan',
         'HD' => 'Huadoo',
         'HG' => 'Huavi',
         'HU' => 'Huawei',
@@ -1109,6 +1111,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'T5' => 'TB Touch',
         'TC' => 'TCL',
         'T0' => 'TD Systems',
+        'YY' => 'TD Tech',
         'H4' => 'Technicolor',
         'Z5' => 'Technika',
         'TX' => 'TechniSat',
@@ -1242,6 +1245,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'V0' => 'VKworld',
         'VM' => 'Vodacom',
         'VF' => 'Vodafone',
+        '7W' => 'VOGA',
         'V2' => 'Vonino',
         '1V' => 'Vontar',
         'VG' => 'Vorago',
@@ -1305,6 +1309,7 @@ abstract class AbstractDeviceParser extends AbstractParser
         'YT' => 'Ytone',
         'Y9' => 'YOTOPT',
         'Y1' => 'Yu',
+        'YF' => 'YU Fly',
         'Y0' => 'YUHO',
         'YN' => 'Yuno',
         'YU' => 'Yuandao',
diff --git a/Tests/fixtures/smartphone-19.yml b/Tests/fixtures/smartphone-19.yml
index ff1f5a699e..6e073b4646 100644
--- a/Tests/fixtures/smartphone-19.yml
+++ b/Tests/fixtures/smartphone-19.yml
@@ -3041,24 +3041,6 @@
     model: Smart Box v009
   os_family: Android
   browser_family: Chrome
--
-  user_agent: Mozilla/5.0 (Linux; arm; Android 10; KRJ-W09) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.127 YaApp_Android/20.94.0/apad YaSearchBrowser/20.94.0/apad BroPP/1.0 SA/3 Mobile Safari/537.36
-  os:
-    name: Android
-    version: "10"
-    platform: ARM
-  client:
-    type: browser
-    name: Yandex Browser
-    version: 20.94.0
-    engine: Blink
-    engine_version: "85.0.4183.127"
-  device:
-    type: tablet
-    brand: Huawei
-    model: Honor Pad V6
-  os_family: Android
-  browser_family: Unknown
 -
   user_agent: Mozilla/5.0 (Linux; Android 6.0.1; Lenovo TB-7703X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.198 Mobile Safari/537.36
   os:
diff --git a/Tests/fixtures/smartphone-29.yml b/Tests/fixtures/smartphone-29.yml
index 2792806705..267fc4e8c5 100644
--- a/Tests/fixtures/smartphone-29.yml
+++ b/Tests/fixtures/smartphone-29.yml
@@ -4933,3 +4933,607 @@
     model: Le Fit
   os_family: Android
   browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 8.0.0; GIONEE F6 Pro Build/OPR1.170623.032; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/74.0.3729.157 Mobile Safari/537.36
+  os:
+    name: Android
+    version: 8.0.0
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Webview
+    version: 74.0.3729.157
+    engine: Blink
+    engine_version: 74.0.3729.157
+  device:
+    type: smartphone
+    brand: Gionee
+    model: F6
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 7.1.2; PCRT00) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/68.0.3440.70 Mobile Safari/537.36
+  os:
+    name: Android
+    version: 7.1.2
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 68.0.3440.70
+    engine: Blink
+    engine_version: 68.0.3440.70
+  device:
+    type: smartphone
+    brand: OPPO
+    model: Reno 3 Pro
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 7.1.1; YU FLY F9 Build/NMF26F; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/63.0.3239.83 Mobile Safari/537.36 T7/11.12 baiduboxapp/11.12.0.10 (Baidu; P1 7.1.1)
+  os:
+    name: Android
+    version: 7.1.1
+    platform: ""
+  client:
+    type: mobile app
+    name: Baidu Box App
+    version: 11.12.0.10
+  device:
+    type: smartphone
+    brand: YU Fly
+    model: F9
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; Android 7.0; VOGA 55909 Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/51.0.2704.91 Mobile Safari/537.36 iThunder;thirdChannel_SHOUJIXUNLEI/7.39.0.7882 xl_cloud statusBarHeight/81 statusBarHeightDp/24.0
+  os:
+    name: Android
+    version: "7.0"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Webview
+    version: 51.0.2704.91
+    engine: Blink
+    engine_version: 51.0.2704.91
+  device:
+    type: smartphone
+    brand: VOGA
+    model: V
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 6.0; HUAWEI CRR-UL20 Build/HUAWEICRR-UL20; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/55.0.2883.91 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "6.0"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Webview
+    version: 55.0.2883.91
+    engine: Blink
+    engine_version: 55.0.2883.91
+  device:
+    type: smartphone
+    brand: Huawei
+    model: Mate S
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 6.0; HUAWEI CRR-CL00 Build/HUAWEICRR-CL00; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/49.0.2623.105 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "6.0"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Webview
+    version: 49.0.2623.105
+    engine: Blink
+    engine_version: 49.0.2623.105
+  device:
+    type: smartphone
+    brand: Huawei
+    model: Mate S
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 6.0; HUAGAN HT6 Build/MRA58K; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/44.0.2403.119 Mobile Safari/537.36 lite baiduboxapp/4.0.0.10 (Baidu; P1 6.0)
+  os:
+    name: Android
+    version: "6.0"
+    platform: ""
+  client:
+    type: mobile app
+    name: Baidu Box App
+    version: 4.0.0.10
+  device:
+    type: smartphone
+    brand: Huagan
+    model: HT6
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; Android 6.0; Haipainoble S6 Build/DQ) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.94 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "6.0"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 45.0.2454.94
+    engine: Blink
+    engine_version: 45.0.2454.94
+  device:
+    type: smartphone
+    brand: Haipai
+    model: Noble S6
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; KKG-AN70 Build/HONORKKG-AN70; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/75.0.3770.156 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Webview
+    version: 75.0.3770.156
+    engine: Blink
+    engine_version: 75.0.3770.156
+  device:
+    type: smartphone
+    brand: Huawei
+    model: Honor X30 Max
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; IV2201) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.104 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 96.0.4664.104
+    engine: Blink
+    engine_version: 96.0.4664.104
+  device:
+    type: smartphone
+    brand: OnePlus
+    model: Nord CE 2
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 12; NE2210) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.4692.98 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "12"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 97.0.4692.98
+    engine: Blink
+    engine_version: 97.0.4692.98
+  device:
+    type: smartphone
+    brand: OnePlus
+    model: 10 Pro Extreme Edition
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 12; MGI-AN00; HMSCore 6.3.0.327) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.105 HuaweiBrowser/12.0.3.310 Safari/537.36
+  os:
+    name: Android
+    version: "12"
+    platform: ""
+  client:
+    type: browser
+    name: Huawei Browser Mobile
+    version: 12.0.3.310
+    engine: Blink
+    engine_version: 92.0.4515.105
+  device:
+    type: smartphone
+    brand: Huawei
+    model: Honor Magic 5
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 12; V2172A) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.4692.98 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "12"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 97.0.4692.98
+    engine: Blink
+    engine_version: 97.0.4692.98
+  device:
+    type: smartphone
+    brand: Vivo
+    model: iQOO 9 Pro
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; ZTE 9030N Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/87.0.4280.141 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Webview
+    version: 87.0.4280.141
+    engine: Blink
+    engine_version: 87.0.4280.141
+  device:
+    type: smartphone
+    brand: ZTE
+    model: Blade S30
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; ZTE 9040N Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/76.0.3809.89 Mobile Safari/537.36 T7/13.3 SP-engine/2.41.0 baiduboxapp/13.3.0.11 (Baidu; P1 11) NABar/1.0
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: mobile app
+    name: Baidu Box App
+    version: 13.3.0.11
+  device:
+    type: smartphone
+    brand: ZTE
+    model: Voyage 20 Pro
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; Titan_pocket) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.210 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 90.0.4430.210
+    engine: Blink
+    engine_version: 90.0.4430.210
+  device:
+    type: smartphone
+    brand: Unihertz
+    model: Titan Pocket
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; SM-F7110) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.74 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 95.0.4638.74
+    engine: Blink
+    engine_version: 95.0.4638.74
+  device:
+    type: phablet
+    brand: Samsung
+    model: Galaxy Z Flip 3
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 12; V2165A Build/SP1A.210812.003; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/91.0.4472.114 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "12"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Webview
+    version: 91.0.4472.114
+    engine: Blink
+    engine_version: 91.0.4472.114
+  device:
+    type: smartphone
+    brand: Vivo
+    model: iQOO U5
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; V2164A; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/87.0.4280.141 Mobile Safari/537.36 VivoBrowser/10.5.17.1
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: vivo Browser
+    version: 10.5.17.1
+    engine: WebKit
+    engine_version: "537.36"
+  device:
+    type: smartphone
+    brand: Vivo
+    model: Y55s (2021)
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; V2163A; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/87.0.4280.141 Mobile Safari/537.36 VivoBrowser/10.5.17.1
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: vivo Browser
+    version: 10.5.17.1
+    engine: WebKit
+    engine_version: "537.36"
+  device:
+    type: smartphone
+    brand: Vivo
+    model: Y12 Pro
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; XT2175-2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.104 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 96.0.4664.104
+    engine: Blink
+    engine_version: 96.0.4664.104
+  device:
+    type: smartphone
+    brand: Motorola
+    model: Edge S30
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; XT2171-3 Build/RRYA31.Q3-56-47; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/94.0.4606.85 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Webview
+    version: 94.0.4606.85
+    engine: Blink
+    engine_version: 94.0.4606.85
+  device:
+    type: smartphone
+    brand: Motorola
+    model: Moto G51
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; CMA-AN00; HMSCore 6.2.0.302) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.106 HuaweiBrowser/11.0.8.305 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Huawei Browser Mobile
+    version: 11.0.8.305
+    engine: Blink
+    engine_version: 83.0.4103.106
+  device:
+    type: smartphone
+    brand: Huawei
+    model: Honor Play 30 Plus
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 10; ZTE A2021H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.96 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "10"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 78.0.3904.96
+    engine: Blink
+    engine_version: 78.0.3904.96
+  device:
+    type: smartphone
+    brand: ZTE
+    model: Axon 11 5G
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 10; ZTE A2020 SP Build/QKQ1.200913.002; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/68.0.3440.106 Mobile Safari/537.36 AWP/2.0 SogouMSE,SogouMobileBrowser/6.5.11
+  os:
+    name: Android
+    version: "10"
+    platform: ""
+  client:
+    type: browser
+    name: Sogou Mobile Browser
+    version: 6.5.11
+    engine: WebKit
+    engine_version: "537.36"
+  device:
+    type: smartphone
+    brand: ZTE
+    model: Axon 10s Pro 5G
+  os_family: Android
+  browser_family: Safari
+-
+  user_agent: Mozilla/5.0 (Linux; Android 10; ZTE 9000N Build/QP1A.190711.020; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/87.0.4280.101 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "10"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Webview
+    version: 87.0.4280.101
+    engine: Blink
+    engine_version: 87.0.4280.101
+  device:
+    type: smartphone
+    brand: ZTE
+    model: Axon 11 SE 5G
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 10; ZTE 8012N Build/QP1A.190711.020; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/87.0.4280.101 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "10"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Webview
+    version: 87.0.4280.101
+    engine: Blink
+    engine_version: 87.0.4280.101
+  device:
+    type: smartphone
+    brand: ZTE
+    model: Blade V2021 5G
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; 22011119TI) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 92.0.4515.131
+    engine: Blink
+    engine_version: 92.0.4515.131
+  device:
+    type: smartphone
+    brand: Xiaomi
+    model: Redmi 10 Prime (2022)
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 10; NAT-TN70; HMSCore 6.3.0.327) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.105 HuaweiBrowser/12.0.3.310 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "10"
+    platform: ""
+  client:
+    type: browser
+    name: Huawei Browser Mobile
+    version: 12.0.3.310
+    engine: Blink
+    engine_version: 92.0.4515.105
+  device:
+    type: smartphone
+    brand: TD Tech
+    model: N8 Pro
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; MEIZU 18X Build/RKQ1.210614.002; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/92.0.4515.131 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Webview
+    version: 92.0.4515.131
+    engine: Blink
+    engine_version: 92.0.4515.131
+  device:
+    type: smartphone
+    brand: Meizu
+    model: 18X
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; MEIZU 18s Pro Build/RKQ1.210408.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/76.0.3809.89 Mobile Safari/537.36 T7/13.1 SP-engine/2.39.0 baiduboxapp/13.1.5.13 (Baidu;P1 11) NABar/1.0
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: mobile app
+    name: Baidu Box App
+    version: 13.1.5.13
+  device:
+    type: smartphone
+    brand: Meizu
+    model: 18s Pro
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; NEW-AN90; HMSCore 6.3.0.327) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.105 HuaweiBrowser/12.0.3.310 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Huawei Browser Mobile
+    version: 12.0.3.310
+    engine: Blink
+    engine_version: 92.0.4515.105
+  device:
+    type: smartphone
+    brand: Huawei
+    model: Honor Play 5 Vitality
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; ASUS_I005DB) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.96 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 78.0.3904.96
+    engine: Blink
+    engine_version: 78.0.3904.96
+  device:
+    type: smartphone
+    brand: Asus
+    model: ROG Phone 5
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; ANY-AN00; HMSCore 6.3.0.327) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.106 HuaweiBrowser/11.0.8.305 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Huawei Browser Mobile
+    version: 11.0.8.305
+    engine: Blink
+    engine_version: 83.0.4103.106
+  device:
+    type: smartphone
+    brand: Huawei
+    model: Honor X30
+  os_family: Android
+  browser_family: Chrome
diff --git a/Tests/fixtures/tablet-1.yml b/Tests/fixtures/tablet-1.yml
index da469500ff..9ba69e6893 100644
--- a/Tests/fixtures/tablet-1.yml
+++ b/Tests/fixtures/tablet-1.yml
@@ -8882,7 +8882,7 @@
   device:
     type: tablet
     brand: Huawei
-    model: C3 9.6
+    model: C3 9.6" WiFi
   os_family: Android
   browser_family: Chrome
 -
diff --git a/Tests/fixtures/tablet-7.yml b/Tests/fixtures/tablet-7.yml
index 3471a07b77..10a0139640 100644
--- a/Tests/fixtures/tablet-7.yml
+++ b/Tests/fixtures/tablet-7.yml
@@ -1385,4 +1385,145 @@
     model: M7 Plus
   os_family: Android
   browser_family: Chrome
-
+-
+  user_agent: Mozilla/5.0 (Linux; Android 7.1.2; Readboy_C20Pro Build/N2G47H; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/61.0.3163.98 Safari/537.36 netdisk;11.14.6;Readboy_C20Pro;android-android;7.1.2;JSbridge4.4.0;jointBridge;1.1.0;
+  os:
+    name: Android
+    version: 7.1.2
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Webview
+    version: 61.0.3163.98
+    engine: Blink
+    engine_version: 61.0.3163.98
+  device:
+    type: tablet
+    brand: Readboy
+    model: C20 Pro
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 7.0; BZA-L00; HMSCore 6.2.0.300) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.105 HuaweiBrowser/12.0.1.300 Safari/537.36
+  os:
+    name: Android
+    version: "7.0"
+    platform: ""
+  client:
+    type: browser
+    name: Huawei Browser Mobile
+    version: 12.0.1.300
+    engine: Blink
+    engine_version: 92.0.4515.105
+  device:
+    type: tablet
+    brand: Huawei
+    model: C3 9.6"
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 10; P20HD(N6H5)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.23 Safari/537.36
+  os:
+    name: Android
+    version: "10"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome
+    version: 74.0.3729.23
+    engine: Blink
+    engine_version: 74.0.3729.23
+  device:
+    type: tablet
+    brand: Teclast
+    model: P20HD
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; arm; Android 10; KRJ-W09) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.127 YaApp_Android/20.94.0/apad YaSearchBrowser/20.94.0/apad BroPP/1.0 SA/3 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "10"
+    platform: ARM
+  client:
+    type: browser
+    name: Yandex Browser
+    version: 20.94.0
+    engine: Blink
+    engine_version: "85.0.4183.127"
+  device:
+    type: tablet
+    brand: Huawei
+    model: Honor Pad V6 10.4" WiFi
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; KRJ2-W09; HMSCore 6.3.0.327) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.106 HuaweiBrowser/11.0.8.305 Safari/537.36
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Huawei Browser Mobile
+    version: 11.0.8.305
+    engine: Blink
+    engine_version: 83.0.4103.106
+  device:
+    type: tablet
+    brand: Huawei
+    model: Honor Pad V7 10.4" WiFi
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; KRJ2-AN00 Build/HONORKRJ2-AN00; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/83.0.4103.106 Mobile Safari/537.36 SP-engine/2.29.0 matrixstyle/0 lite baiduboxapp/5.23.0.11 (Baidu; P1 11) NABar/1.0
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: mobile app
+    name: Baidu Box App
+    version: 5.23.0.11
+  device:
+    type: tablet
+    brand: Huawei
+    model: Honor Pad V7 10.4" 5G
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; BRT-W09; HMSCore 6.2.0.302) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.106 HuaweiBrowser/11.0.8.305 Safari/537.36
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Huawei Browser Mobile
+    version: 11.0.8.305
+    engine: Blink
+    engine_version: 83.0.4103.106
+  device:
+    type: tablet
+    brand: Huawei
+    model: Honor Pad V7 Pro 11" WiFi
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; BRT-AN09; HMSCore 6.3.0.327) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.106 HuaweiBrowser/11.0.8.305 Safari/537.36
+  os:
+    name: Android
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Huawei Browser Mobile
+    version: 11.0.8.305
+    engine: Blink
+    engine_version: 83.0.4103.106
+  device:
+    type: tablet
+    brand: Huawei
+    model: Honor Pad V7 Pro 11" 5G
+  os_family: Android
+  browser_family: Chrome
diff --git a/Tests/fixtures/tv-1.yml b/Tests/fixtures/tv-1.yml
index f158a78263..5c438a85e8 100644
--- a/Tests/fixtures/tv-1.yml
+++ b/Tests/fixtures/tv-1.yml
@@ -6033,3 +6033,21 @@
     model: TVAP
   os_family: Android
   browser_family: Android Browser
+-
+  user_agent: Mozilla/5.0 (Linux; Android 10; MiTV-MTEQ0 Build/QQ2A.200305.004.A1; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/74.0.3729.186 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "10"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Webview
+    version: 74.0.3729.186
+    engine: Blink
+    engine_version: 74.0.3729.186
+  device:
+    type: tv
+    brand: Xiaomi
+    model: MiTV Q1
+  os_family: Android
+  browser_family: Chrome
diff --git a/Tests/fixtures/wearable.yml b/Tests/fixtures/wearable.yml
index 3add24f867..5fd9a874a4 100644
--- a/Tests/fixtures/wearable.yml
+++ b/Tests/fixtures/wearable.yml
@@ -1302,3 +1302,21 @@
     model: APPLLP2
   os_family: Android
   browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 8.0.0; LEO-DLXX Build/OWDE.180707.001.E1; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.120 MQQBrowser/6.2 TBS/045714 Mobile Safari/537.36 bwqsh/3.3.6
+  os:
+    name: Android
+    version: 8.0.0
+    platform: ""
+  client:
+    type: browser
+    name: QQ Browser
+    version: "6.2"
+    engine: WebKit
+    engine_version: "537.36"
+  device:
+    type: wearable
+    brand: Huawei
+    model: Smart Watch 2 Sport
+  os_family: Android
+  browser_family: Unknown
diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml
index f6fe1b382a..f541649ab0 100644
--- a/regexes/device/mobiles.yml
+++ b/regexes/device/mobiles.yml
@@ -3518,7 +3518,7 @@ VGO TEL:
 
 # Vivo (vivo.com.cn, vivo.com)
 Vivo:
-  regex: '((?:VIV-|BBG-)?(?<!FBCR/|NOA )vivo(?!(?:Browser)| 4G_r))|(?:V1730(D[AT]|GA)|V18(01A0|13B[AT])|1819|V1937|I(?:192[78]|201[28])|V(?:2006|202[2-9]|203[0-35-9]|204[0-3568]|205[02-5789]|206[015689]|2070|210[12459]|211[01]|212[049])|V(?:2026|2031|2036|2043)_21|V1936AL|V(?:1732|1809|181[3468]|182[149]|183[1268]|1901|191[13469]|192[1-48]|193[0246]|194[15]|195[05]|196[235]|198[16]|1990|200[125]|201[12]|202[03-5]|203[146]|204[6789]|205[45679]|2066B|206[1568]|207[23]|208[05]|2099|2106|211[18]|212[13]|213[346]|214[1358]|2162)A|V1824BA|V(?:1731|1818|2020)CA|V(?:1818|1938)CT|V(?:1730|2031)EA|V(?:1732|1809|181[3468]|182[19]|183[1268]|1901|1913|1938)T|V2029_PK|V2069A|V2171A|I2011|X50 Pro\+|V211[45]A?|V204[57]A?|V210[28]A?|I2009|V215[4678]A|V213[01]A|V2023EA|V1962BA|V2142|V1930)(?:[);/ ]|$)'
+  regex: '((?:VIV-|BBG-)?(?<!FBCR/|NOA )vivo(?!(?:Browser)| 4G_r))|(?:V1730(D[AT]|GA)|V18(01A0|13B[AT])|1819|V1937|I(?:192[78]|201[28])|V(?:2006|202[2-9]|203[0-35-9]|204[0-3568]|205[02-5789]|206[015689]|2070|210[12459]|211[01]|212[049])|V(?:2026|2031|2036|2043)_21|V1936AL|V(?:1732|1809|181[3468]|182[149]|183[1268]|1901|191[13469]|192[1-48]|193[0246]|194[15]|195[05]|196[235]|198[16]|1990|200[125]|201[12]|202[03-5]|203[146]|204[6789]|205[45679]|2066B|206[1568]|207[23]|208[05]|2099|2106|211[18]|212[13]|213[346]|214[1358]|2162)A|V1824BA|V(?:1731|1818|2020)CA|V(?:1818|1938)CT|V(?:1730|2031)EA|V(?:1732|1809|181[3468]|182[19]|183[1268]|1901|1913|1938)T|V2029_PK|V2069A|V217[12]A|I2011|X50 Pro\+|V211[45]A?|V204[57]A?|V210[28]A?|I2009|V215[4678]A|V213[01]A|V2023EA|V1962BA|V2142|V1930|V216[345]A)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'V1824[B]?A(?:[);/ ]|$)'
@@ -3527,8 +3527,12 @@ Vivo:
       model: 'iQOO 3'
     - regex: 'V2171A(?:[);/ ]|$)'
       model: 'iQOO 9'
+    - regex: 'V2172A(?:[);/ ]|$)'
+      model: 'iQOO 9 Pro'
     - regex: 'I192[78](?:[);/ ]|$)'
       model: 'iQOO 3 5G'
+    - regex: 'V2165A(?:[);/ ]|$)'
+      model: 'iQOO U5'
     - regex: '(?:V2049A|I2009)(?:[);/ ]|$)'
       model: 'iQOO 7'
     - regex: 'V2157A'
@@ -3759,6 +3763,8 @@ Vivo:
       model: 'Y11'
     - regex: 'vivo 19(?:04|40)(?:[);/ ]|$)'
       model: 'Y12'
+    - regex: 'V2163A'
+      model: 'Y12 Pro'
     - regex: 'V2102(?:[);/ ]|$)'
       model: 'Y12a'
     - regex: 'vivo 2007(?:[);/ ]|$)'
@@ -3851,6 +3857,8 @@ Vivo:
       model: 'Y55l'
     - regex: 'vivo 1610(?:[);/ ]|$)'
       model: 'Y55s'
+    - regex: 'V2164A'
+      model: 'Y55s (2021)'
     - regex: 'V2045A'
       model: 'Y54s'
     - regex: 'vivo 1719(?:[);/ ]|$)'
@@ -7902,6 +7910,14 @@ Hoffmann:
     - regex: 'X[-_](Play|Go|Pro|Ultra)'
       model: 'X $1'
 
+# Huagan
+Huagan:
+  regex: 'Huagan[ _]'
+  device: 'smartphone'
+  models:
+    - regex: 'Huagan[ _]([^;/)]+)(?: Build|[);])'
+      model: '$1'
+
 # Homtom
 Homtom:
   regex: 'Homtom|(?:HT[0-9]{1,2}(?: ?Pro)?|HT3_Pro)(?:[);/ ]|$)'
@@ -8027,9 +8043,17 @@ Hi Nova:
     - regex: 'Hera-BD00'
       model: '9'  # Nova 9
 
+# TD Tech (based for Huawei brand)
+TD Tech:
+  regex: 'Build/TDTech|(?:NAT-TN70)(?:[);/ ]|$)'
+  device: 'smartphone'
+  models:
+    - regex: 'NAT-TN70'
+      model: 'N8 Pro'
+
 # Huawei
 Huawei:
-  regex: '(HW-)?(?:Huawei(?!Browser)|MediaPad T1|Ideos|Honor[ _]?|(?:(?:AGS|AGS2|ALE|ALP|AMN|ANA|ANE|ARE|ARS|ASK|ATH|ATU|AUM|BAC|BAH[23]?|BG2|BGO|B[ZK]K|BKL|BL[ALN]|BND|BTV|CA[GMNZ]|CH[CM]|CHE[12]?|CLT|CMR|COL|COR|CPN|CRO|CRR|CUN|DIG|DLI|DRA|DUA|DUB|DUK|EDI|ELE|EML|EVA|EVR|FDR|FIG|FLA|FRD|FRL|GEM|GRA|HDN|HLK|HMA|Hol|HRY|HWI|H[36]0|INE|JAT|JEF|JDN|JDN2|JKM|JMM|JSN|KII|KIW|KNT|KOB|KSA|LDN|LEO|LIO|LLD|LND|LON|LRA|LUA|LY[AO]|MAR|MHA|MRD|MYA|NCE|NEN|NEM|NEO|NXT|PAR|PCT|PIC|PLE|PLK|POT|PPA|PRA|RIO|RNE|RVL|SCC|SCL|SCM|SEA|SHT|SLA|SNE|SPN|STF|STK|TAG|TIT|TNY|TRT|VCE|VEN|VIE|VKY|VNS|VOG|VRD|VTR|WAS|YAL|G(?:527|620S|621|630|735)|Y(?:221|330|550|6[23]5))-(?:[A-Z]{0,2}[0-9]{1,4}[A-Z]{0,3}?)|H1711|U(?:8230|8500|8661|8665|8667|8800|8818|8860|9200|9508))(?:[);/ ]|$))|hi6210sft|PE-(UL00|TL[12]0|TL00M)|T1-(A21?[Lw]|A2[23]L|701u|823L)|G7-(?:L01|TL00)|HW-01K|JNY-(LX[12]|AL10)|OXF-AN[01]0|TAS-(A[LN]00|L29|TL00)|WLZ-(AL10|AN00)|YOK-AN[10]0|NIC-LX1A|MRX-(AN19|AL[01]9|W[0-3]9)|CDY-(?:[AT]N00|AN[29][05]|NX9[AB]|TN[29]0)|GLK-(?:[AT]L00|LX1U)|JER-(?:[AT]N20|[AT]N10)|ELS-(?:[AT]N[10]0|NX9|N39|N04)|AKA-(AL10|L29)|MON-(W|AL)19|BMH-AN[12]0|AQM-([AT]L[01]0|LX1)|MOA-([AT]L[02]0|LX9N)|NTS-AL00|ART-(?:[AT]L00[xm]|L29N?|L28)|MED-(?:[AT]L00|LX9N?|AL20)|EBG-(?:AN[01]0|TN00)|ANA-(?:[AT]N00|NX9)|BZ[AK]-W00|BZT-(W09|AL[01]0)|HDL-(AL09|W09)|HWV3[123]|HW-02L|TEL-[AT]N(?:00a?|10)|KKG-AN00|MXW-[AT]N00|JKM-AL00[ab]|TAH-(?:N29|AN00)m?|C8817D|T1-821W|d-01[JK]|d-02[HK]|KRJ-(?:W09|AN00)|HWT31|Y320-U10|Y541-U02|VAT-L19|70[14]HW|60[58]HW|NOH-(?:NX9|AN0[01]|AN50|AL[01]0)|TNNH?-AN00|LIO-(?:[TA]L00|[LN]29|AN00)|KOB2-[LW]09|AGS3-(?:[WL]09|AL0[09]|W00[DE])|DNN-LX9|NEY-NX9|LON-AL00|HLK-L41|503HW|AGR-(?:[LW]09|AL09)|PPA-LX[12]|ANG-(?:AN00|LX[12])|NOP-AN00|ALA-AN70|DVC-[AT]N[02]0|302HW|Nexus 6P|DBY-W09|WKG-(?:LX9|[AT]N00)|JSC-(?:AN00|AL50)|OCE-A[NL][015]0|NZA-AL00|BRQ-A[LN]00|BZC-(?:AL|W)00|NEN-L(?:X1|22)|KOZ-AL[04]0|NTH-(?:AN00|NX9)|MRR-W[23]9|WGR-(?:W[10]9|AN19)|TET-AN00|SCMR-(?:W09|AL09)|OXP-AN00|HJC-(?:AN90|LX9)|CDL-AN50|CND-AN00|NTN-(?:LX[13]|AN20|L22)|RNA-[AT]N00|CHL-(?:A[LN]00|AL60)|ELZ-AN[012]0|NAM-(?:LX9|AL00)|JLH-AN00|JAD-(?:AL[056]0|LX9)|AGS3K-[WL]09|AGRK-[WL]09|MT2L03|LSA-AN00|KJR-W09|TET-A[NL][05]0|TYH601M|RTE-AL00|BAL-AL00|BZI-AL00|BZT3-(?:AL00|W09)|BZD-(?:W00|AL00)|MLD-AL[01]0|AGM3-(?:W09|AL09)HN|ABR-AL00|GIA-AN00'
+  regex: '(HW-)?(?:Huawei(?!Browser)|MediaPad T1|Ideos|Honor[ _]?|(?:(?:AGS|AGS2|ALE|ALP|AMN|ANA|ANE|ARE|ARS|ASK|ATH|ATU|AUM|BAC|BAH[23]?|BG2|BGO|B[ZK]K|BKL|BL[ALN]|BND|BTV|CA[GMNZ]|CH[CM]|CHE[12]?|CLT|CMR|COL|COR|CPN|CRO|CRR|CUN|DIG|DLI|DRA|DUA|DUB|DUK|EDI|ELE|EML|EVA|EVR|FDR|FIG|FLA|FRD|FRL|GEM|GRA|HDN|HLK|HMA|Hol|HRY|HWI|H[36]0|INE|JAT|JEF|JDN|JDN2|JKM|JMM|JSN|KII|KIW|KNT|KOB|KSA|LDN|LEO|LIO|LLD|LND|LON|LRA|LUA|LY[AO]|MAR|MHA|MRD|MYA|NCE|NEN|NEM|NEO|NXT|PAR|PCT|PIC|PLE|PLK|POT|PPA|PRA|RIO|RNE|RVL|SCC|SCL|SCM|SEA|SHT|SLA|SNE|SPN|STF|STK|TAG|TIT|TNY|TRT|VCE|VEN|VIE|VKY|VNS|VOG|VRD|VTR|WAS|YAL|G(?:527|620S|621|630|735)|Y(?:221|330|550|6[23]5))-(?:[A-Z]{0,2}[0-9]{1,4}[A-Z]{0,3}?)|H1711|U(?:8230|8500|8661|8665|8667|8800|8818|8860|9200|9508))(?:[);/ ]|$))|hi6210sft|PE-(UL00|TL[12]0|TL00M)|T1-(A21?[Lw]|A2[23]L|701u|823L)|G7-(?:L01|TL00)|HW-01K|JNY-(LX[12]|AL10)|OXF-AN[01]0|TAS-(A[LN]00|L29|TL00)|WLZ-(AL10|AN00)|YOK-AN[10]0|NIC-LX1A|MRX-(AN19|AL[01]9|W[0-3]9)|CDY-(?:[AT]N00|AN[29][05]|NX9[AB]|TN[29]0)|GLK-(?:[AT]L00|LX1U)|JER-(?:[AT]N20|[AT]N10)|ELS-(?:[AT]N[10]0|NX9|N39|N04)|AKA-(AL10|L29)|MON-(W|AL)19|BMH-AN[12]0|AQM-([AT]L[01]0|LX1)|MOA-([AT]L[02]0|LX9N)|NTS-AL00|ART-(?:[AT]L00[xm]|L29N?|L28)|MED-(?:[AT]L00|LX9N?|AL20)|EBG-(?:AN[01]0|TN00)|ANA-(?:[AT]N00|NX9)|BZ[AK]-W00|BZT-(W09|AL[01]0)|HDL-(AL09|W09)|HWV3[123]|HW-02L|TEL-[AT]N(?:00a?|10)|KKG-AN[07]0|MXW-[AT]N00|JKM-AL00[ab]|TAH-(?:N29|AN00)m?|C8817D|T1-821W|d-01[JK]|d-02[HK]|KRJ-(?:W09|AN00)|HWT31|Y320-U10|Y541-U02|VAT-L19|70[14]HW|60[58]HW|NOH-(?:NX9|AN0[01]|AN50|AL[01]0)|TNNH?-AN00|LIO-(?:[TA]L00|[LN]29|AN00)|KOB2-[LW]09|AGS3-(?:[WL]09|AL0[09]|W00[DE])|DNN-LX9|NEY-NX9|LON-AL00|HLK-L41|503HW|AGR-(?:[LW]09|AL09)|PPA-LX[12]|ANG-(?:AN00|LX[12])|NOP-AN00|ALA-AN70|DVC-[AT]N[02]0|302HW|Nexus 6P|DBY-W09|WKG-(?:LX9|[AT]N00)|JSC-(?:AN00|AL50)|OCE-A[NL][015]0|NZA-AL00|BRQ-A[LN]00|BZC-(?:AL|W)00|NEN-L(?:X1|22)|KOZ-AL[04]0|NTH-(?:AN00|NX9)|MRR-W[23]9|WGR-(?:W[10]9|AN19)|TET-AN00|SCMR-(?:W09|AL09)|OXP-AN00|HJC-(?:AN90|LX9)|CDL-AN50|CND-AN00|NTN-(?:LX[13]|AN20|L22)|RNA-[AT]N00|CHL-(?:A[LN]00|AL60)|ELZ-AN[012]0|NAM-(?:LX9|AL00)|JLH-AN00|JAD-(?:AL[056]0|LX9)|AGS3K-[WL]09|AGRK-[WL]09|MT2L03|LSA-AN00|KJR-W09|TET-A[NL][05]0|TYH601M|RTE-AL00|BAL-AL00|BZI-AL00|BZT3-(?:AL00|W09)|BZD-(?:W00|AL00)|MLD-AL[01]0|AGM3-(?:W09|AL09)HN|ABR-AL00|GIA-AN00|LEO-DLXX|BZA-L00|MGI-AN00|CMA-AN00|NEW-AN90|KRJ2-(?:W09|AN00)|BRT-(?:W09|AN09)|ANY-AN00'
   device: 'smartphone'
   models:
     - regex: 'POT-[TA]L00a(?:[);/ ]|$)'
@@ -8282,6 +8306,8 @@ Huawei:
       model: 'Honor Magic 3 Pro'
     - regex: 'ELZ-AN20'
       model: 'Honor Magic 3 Pro+'
+    - regex: ' MGI-AN00'
+      model: 'Honor Magic 5'
     - regex: 'RVL-AL09(?:[);/ ]|$)'
       model: 'Honor Note 10'
     - regex: 'EDI-AL10(?:[);/ ]|$)'
@@ -8300,6 +8326,8 @@ Huawei:
       model: 'Honor Play'
     - regex: 'ASK-AL(00x|20)(?:[);/ ]|$)'
       model: 'Honor Play 3'
+    - regex: 'CMA-AN00(?:[);/ ]|$)'
+      model: 'Honor Play 30 Plus'
     - regex: 'KSA-AL10(?:[);/ ]|$)'
       model: 'Honor Play 3E'
     - regex: 'TNNH-AN00(?:[);/ ]|$)'
@@ -8312,6 +8340,8 @@ Huawei:
       model: 'Honor Play 4 Pro'
     - regex: '(?:NZA-AL00?|KOZ-AL40)(?:[);/ ]|$)'
       model: 'Honor Play 5T' # Vitality Edition
+    - regex: 'NEW-AN90'
+      model: 'Honor Play 5 Vitality'
     - regex: 'CHL-AL00(?:[);/ ]|$)'
       model: 'Honor Play 5T Pro'
     - regex: 'CHL-AN00(?:[);/ ]|$)'
@@ -8358,6 +8388,10 @@ Huawei:
       model: 'Honor X10'
     - regex: 'KKG-AN00(?:[);/ ]|$)'
       model: 'Honor X10 Max'
+    - regex: 'KKG-AN70'
+      model: 'Honor X30 Max'
+    - regex: 'ANY-AN00'
+      model: 'Honor X30'
     - regex: 'DNN-LX9(?:[);/ ]|$)'
       model: 'Honor X10 Lite'
     - regex: 'ALA-AN70(?:[);/ ]|$)'
@@ -8434,7 +8468,7 @@ Huawei:
       model: 'Mate RS'
     - regex: 'NEO-L29(?:[);/ ]|$)'
       model: 'Mate RS Porsche Design'
-    - regex: 'CRR-(?:L09|UL00)(?:[);/ ]|$)'
+    - regex: 'CRR-(?:L09|UL[20]0|CL00)(?:[);/ ]|$)'
       model: 'Mate S'
     - regex: 'BND-L34(?:[);/ ]|$)'
       model: 'Mate SE'
@@ -8708,13 +8742,22 @@ Huawei:
     - regex: 'JDN-(?:AL00|W09)(?:[);/ ]|$)'
       model: 'Honor Pad 2'
       device: 'tablet'
-    - regex: 'KRJ-W09(?:[);/ ]|$)'
-      model: 'Honor Pad V6'
+    - regex: 'KRJ2-W09'
+      model: 'Honor Pad V7 10.4" WiFi'
+      device: 'tablet'
+    - regex: 'KRJ2-AN00'
+      model: 'Honor Pad V7 10.4" 5G'
+      device: 'tablet'
+    - regex: 'BRT-W09'
+      model: 'Honor Pad V7 Pro 11" WiFi'
+      device: 'tablet'
+    - regex: 'BRT-AN09'
+      model: 'Honor Pad V7 Pro 11" 5G'
       device: 'tablet'
     - regex: 'KRJ-AN00'
       model: 'Honor Pad V6 10.4" 5G'
       device: 'tablet'
-    - regex: 'KJR-W09'
+    - regex: 'KJR-W09|KRJ-W09'
       model: 'Honor Pad V6 10.4" WiFi'
       device: 'tablet'
     - regex: 'KOB2-W09HN'
@@ -8737,7 +8780,10 @@ Huawei:
       model: 'MatePad C5 8'
     - regex: 'BZA-W00(?:[);/ ]|$)'
       device: 'tablet'
-      model: 'C3 9.6'
+      model: 'C3 9.6" WiFi'
+    - regex: 'BZA-L00(?:[);/ ]|$)'
+      device: 'tablet'
+      model: 'C3 9.6"'
     - regex: 'BZC-AL00(?:[);/ ]|$)'
       device: 'tablet'
       model: 'C3 9.7" (2020)'
@@ -8895,11 +8941,13 @@ Huawei:
       device: 'tablet'
       model: 'dtab d-01K'
 
-
       # smart watch regex
     - regex: 'LEO-BX9(?:[);/ ]|$)'
       device: 'wearable'
       model: 'Smart Watch 2'
+    - regex: 'LEO-DLXX(?:[);/ ]|$)'
+      device: 'wearable'
+      model: 'Smart Watch 2 Sport'
 
       # common regex
     - regex: '(MediaPad[^/;]*) Build'
@@ -10711,7 +10759,7 @@ iVA:
 
 # Landvo
 Landvo:
-  regex: 'XM[123]00|(?<!Blade )S6 Build'
+  regex: 'XM[123]00|(?<!Blade |Haipainoble )S6 Build'
   device: 'smartphone'
   models:
     - regex: 'S6 Build' # clone Galaxy S6
@@ -13067,7 +13115,7 @@ Verssed:
 
 # motorola
 Motorola:
-  regex: 'MOT(?!TO)|(?<!AN)DROID ?(?:Build|[a-z0-9]+)|portalmmm/2.0 (?:E378i|L6|L7|v3)|XOOM [^;/]*Build|XT1941-2|XT1924-9|XT1925-10|XT1965-6|XT1970-5|XT1799-2|XT1021|XT2071-4|XT2125-4|XT2143-1|XT2153-1|XT2201-2|XT2137-2|XT1710-08|XT180[3-5]|XT194[23]-1|XT1929-15|(?:XT|MZ|MB|ME)[0-9]{3,4}[a-z]?(?:\(Defy\)|-0[1-5])?(?:[;]? Build|\))'
+  regex: 'MOT(?!TO)|(?<!AN)DROID ?(?:Build|[a-z0-9]+)|portalmmm/2.0 (?:E378i|L6|L7|v3)|XOOM [^;/]*Build|XT1941-2|XT1924-9|XT1925-10|XT1965-6|XT1970-5|XT1799-2|XT1021|XT2171-3|XT2071-4|XT2175-2|XT2125-4|XT2143-1|XT2153-1|XT2201-2|XT2137-2|XT1710-08|XT180[3-5]|XT194[23]-1|XT1929-15|(?:XT|MZ|MB|ME)[0-9]{3,4}[a-z]?(?:\(Defy\)|-0[1-5])?(?:[;]? Build|\))'
   device: 'smartphone'
   models:
     # Explicit feature phone models
@@ -13084,6 +13132,8 @@ Motorola:
       model: 'Fire'
     - regex: '(?:MOT-|Motorola-)?XT2125-4'
       model: 'Edge S'
+    - regex: '(?:MOT-|Motorola-)?XT2175-2'
+      model: 'Edge S30'
     - regex: '(?:MOT-|Motorola-)?XT2143-1'
       model: 'Edge 20'
     - regex: '(?:MOT-|Motorola-)?XT2153-1'
@@ -13204,6 +13254,8 @@ Motorola:
       model: 'Moto G7 Plus'
     - regex: 'XT2137-2'
       model: 'Moto G50'
+    - regex: 'XT2171-3'
+      model: 'Moto G51'
     - regex: '(?:MOT-|Motorola-)?XT10(?:49|5[23568]|60|9[23457])'
       model: 'Moto X'
     - regex: '(?:MOT-|Motorola-)?XT156[234]|Moto X Play(?:[);/ ]|$)'
@@ -14348,7 +14400,7 @@ Onda:
 
 # OnePlus (www.oneplus.com or oneplus.com.ru)
 OnePlus:
-  regex: '(?:du_)?ONEPLUS|(?:A0001|A200[135]|AC200[13]|A300[03]|A3010|A5000|A600[03]|A601[03]|BE201[1235]|BE202[5689]|E100[135]|GM191[03517]|GM190[0135]|GM192[05]|HD191[013]|HD190[01357]|HD1925|IN201[013579]|IN202[0135]|KB200[01357]|LE211[01357]|LE212[035]|Nord N10 5G|LE210[01]|LE212[17]|DE211[78]|DN210[13]|EB210[13]|MT211[01])(?: Build|\))'
+  regex: '(?:du_)?ONEPLUS|(?:A0001|A200[135]|AC200[13]|A300[03]|A3010|A5000|A600[03]|A601[03]|BE201[1235]|BE202[5689]|E100[135]|GM191[03517]|GM190[0135]|GM192[05]|HD191[013]|HD190[01357]|HD1925|IN201[013579]|IN202[0135]|KB200[01357]|LE211[01357]|LE212[035]|Nord N10 5G|LE210[01]|LE212[17]|DE211[78]|DN210[13]|EB210[13]|MT211[01]|IV2201|NE2210)(?: Build|\))'
   device: 'smartphone'
   models:
     - regex: 'AC200[13](?:[);/ ]|$)'
@@ -14369,6 +14421,8 @@ OnePlus:
       model: 'Nord N10 Lite'
     - regex: 'DN210[13](?:[);/ ]|$)'
       model: 'Nord 2 5G'
+    - regex: 'IV2201(?:[);/ ]|$)'
+      model: 'Nord CE 2'
     - regex: 'IN202[0135](?:[);/ ]|$)'
       model: '8 Pro'
     - regex: 'KB2000(?:[);/ ]|$)'
@@ -14385,6 +14439,8 @@ OnePlus:
       model: '9R'
     - regex: 'LE212[01357](?:[);/ ]|$)'
       model: '9 Pro'
+    - regex: 'NE2210(?:[);/ ]|$)'
+      model: '10 Pro Extreme Edition'
     - regex: '(?:GM191[01357]|OnePlus 7 Pro)(?:[);/ ]|$)'
       model: '7 Pro'
     - regex: 'GM190[0135](?:[);/ ]|$)'
@@ -14601,7 +14657,7 @@ Realme:
 
 # Oppo (oppo.com)
 OPPO:
-  regex: '(?:OB-)?OPPO[ _]?([a-z0-9]+)|N1T|R8001|A101OP|OPG01|A00[12]OP|(?:OPG02|X90[07][0679]|U70[57]T?|X909T?|R(?:10[01]1|2001|201[07]|6007|7005|7007|80[13579]|81[13579]|82[01379]|83[013]|800[067]|8015|810[679]|811[13]|820[057])[KLSTW]?|N520[79]|N5117|A33[wf]|A33fw|A37fw?|PAAM00|PAAT00|PAC[TM]00|R7kf|R7plus[fmt]?|A1601|CPH[0-9]{4}|CPH19(69|79|23|1[179])|PB(A[TM]00|CT10|BT30|CM[13]0|[FD]M00)|P(E[RFHG]M\d{2}|E[GH]T\d{2}|DAM10|ADM00|AF[TM]00|ADT00|AHM00|BBM[03]0|BBT00|BDT00|BFT00|[CB]E[MT]00|CA[MT]00|C[CDG]M00|CA[MT]10|[CD]PM00|CRM00|CDT00|CD[TM]10|CHM[013]0|CKM[08]0|CLM[15]0|DEM[13]0|DHM00|D[RK][TM]00|DPT00|DB[TM]00|DCM00|[CD]NM00|DVM00|DY[TM][12]0|DNT00|EA[TM]00|CRT01|EDM00)|PFDM00|PEG[MT]10|PEM[MT][02]0|PDET10|PDS[TM]00|PEC[MT]30|OPG03|PE[QYPEXNLU]M00|PCHT30|PFGM00|PF[VU]M10|A102OP|PFCM00|PFJM10|PGCM10|PECM20|PDAT10)(?:[);/ ]|$)'
+  regex: '(?:OB-)?OPPO[ _]?([a-z0-9]+)|N1T|R8001|A101OP|OPG01|A00[12]OP|(?:OPG02|X90[07][0679]|U70[57]T?|X909T?|R(?:10[01]1|2001|201[07]|6007|7005|7007|80[13579]|81[13579]|82[01379]|83[013]|800[067]|8015|810[679]|811[13]|820[057])[KLSTW]?|N520[79]|N5117|A33[wf]|A33fw|A37fw?|PAAM00|PAAT00|PAC[TM]00|R7kf|R7plus[fmt]?|A1601|CPH[0-9]{4}|CPH19(69|79|23|1[179])|PB(A[TM]00|CT10|BT30|CM[13]0|[FD]M00)|P(E[RFHG]M\d{2}|E[GH]T\d{2}|DAM10|ADM00|AF[TM]00|ADT00|AHM00|BBM[03]0|BBT00|BDT00|BFT00|[CB]E[MT]00|CA[MT]00|C[CDG]M00|CA[MT]10|[CD]PM00|CRM00|CDT00|CD[TM]10|CHM[013]0|CKM[08]0|CLM[15]0|DEM[13]0|DHM00|D[RK][TM]00|DPT00|DB[TM]00|DCM00|[CD]NM00|DVM00|DY[TM][12]0|DNT00|EA[TM]00|CRT01|EDM00)|PFDM00|PEG[MT]10|PEM[MT][02]0|PDET10|PDS[TM]00|PEC[MT]30|OPG03|PE[QYPEXNLU]M00|PCHT30|PCRT00|PFGM00|PF[VU]M10|A102OP|PFCM00|PFJM10|PGCM10|PECM20|PDAT10)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: 'PCHM10(?:[);/ ]|$)'
@@ -14892,7 +14948,7 @@ OPPO:
       model: 'Reno 3A'
     - regex: '(?:PDCM00|A001OP)(?:[);/ ]|$)'
       model: 'Reno 3 5G'
-    - regex: '(?:PCRM00|CPH203[567]|CPH2009)'
+    - regex: '(?:PCR[MT]00|CPH203[567]|CPH2009)'
       model: 'Reno 3 Pro'
     - regex: 'PCRT01(?:[);/ ]|$)'
       model: 'Reno 3 Lite'
@@ -18787,8 +18843,7 @@ T-Mobile:
 
 # Teclast (teclast.com)
 Teclast:
-  regex: 'Teclast|P80_G3M2|TLA002|TLA016|X98 Air III|M20_4G|X98 Air II\(HG5N\)|Tbook|X80 Power\(B2N4\)|(?:T40 Plus|T30|P80[XH]|P20HD|P10[_ ]HD|M40|P10S|M30_Pro|M40SE|P80)_(?:ROW|EEA|RUS)|T40 Plus\(M7T3\)|T40 PRO\(T1A1\)|T10\(E3C[56]\)|P10S\(N4H5\)|98\(M1E[45789]\)|98\(M3E3\)|X10 \(M1D3\)|M89 Pro|M40\(N9H3\)|M40(?:SE|Pro)_(?:ROW|EEA|RUS)'
-
+  regex: 'Teclast|P80_G3M2|TLA002|TLA016|X98 Air III|M20_4G|X98 Air II\(HG5N\)|Tbook|X80 Power\(B2N4\)|(?:T40 Plus|T30|P80[XH]|P20HD|P10[_ ]HD|M40|P10S|M30_Pro|M40SE|P80)_(?:ROW|EEA|RUS)|P20HD\(N6H5\)|T40 Plus\(M7T3\)|T40 PRO\(T1A1\)|T10\(E3C[56]\)|P10S\(N4H5\)|98\(M1E[45789]\)|98\(M3E3\)|X10 \(M1D3\)|M89 Pro|M40\(N9H3\)|M40(?:SE|Pro)_(?:ROW|EEA|RUS)'
   device: 'tablet'
   models:
     - regex: 'Tbook[_ -]([^;/]+) Build'
@@ -18799,7 +18854,7 @@ Teclast:
       model: 'X10'
     - regex: 'P10S(?:\(N4H5\)|_(?:ROW|EEA))(?:[);/ ]|$)'
       model: 'P10S'
-    - regex: 'P20HD_(?:ROW|EEA|RUS)'
+    - regex: 'P20HD_?(?:ROW|EEA|RUS)|P20HD\(N6H5\)'
       model: 'P20HD'
     - regex: 'P10[_ ]HD_(?:ROW|EEA)'
       model: 'P10HD'
@@ -20831,7 +20886,7 @@ Zopo:
 
 # Xiaomi
 Xiaomi:
-  regex: 'Xiaomi(?!/(?:Miui|Mint[ ])Browser)|MiTV-\w|Mi9 Pro 5G|(?:MI [a-z0-9]+|Mi-4c|MI-One[ _]?[a-z0-9]+|MIX(?: 2S?)?|pomelo)(?:[);/ ]|$)|HM (?:[^/;]+) (?:Build|MIUI)|(?:2014501|2014011|201481[12378]|201302[23]|2013061) Build|Redmi|POCOPHONE|(?:SHARK )?(KLE|KSR|MBU)-[AH]0|SK[RW]-[AH]0|PRS-[AH]0|POCO F1|DLT-[AH]0|MIBOX[234]([_ ]PRO)?|MiTV4[ACSX]?|AWM-A0|MI CC 9 Meitu Edition|MiBOX1S|M2006J10C|M2006C3(?:L[IGC]|LVG|MN?G|MT)|M2007J1(?:7[CGI]|SC)|M2002J9[SEG]|HM2014819|WT88047|210611(?:8C|19BI)|M2004J(?:7[AB]|19)C|M2012K11(?:[CGI]|A[CI])|M2011K2[CG]|M2011J18C|M2006C3[ML]II|M2003J15SC|M2007J3S[ICYGP]|M2007J22[CG]|M2103K19[CGYI]|M2101K(?:[79]AG|7AI|7B[GI]|6[GIRP]|7BNY|9[GCR])|M2010J19S[CGYIL]|M1908C3JGG|M2102(?:K1AC|K1[CG]|J2SC)|HM NOTE 1(?:LTE|W)|MI[_ ]PLAY|XIG01|Qin 1s\+|Qin 2(?: Pro)?|MI_(NOTE_Pro|5X|4i|(?:A2|8)_Lite)|A001XM|lancelot|XIG02|21061119(?:[AD]G|AL)|2107119DC|M2101K(?:7BL|9AI)|M2012K10C|M2104K10AC|M1901F71|21051182[CG]|21081111RG|2109119D[GI]|21091116(?:AI|[AU]?C|i)|2201117T[GIY]|21121(?:119S[CG]|23AC)|2107113S[GR]|M2105K81A?C|2109119BC|220112[23]C|joyeuse|galahad|begonia| MDG1'
+  regex: 'Xiaomi(?!/(?:Miui|Mint[ ])Browser)|MiTV-\w|Mi9 Pro 5G|(?:MI [a-z0-9]+|Mi-4c|MI-One[ _]?[a-z0-9]+|MIX(?: 2S?)?|pomelo)(?:[);/ ]|$)|HM (?:[^/;]+) (?:Build|MIUI)|(?:2014501|2014011|201481[12378]|201302[23]|2013061) Build|Redmi|POCOPHONE|(?:SHARK )?(KLE|KSR|MBU)-[AH]0|SK[RW]-[AH]0|PRS-[AH]0|POCO F1|DLT-[AH]0|MIBOX[234]([_ ]PRO)?|MiTV4[ACSX]?|AWM-A0|MI CC 9 Meitu Edition|MiBOX1S|M2006J10C|M2006C3(?:L[IGC]|LVG|MN?G|MT)|M2007J1(?:7[CGI]|SC)|M2002J9[SEG]|HM2014819|WT88047|210611(?:8C|19BI)|M2004J(?:7[AB]|19)C|M2012K11(?:[CGI]|A[CI])|M2011K2[CG]|M2011J18C|M2006C3[ML]II|M2003J15SC|M2007J3S[ICYGP]|M2007J22[CG]|M2103K19[CGYI]|M2101K(?:[79]AG|7AI|7B[GI]|6[GIRP]|7BNY|9[GCR])|M2010J19S[CGYIL]|M1908C3JGG|M2102(?:K1AC|K1[CG]|J2SC)|HM NOTE 1(?:LTE|W)|MI[_ ]PLAY|XIG01|Qin 1s\+|Qin 2(?: Pro)?|MI_(NOTE_Pro|5X|4i|(?:A2|8)_Lite)|A001XM|lancelot|XIG02|21061119(?:[AD]G|AL)|2107119DC|M2101K(?:7BL|9AI)|M2012K10C|M2104K10AC|M1901F71|21051182[CG]|21081111RG|2109119D[GI]|21091116(?:AI|[AU]?C|i)|220111(?:7T[GIY]|19TI)|21121(?:119S[CG]|23AC)|2107113S[GR]|M2105K81A?C|2109119BC|220112[23]C|joyeuse|galahad|begonia| MDG1'
   device: 'smartphone'
   models:
     # specific smartphone models
@@ -21011,8 +21066,10 @@ Xiaomi:
       model: 'Redmi 10'
     - regex: '(?:21061119A[GL]|21121119SG)(?:[);/ ]|$)'
       model: 'Redmi 10 (2022)'
-    - regex: '21061119BI(?:[);/ ]|$)'
+    - regex: '21061119[BT]I(?:[);/ ]|$)'
       model: 'Redmi 10 Prime'
+    - regex: '22011119TI(?:[);/ ]|$)'
+      model: 'Redmi 10 Prime (2022)'
     - regex: 'M2004J7BC(?:[);/ ]|$)'
       model: 'Redmi 10X Pro'
     - regex: 'Redmi K20 Pro Premium Edition(?:[);/ ]|$)'
@@ -21085,6 +21142,9 @@ Xiaomi:
     - regex: 'MiTV-MSSP[123](?:[);/ ]|$)'
       model: 'MiTV 4S'
       device: 'tv'
+    - regex: 'MiTV-MTEQ0(?:[);/ ]|$)'
+      model: 'MiTV Q1'
+      device: 'tv'
     - regex: 'MiTV-AESP0(?:[);/ ]|$)'
       model: 'MiTV Stick'
       device: 'tv'
@@ -21350,6 +21410,12 @@ Yezz:
     - regex: 'Andy[ _]([A-Z]*[0-9][A-Z0-9]+)(?:[ _](LTE))?'
       model: 'Andy $1 $2'
 
+# YU Fly
+YU Fly:
+  regex: 'YU Fly (\w+)'
+  device: 'smartphone'
+  model: '$1'
+
 # Yu
 Yu:
   regex: '(?:YU5[05]10[A]?|YU4711|AO5510|YU5050|YU501[14]|YU5551)(?:[);/ ]|$)'
@@ -22093,6 +22159,8 @@ ZTE:
       model: 'P651 (2021)'
     - regex: '7530N(?:[);/ ]|$)'
       model: 'Voyage 10'
+    - regex: '9040N(?:[);/ ]|$)'
+      model: 'Voyage 20 Pro'
     - regex: 'A2122H(?:[);/ ]|$)'
       model: 'S30 Pro 5G'
     - regex: '602ZT(?:[);/ ]|$)'
@@ -22129,10 +22197,14 @@ ZTE:
       model: 'Axon 9 Pro'
     - regex: '(?:902ZT|A2020N3 Pro)(?:[);/ ]|$)'
       model: 'Axon 10 Pro 5G'
-    - regex: 'A2021[LG]?(?:[);/ ]|$)'
+    - regex: 'A2020 SP(?:[);/ ]|$)'
+      model: 'Axon 10s Pro 5G'
+    - regex: 'A2021[LGH]?(?:[);/ ]|$)'
       model: 'Axon 11 5G'
-    - regex: 'A2021E?(?:[);/ ]|$)'
+    - regex: 'A2021E(?:[);/ ]|$)'
       model: 'Axon 11'
+    - regex: '9000N(?:[);/ ]|$)'
+      model: 'Axon 11 SE 5G'
     - regex: 'A2022H'
       model: 'Axon 31 Pro 5G'
     - regex: 'A2022PG'
@@ -22339,6 +22411,8 @@ ZTE:
       model: 'Blade V9 Vita'
     - regex: 'ZTE 8030'
       model: 'Blade V30 Vita'
+    - regex: 'ZTE 9030N'
+      model: 'Blade S30'
     - regex: 'ZTE 9030'
       model: 'Blade V30'
     - regex: 'Blade V(9|10) Vita(?:[);/ ]|$)'
@@ -22495,6 +22569,8 @@ ZTE:
       model: 'Vergatario 5 Plus'
     - regex: 'ZTE V5 PRO(?:[);/ ]|$)'
       model: 'V5 Pro'
+    - regex: 'ZTE 8012N'
+      model: 'Blade V2021 5G'
     - regex: 'ZTE 9000'
       model: 'Blade V2020'
     - regex: 'ZTE 8000'
@@ -23143,13 +23219,15 @@ Mann:
 
 # Unihertz (unihertz.com)
 Unihertz:
-  regex: '((?<!Astra )Titan|Jelly-Pro|Jelly2(?:_JP)?|Atom_X?L)(?:[);/ ]|$)'
+  regex: '((?<!Astra )Titan(_pocket)?|Jelly-Pro|Jelly2(?:_JP)?|Atom_X?L)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '(Jelly)-Pro(?:[);/ ]|$)'
       model: '$1 Pro'
     - regex: 'Jelly2(?:_JP)?(?:[);/ ]|$)'
       model: 'Jelly 2'
+    - regex: 'Titan_pocket'
+      model: 'Titan Pocket'
     - regex: '(Titan|Atom_X?L)(?:[);/ ]|$)'
       model: '$1'
 
@@ -28719,6 +28797,22 @@ iWaylink:
       device: 'peripheral'
       model: '$1'
 
+# VOGA
+VOGA:
+  regex: 'VOGA[ _]'
+  device: 'smartphone'
+  models:
+    - regex: 'VOGA 55909'
+      model: 'V'
+
+# Huagan
+Haipai:
+  regex: 'Haipai'
+  device: 'smartphone'
+  models:
+    - regex: 'Haipai ?noble S6'
+      model: 'Noble S6'
+
 # Devices with undectable brand, but detectable model
 Unknown:
   regex: 'Plasma Mobile|WebTV/(\d+\.\d+)|(?:M10 Ultra|FO-R15|TVBOX|Smart[ _]?TV|SmartATV|M8S\+ 4K|PCBox|rk3368-box|H10 PLAY|Smart AIO TV|TVBOX_L|L-BOX|TVBOX-5G|mips.+(?:Opera TV|wireless|wired)|smartbox|TV BOX|I12Pro Max)(?:[);/ ]|$)'