Merge 82d3041 into 0176c4f

searchfe · Feb 8, 2021 · 25ea8fb · 25ea8fb
2 parents 0176c4f + 82d3041
commit 25ea8fb
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 0 deletions.
diff --git a/src/index.js b/src/index.js
@@ -36,6 +36,19 @@ define(function () {
                 }
                 return version ? version.map(parseFloat) : [];
             },
+            // 百度主线或矩阵产品版本号
+            baiduBoxOrBaiduappVersion: function () {
+                if (!this.isBaiduboxOrBdapp()) {
+                    return 0;
+                }
+                if (this.isBaiduBox()) {
+                    return this.baiduBoxVersion();
+                } else {
+                    var reg = /bdapp\/[\d+.]+\s\(\w+;\s\w+\)\s\w+\/([\d+.]+)/i;
+                    var version = ua.match(reg)[1].split('.');
+                    return version ? version.map(parseFloat) : [];
+                }
+            },
             // 简单搜索版本号
             secrVersion: function () {
                 // 非简单浏览器版本返回 0

diff --git a/test/index.js b/test/index.js
@@ -63,6 +63,26 @@ define(['src/index'], function (UA) {
             expect(UA.use(baiduIOS).baiduBoxVersion()).to.deep.equal([9, 0, 0, 8]);
             expect(UA.use(baiduAndroid).baiduBoxVersion()).to.deep.equal([6, 3]);
         });
+        it('should detect baiduBoxOrBaiduapp version', function () {
+            expect(UA.use(qqApp).baiduBoxOrBaiduappVersion()).to.deep.equal(0);
+            expect(UA.use(weixinApp).baiduBoxOrBaiduappVersion()).to.deep.equal(0);
+            expect(UA.use(searchCraft).baiduBoxOrBaiduappVersion()).to.deep.equal(0);
+            expect(UA.use(wrongChrome).baiduBoxOrBaiduappVersion()).to.deep.equal(0);
+            expect(UA.use(chromeMobile).baiduBoxOrBaiduappVersion()).to.deep.equal(0);
+            expect(UA.use(pixel2).baiduBoxOrBaiduappVersion()).to.deep.equal(0);
+            expect(UA.use(pixel2XL).baiduBoxOrBaiduappVersion()).to.deep.equal(0);
+            expect(UA.use(XiaoMiBrowser).baiduBoxOrBaiduappVersion()).to.deep.equal(0);
+            expect(UA.use(galaxyS5).baiduBoxOrBaiduappVersion()).to.deep.equal(0);
+            expect(UA.use(HUAWEIMeta9).baiduBoxOrBaiduappVersion()).to.deep.equal(0);
+            expect(UA.use(HUAWEIChromeBrowser).baiduBoxOrBaiduappVersion()).to.deep.equal(0);
+            expect(UA.use(oppoBrowser).baiduBoxOrBaiduappVersion()).to.deep.equal(0);
+            expect(UA.use(baiduIOS).baiduBoxOrBaiduappVersion()).to.deep.equal([9, 0, 0, 8]);
+            expect(UA.use(baiduAndroid).baiduBoxOrBaiduappVersion()).to.deep.equal([6, 3]);
+            expect(UA.use(baiduIOSJisu).baiduBoxOrBaiduappVersion()).to.deep.equal([3, 7, 6, 12]);
+            expect(UA.use(baiduAndroidJisu).baiduBoxOrBaiduappVersion()).to.deep.equal([3, 7, 5, 11]);
+            expect(UA.use(tomasApp).baiduBoxOrBaiduappVersion()).to.deep.equal([1, 0, 0, 1]);
+            expect(UA.use(baiduboxvision).baiduBoxOrBaiduappVersion()).to.deep.equal([1, 4, 0, 10]);
+        });
         it('should detect AppleWebkit version', function () {
             expect(UA.use(safariIOS).appleWebkitVersion()).to.deep.equal([603, 1, 30]);
         });