|
@@ -27,7 +27,11 @@ function checkPlatform2() {
|
|
let match = test.exec(ua);
|
|
let match = test.exec(ua);
|
|
let version = match[1].split('.')[0];
|
|
let version = match[1].split('.')[0];
|
|
if (version < 9) {
|
|
if (version < 9) {
|
|
- Toast.fail(errorMessage.ms10);
|
|
|
|
|
|
+ uni.showToast({
|
|
|
|
+ icon: 'error',
|
|
|
|
+ title: errorMessage.ms10
|
|
|
|
+ })
|
|
|
|
+
|
|
return {
|
|
return {
|
|
data: false,
|
|
data: false,
|
|
waitCode: false
|
|
waitCode: false
|
|
@@ -36,10 +40,11 @@ function checkPlatform2() {
|
|
// 判断 浏览器 Android
|
|
// 判断 浏览器 Android
|
|
if (!checkAndroidForBrowser()) {
|
|
if (!checkAndroidForBrowser()) {
|
|
// 提示信息
|
|
// 提示信息
|
|
- Toast.fail({
|
|
|
|
- message: errorMessage.ms13,
|
|
|
|
- duration: 5000
|
|
|
|
- });
|
|
|
|
|
|
+ uni.showToast({
|
|
|
|
+ icon: 'error',
|
|
|
|
+ title: errorMessage.ms13
|
|
|
|
+ })
|
|
|
|
+
|
|
return {
|
|
return {
|
|
data: true,
|
|
data: true,
|
|
waitCode: true
|
|
waitCode: true
|
|
@@ -66,10 +71,14 @@ function checkPlatform2() {
|
|
}
|
|
}
|
|
|
|
|
|
if (version < 14.3) {
|
|
if (version < 14.3) {
|
|
- Toast.fail(errorMessage.ms11);
|
|
|
|
|
|
+ uni.showToast({
|
|
|
|
+ icon: 'error',
|
|
|
|
+ title: errorMessage.ms11
|
|
|
|
+ })
|
|
return {
|
|
return {
|
|
data: false,
|
|
data: false,
|
|
- waitCode: false
|
|
|
|
|
|
+ waitCode: false,
|
|
|
|
+ duration: 3000
|
|
};
|
|
};
|
|
}
|
|
}
|
|
|
|
|
|
@@ -77,10 +86,11 @@ function checkPlatform2() {
|
|
// 判断 浏览器 Android
|
|
// 判断 浏览器 Android
|
|
if (!checkIosForBrowser()) {
|
|
if (!checkIosForBrowser()) {
|
|
// 提示信息
|
|
// 提示信息
|
|
- Toast.fail({
|
|
|
|
- message: errorMessage.ms12,
|
|
|
|
|
|
+ uni.showToast({
|
|
|
|
+ icon: 'error',
|
|
|
|
+ title: errorMessage.ms12,
|
|
duration: 5000
|
|
duration: 5000
|
|
- });
|
|
|
|
|
|
+ })
|
|
return {
|
|
return {
|
|
data: true,
|
|
data: true,
|
|
waitCode: true
|
|
waitCode: true
|
|
@@ -202,18 +212,36 @@ function getBrowser() {
|
|
export function errorFunComplete(e) {
|
|
export function errorFunComplete(e) {
|
|
const name = e.name;
|
|
const name = e.name;
|
|
if (name === 'NotFoundError' || name === 'DevicesNotFoundError') {
|
|
if (name === 'NotFoundError' || name === 'DevicesNotFoundError') {
|
|
- Toast.fail(errorMessage.ms4);
|
|
|
|
|
|
+ uni.showToast({
|
|
|
|
+ icon: 'error',
|
|
|
|
+ title: errorMessage.ms4,
|
|
|
|
+ })
|
|
}
|
|
}
|
|
if (name === 'NotReadableError' || name === 'TrackStartError') {
|
|
if (name === 'NotReadableError' || name === 'TrackStartError') {
|
|
- Toast.fail(errorMessage.ms5);
|
|
|
|
|
|
+ uni.showToast({
|
|
|
|
+ icon: 'error',
|
|
|
|
+ title: errorMessage.ms5,
|
|
|
|
+ })
|
|
} else if (name === 'OverconstrainedError' || name === 'ConstraintNotSatisfiedError') {
|
|
} else if (name === 'OverconstrainedError' || name === 'ConstraintNotSatisfiedError') {
|
|
- Toast.fail(errorMessage.ms6);
|
|
|
|
|
|
+ uni.showToast({
|
|
|
|
+ icon: 'error',
|
|
|
|
+ title: errorMessage.ms6,
|
|
|
|
+ })
|
|
} else if (name === 'NotAllowedError' || name === 'PermissionDeniedError') {
|
|
} else if (name === 'NotAllowedError' || name === 'PermissionDeniedError') {
|
|
- Toast.fail(errorMessage.ms7);
|
|
|
|
|
|
+ uni.showToast({
|
|
|
|
+ icon: 'error',
|
|
|
|
+ title: errorMessage.ms7,
|
|
|
|
+ })
|
|
} else if (name === 'TypeError' || name === 'TypeError') {
|
|
} else if (name === 'TypeError' || name === 'TypeError') {
|
|
- Toast.fail(errorMessage.ms8);
|
|
|
|
|
|
+ uni.showToast({
|
|
|
|
+ icon: 'error',
|
|
|
|
+ title: errorMessage.ms8,
|
|
|
|
+ })
|
|
} else {
|
|
} else {
|
|
- Toast.fail(errorMessage.ms9);
|
|
|
|
|
|
+ uni.showToast({
|
|
|
|
+ icon: 'error',
|
|
|
|
+ title: errorMessage.ms9,
|
|
|
|
+ })
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -235,10 +263,11 @@ let constraints = {
|
|
export function check(success, error, backFun) {
|
|
export function check(success, error, backFun) {
|
|
|
|
|
|
if (!navigator) {
|
|
if (!navigator) {
|
|
- Toast.fail({
|
|
|
|
- message: errorMessage.ms1,
|
|
|
|
|
|
+ uni.showToast({
|
|
|
|
+ icon: 'error',
|
|
|
|
+ title: errorMessage.ms1,
|
|
duration: 5000
|
|
duration: 5000
|
|
- });
|
|
|
|
|
|
+ })
|
|
// 当前浏览器版本 无媒体对象
|
|
// 当前浏览器版本 无媒体对象
|
|
backFun && backFun();
|
|
backFun && backFun();
|
|
return false;
|
|
return false;
|
|
@@ -267,7 +296,10 @@ export function check(success, error, backFun) {
|
|
//旧版API
|
|
//旧版API
|
|
navigator.getUserMedia(constraints, success, error);
|
|
navigator.getUserMedia(constraints, success, error);
|
|
} else {
|
|
} else {
|
|
- Toast.fail(errorMessage.ms2);
|
|
|
|
|
|
+ uni.showToast({
|
|
|
|
+ icon: 'error',
|
|
|
|
+ title: errorMessage.ms2,
|
|
|
|
+ })
|
|
backFun && backFun();
|
|
backFun && backFun();
|
|
}
|
|
}
|
|
}, timeD);
|
|
}, timeD);
|
|
@@ -471,6 +503,7 @@ export function useH5Camera({
|
|
return {
|
|
return {
|
|
startH5Camera,
|
|
startH5Camera,
|
|
stopH5Camera,
|
|
stopH5Camera,
|
|
- handlePaiZhao
|
|
|
|
|
|
+ handlePaiZhao,
|
|
|
|
+ errorFunComplete
|
|
}
|
|
}
|
|
}
|
|
}
|