Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wychl
uni-app
提交
e8d7958b
U
uni-app
项目概览
wychl
/
uni-app
与 Fork 源项目一致
Fork自
DCloud / uni-app
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e8d7958b
编写于
3月 09, 2021
作者:
Q
qiang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat(App): uni.scanCode i18n
上级
342c1865
变更
11
展开全部
隐藏空白更改
内联
并排
Showing
11 changed file
with
65 addition
and
18 deletion
+65
-18
packages/uni-app-plus/template/common/__uniappscan.js
packages/uni-app-plus/template/common/__uniappscan.js
+1
-1
packages/uni-app-plus/template/weex/__uniappscan.html
packages/uni-app-plus/template/weex/__uniappscan.html
+6
-4
packages/uni-cli-shared/template/common/__uniappscan.js
packages/uni-cli-shared/template/common/__uniappscan.js
+1
-1
packages/uni-cli-shared/template/weex/__uniappscan.html
packages/uni-cli-shared/template/weex/__uniappscan.html
+6
-4
src/core/helpers/i18n/en.json
src/core/helpers/i18n/en.json
+5
-0
src/core/helpers/i18n/es.json
src/core/helpers/i18n/es.json
+5
-0
src/core/helpers/i18n/fr.json
src/core/helpers/i18n/fr.json
+5
-0
src/core/helpers/i18n/zh-Hans.json
src/core/helpers/i18n/zh-Hans.json
+5
-0
src/core/helpers/i18n/zh-Hant.json
src/core/helpers/i18n/zh-Hant.json
+5
-0
src/platforms/app-plus/service/api/device/scan-code-webview.js
...latforms/app-plus/service/api/device/scan-code-webview.js
+13
-5
src/platforms/app-plus/service/api/device/scan-code-weex.js
src/platforms/app-plus/service/api/device/scan-code-weex.js
+13
-3
未找到文件。
packages/uni-app-plus/template/common/__uniappscan.js
浏览文件 @
e8d7958b
此差异已折叠。
点击以展开。
packages/uni-app-plus/template/weex/__uniappscan.html
浏览文件 @
e8d7958b
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
'
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0
'
+
'
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0
'
+
(
coverSupport
?
'
, viewport-fit=cover
'
:
''
)
+
'
" />
'
)
(
coverSupport
?
'
, viewport-fit=cover
'
:
''
)
+
'
" />
'
)
</script>
</script>
<title>
扫码
</title>
<title>
Scan code
</title>
<style>
<style>
html
,
html
,
body
,
body
,
...
@@ -61,8 +61,10 @@
...
@@ -61,8 +61,10 @@
'
data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAABjklEQVRoQ+1ZbVHEQAx9TwE4ABTcOQAknANQAKcAUAAOAAXgAHAACsDCKQiTmbYDzJZtNt2bFrJ/m6+Xl2yyU2LmhzOPH/8PgIjcADirxNyapNoffMwMiMgzgMPBHmyCLySPLCoBwJKtAbJbYaBmD1yRvBwAtBMxl5DF+DZkiwCIyBLAzsgBbki+Wm2WAlCaL6zOMvKnJO+sNksB7ALQbO1ZHfbIv5FUVs2nCIB6EZETALdmj2mFY5I6X8ynGEADQllYmL1+VzBfnV/VvQB0aj45ARyQ/Ci14QLQsOBZLe5JaikWnzEA7AN4L4hgA2Dpyb76dANwsOCq/TZhASAYKGie0a7R1lDPI0ebtF0NUi+4yfdAtxr3PEMnD6BbD0QkNfACQO05EAwMuaBqDrIVycdmTpwDuP4R0OR7QFftVRP0g+49cwOQq4DJMxAAchmofY3m/EcJBQOZbTRKKJeBKKEoIePvpFRJ1VzmciUccyCa+C81cerBkuuB7sGTE/zt+yhN7AnAqxsAvBn06n8CkyPwMZKwm+UAAAAASUVORK5CYII=
'
;
'
data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAABjklEQVRoQ+1ZbVHEQAx9TwE4ABTcOQAknANQAKcAUAAOAAXgAHAACsDCKQiTmbYDzJZtNt2bFrJ/m6+Xl2yyU2LmhzOPH/8PgIjcADirxNyapNoffMwMiMgzgMPBHmyCLySPLCoBwJKtAbJbYaBmD1yRvBwAtBMxl5DF+DZkiwCIyBLAzsgBbki+Wm2WAlCaL6zOMvKnJO+sNksB7ALQbO1ZHfbIv5FUVs2nCIB6EZETALdmj2mFY5I6X8ynGEADQllYmL1+VzBfnV/VvQB0aj45ARyQ/Ci14QLQsOBZLe5JaikWnzEA7AN4L4hgA2Dpyb76dANwsOCq/TZhASAYKGie0a7R1lDPI0ebtF0NUi+4yfdAtxr3PEMnD6BbD0QkNfACQO05EAwMuaBqDrIVycdmTpwDuP4R0OR7QFftVRP0g+49cwOQq4DJMxAAchmofY3m/EcJBQOZbTRKKJeBKKEoIePvpFRJ1VzmciUccyCa+C81cerBkuuB7sGTE/zt+yhN7AnAqxsAvBn06n8CkyPwMZKwm+UAAAAASUVORK5CYII=
'
;
var
onImg
=
var
onImg
=
'
data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAB4klEQVRoQ+1ZQU7CUBCdaWVBLFETqUtxB7iQG4hH4AZ4AvUE4gnkBuoJ9AbiDXAhZadby4IQICaS9psqJBVLy5/fkhKHbefPzPvzZv6bgLDmP1zz/OH/ARjZpSYAniVSORQXRt5qyviWrsDQLrUQ8FgmyLK2AsRTzrSqy9p7dgxA5raibFdSgSR7QAi4yu11GlFA/d+lKSTjfBW2JAAj+7Cio7MVZ4KO0AeG+dKW9UkCMHwvNxDhUjZYuL17apjdW1mfJACiX9gef2bbgLgvG3CB/bNhdioUXyQAXqCRXawDaDeUoPNnBLonuXy3RfFFBvADouxx9ogSeHaGMjpjm0LDXrGKQntUAaBn3IPsTveN6kOpAl5QNWkh7gzTqlOTJ0mJ+WAf/WLBmWivskkIEIONjKio3H4sAKhVUOX+7MKUKcQAZLk3Z88VWEQhr0kRYCoN/m5wqe8BvzQOkuDpB+CTB0EPHgOYNnNiTewXaFyBkFGbWAVQE7XNXevhW7X2Sucg8NqfR+p7AADaesateUk7E+0eAH4tLOsAIPSNZQBJT6EoicMV4Ar4OEJZK5lCTCGmkPy/MUGjOTEtxO9A1A1wE3MTp6iJgxaWKAr7F54o27DvsUwhlQRUzzIA1RtUPf8FRKRYQOI+9hQAAAAASUVORK5CYII=
'
;
'
data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAB4klEQVRoQ+1ZQU7CUBCdaWVBLFETqUtxB7iQG4hH4AZ4AvUE4gnkBuoJ9AbiDXAhZadby4IQICaS9psqJBVLy5/fkhKHbefPzPvzZv6bgLDmP1zz/OH/ARjZpSYAniVSORQXRt5qyviWrsDQLrUQ8FgmyLK2AsRTzrSqy9p7dgxA5raibFdSgSR7QAi4yu11GlFA/d+lKSTjfBW2JAAj+7Cio7MVZ4KO0AeG+dKW9UkCMHwvNxDhUjZYuL17apjdW1mfJACiX9gef2bbgLgvG3CB/bNhdioUXyQAXqCRXawDaDeUoPNnBLonuXy3RfFFBvADouxx9ogSeHaGMjpjm0LDXrGKQntUAaBn3IPsTveN6kOpAl5QNWkh7gzTqlOTJ0mJ+WAf/WLBmWivskkIEIONjKio3H4sAKhVUOX+7MKUKcQAZLk3Z88VWEQhr0kRYCoN/m5wqe8BvzQOkuDpB+CTB0EPHgOYNnNiTewXaFyBkFGbWAVQE7XNXevhW7X2Sucg8NqfR+p7AADaesateUk7E+0eAH4tLOsAIPSNZQBJT6EoicMV4Ar4OEJZK5lCTCGmkPy/MUGjOTEtxO9A1A1wE3MTp6iJgxaWKAr7F54o27DvsUwhlQRUzzIA1RtUPf8FRKRYQOI+9hQAAAAASUVORK5CYII=
'
;
var
onText
=
'
轻触照亮
'
;
var
webview
=
plus
.
webview
.
currentWebview
();
var
offText
=
'
轻触关闭
'
;
var
en
=
webview
.
__uniapp_locale
&&
webview
.
__uniapp_locale
.
indexOf
(
'
zh
'
)
<
0
var
onText
=
en
?
''
:
'
轻触照亮
'
;
var
offText
=
en
?
''
:
'
轻触关闭
'
;
var
on
=
false
;
var
on
=
false
;
var
viewWidth
=
48
;
var
viewWidth
=
48
;
var
fontSize
=
10
;
var
fontSize
=
10
;
...
@@ -132,7 +134,7 @@
...
@@ -132,7 +134,7 @@
plus
.
webview
.
postMessageToUniNView
({
plus
.
webview
.
postMessageToUniNView
({
type
:
'
scanCode
'
,
type
:
'
scanCode
'
,
args
:
{
args
:
{
errMsg
:
error
.
message
+
'
,错误码:
'
+
error
.
code
errMsg
:
error
.
message
+
'
error code:
'
+
error
.
code
}
}
},
'
__uniapp__service
'
);
},
'
__uniapp__service
'
);
};
};
...
...
packages/uni-cli-shared/template/common/__uniappscan.js
浏览文件 @
e8d7958b
此差异已折叠。
点击以展开。
packages/uni-cli-shared/template/weex/__uniappscan.html
浏览文件 @
e8d7958b
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
'
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0
'
+
'
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0
'
+
(
coverSupport
?
'
, viewport-fit=cover
'
:
''
)
+
'
" />
'
)
(
coverSupport
?
'
, viewport-fit=cover
'
:
''
)
+
'
" />
'
)
</script>
</script>
<title>
扫码
</title>
<title>
Scan code
</title>
<style>
<style>
html
,
html
,
body
,
body
,
...
@@ -61,8 +61,10 @@
...
@@ -61,8 +61,10 @@
'
data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAABjklEQVRoQ+1ZbVHEQAx9TwE4ABTcOQAknANQAKcAUAAOAAXgAHAACsDCKQiTmbYDzJZtNt2bFrJ/m6+Xl2yyU2LmhzOPH/8PgIjcADirxNyapNoffMwMiMgzgMPBHmyCLySPLCoBwJKtAbJbYaBmD1yRvBwAtBMxl5DF+DZkiwCIyBLAzsgBbki+Wm2WAlCaL6zOMvKnJO+sNksB7ALQbO1ZHfbIv5FUVs2nCIB6EZETALdmj2mFY5I6X8ynGEADQllYmL1+VzBfnV/VvQB0aj45ARyQ/Ci14QLQsOBZLe5JaikWnzEA7AN4L4hgA2Dpyb76dANwsOCq/TZhASAYKGie0a7R1lDPI0ebtF0NUi+4yfdAtxr3PEMnD6BbD0QkNfACQO05EAwMuaBqDrIVycdmTpwDuP4R0OR7QFftVRP0g+49cwOQq4DJMxAAchmofY3m/EcJBQOZbTRKKJeBKKEoIePvpFRJ1VzmciUccyCa+C81cerBkuuB7sGTE/zt+yhN7AnAqxsAvBn06n8CkyPwMZKwm+UAAAAASUVORK5CYII=
'
;
'
data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAABjklEQVRoQ+1ZbVHEQAx9TwE4ABTcOQAknANQAKcAUAAOAAXgAHAACsDCKQiTmbYDzJZtNt2bFrJ/m6+Xl2yyU2LmhzOPH/8PgIjcADirxNyapNoffMwMiMgzgMPBHmyCLySPLCoBwJKtAbJbYaBmD1yRvBwAtBMxl5DF+DZkiwCIyBLAzsgBbki+Wm2WAlCaL6zOMvKnJO+sNksB7ALQbO1ZHfbIv5FUVs2nCIB6EZETALdmj2mFY5I6X8ynGEADQllYmL1+VzBfnV/VvQB0aj45ARyQ/Ci14QLQsOBZLe5JaikWnzEA7AN4L4hgA2Dpyb76dANwsOCq/TZhASAYKGie0a7R1lDPI0ebtF0NUi+4yfdAtxr3PEMnD6BbD0QkNfACQO05EAwMuaBqDrIVycdmTpwDuP4R0OR7QFftVRP0g+49cwOQq4DJMxAAchmofY3m/EcJBQOZbTRKKJeBKKEoIePvpFRJ1VzmciUccyCa+C81cerBkuuB7sGTE/zt+yhN7AnAqxsAvBn06n8CkyPwMZKwm+UAAAAASUVORK5CYII=
'
;
var
onImg
=
var
onImg
=
'
data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAB4klEQVRoQ+1ZQU7CUBCdaWVBLFETqUtxB7iQG4hH4AZ4AvUE4gnkBuoJ9AbiDXAhZadby4IQICaS9psqJBVLy5/fkhKHbefPzPvzZv6bgLDmP1zz/OH/ARjZpSYAniVSORQXRt5qyviWrsDQLrUQ8FgmyLK2AsRTzrSqy9p7dgxA5raibFdSgSR7QAi4yu11GlFA/d+lKSTjfBW2JAAj+7Cio7MVZ4KO0AeG+dKW9UkCMHwvNxDhUjZYuL17apjdW1mfJACiX9gef2bbgLgvG3CB/bNhdioUXyQAXqCRXawDaDeUoPNnBLonuXy3RfFFBvADouxx9ogSeHaGMjpjm0LDXrGKQntUAaBn3IPsTveN6kOpAl5QNWkh7gzTqlOTJ0mJ+WAf/WLBmWivskkIEIONjKio3H4sAKhVUOX+7MKUKcQAZLk3Z88VWEQhr0kRYCoN/m5wqe8BvzQOkuDpB+CTB0EPHgOYNnNiTewXaFyBkFGbWAVQE7XNXevhW7X2Sucg8NqfR+p7AADaesateUk7E+0eAH4tLOsAIPSNZQBJT6EoicMV4Ar4OEJZK5lCTCGmkPy/MUGjOTEtxO9A1A1wE3MTp6iJgxaWKAr7F54o27DvsUwhlQRUzzIA1RtUPf8FRKRYQOI+9hQAAAAASUVORK5CYII=
'
;
'
data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAB4klEQVRoQ+1ZQU7CUBCdaWVBLFETqUtxB7iQG4hH4AZ4AvUE4gnkBuoJ9AbiDXAhZadby4IQICaS9psqJBVLy5/fkhKHbefPzPvzZv6bgLDmP1zz/OH/ARjZpSYAniVSORQXRt5qyviWrsDQLrUQ8FgmyLK2AsRTzrSqy9p7dgxA5raibFdSgSR7QAi4yu11GlFA/d+lKSTjfBW2JAAj+7Cio7MVZ4KO0AeG+dKW9UkCMHwvNxDhUjZYuL17apjdW1mfJACiX9gef2bbgLgvG3CB/bNhdioUXyQAXqCRXawDaDeUoPNnBLonuXy3RfFFBvADouxx9ogSeHaGMjpjm0LDXrGKQntUAaBn3IPsTveN6kOpAl5QNWkh7gzTqlOTJ0mJ+WAf/WLBmWivskkIEIONjKio3H4sAKhVUOX+7MKUKcQAZLk3Z88VWEQhr0kRYCoN/m5wqe8BvzQOkuDpB+CTB0EPHgOYNnNiTewXaFyBkFGbWAVQE7XNXevhW7X2Sucg8NqfR+p7AADaesateUk7E+0eAH4tLOsAIPSNZQBJT6EoicMV4Ar4OEJZK5lCTCGmkPy/MUGjOTEtxO9A1A1wE3MTp6iJgxaWKAr7F54o27DvsUwhlQRUzzIA1RtUPf8FRKRYQOI+9hQAAAAASUVORK5CYII=
'
;
var
onText
=
'
轻触照亮
'
;
var
webview
=
plus
.
webview
.
currentWebview
();
var
offText
=
'
轻触关闭
'
;
var
en
=
webview
.
__uniapp_locale
&&
webview
.
__uniapp_locale
.
indexOf
(
'
zh
'
)
<
0
var
onText
=
en
?
''
:
'
轻触照亮
'
;
var
offText
=
en
?
''
:
'
轻触关闭
'
;
var
on
=
false
;
var
on
=
false
;
var
viewWidth
=
48
;
var
viewWidth
=
48
;
var
fontSize
=
10
;
var
fontSize
=
10
;
...
@@ -132,7 +134,7 @@
...
@@ -132,7 +134,7 @@
plus
.
webview
.
postMessageToUniNView
({
plus
.
webview
.
postMessageToUniNView
({
type
:
'
scanCode
'
,
type
:
'
scanCode
'
,
args
:
{
args
:
{
errMsg
:
error
.
message
+
'
,错误码:
'
+
error
.
code
errMsg
:
error
.
message
+
'
error code:
'
+
error
.
code
}
}
},
'
__uniapp__service
'
);
},
'
__uniapp__service
'
);
};
};
...
...
src/core/helpers/i18n/en.json
浏览文件 @
e8d7958b
...
@@ -16,6 +16,11 @@
...
@@ -16,6 +16,11 @@
"uni.previewImage.save.success"
:
"Saved successfully"
,
"uni.previewImage.save.success"
:
"Saved successfully"
,
"uni.previewImage.save.fail"
:
"Save failed"
,
"uni.previewImage.save.fail"
:
"Save failed"
,
"uni.setClipboardData.success"
:
"Content copied"
,
"uni.setClipboardData.success"
:
"Content copied"
,
"uni.scanCode.title"
:
"Scan code"
,
"uni.scanCode.album"
:
"Album"
,
"uni.scanCode.fail"
:
"Recognition failure"
,
"uni.scanCode.flash.on"
:
"Tap to turn light on"
,
"uni.scanCode.flash.off"
:
"Tap to turn light off"
,
"uni.picker.done"
:
"Done"
,
"uni.picker.done"
:
"Done"
,
"uni.picker.cancel"
:
"Cancel"
,
"uni.picker.cancel"
:
"Cancel"
,
"uni.video.danmu"
:
"Danmu"
,
"uni.video.danmu"
:
"Danmu"
,
...
...
src/core/helpers/i18n/es.json
浏览文件 @
e8d7958b
...
@@ -16,6 +16,11 @@
...
@@ -16,6 +16,11 @@
"uni.previewImage.save.success"
:
"Guardado exitosamente"
,
"uni.previewImage.save.success"
:
"Guardado exitosamente"
,
"uni.previewImage.save.fail"
:
"Error al guardar"
,
"uni.previewImage.save.fail"
:
"Error al guardar"
,
"uni.setClipboardData.success"
:
"Contenido copiado"
,
"uni.setClipboardData.success"
:
"Contenido copiado"
,
"uni.scanCode.title"
:
"Código de escaneo"
,
"uni.scanCode.album"
:
"Álbum"
,
"uni.scanCode.fail"
:
"Échec de la reconnaissance"
,
"uni.scanCode.flash.on"
:
"Toque para encender la luz"
,
"uni.scanCode.flash.off"
:
"Toque para apagar la luz"
,
"uni.picker.done"
:
"OK"
,
"uni.picker.done"
:
"OK"
,
"uni.picker.cancel"
:
"Cancelar"
,
"uni.picker.cancel"
:
"Cancelar"
,
"uni.video.danmu"
:
"Danmu"
,
"uni.video.danmu"
:
"Danmu"
,
...
...
src/core/helpers/i18n/fr.json
浏览文件 @
e8d7958b
...
@@ -16,6 +16,11 @@
...
@@ -16,6 +16,11 @@
"uni.previewImage.save.success"
:
"Enregistré avec succès"
,
"uni.previewImage.save.success"
:
"Enregistré avec succès"
,
"uni.previewImage.save.fail"
:
"Échec de la sauvegarde"
,
"uni.previewImage.save.fail"
:
"Échec de la sauvegarde"
,
"uni.setClipboardData.success"
:
"Contenu copié"
,
"uni.setClipboardData.success"
:
"Contenu copié"
,
"uni.scanCode.title"
:
"Code d’analyse"
,
"uni.scanCode.album"
:
"Album"
,
"uni.scanCode.fail"
:
"Fallo de reconocimiento"
,
"uni.scanCode.flash.on"
:
"Appuyez pour activer l'éclairage"
,
"uni.scanCode.flash.off"
:
"Appuyez pour désactiver l'éclairage"
,
"uni.picker.done"
:
"OK"
,
"uni.picker.done"
:
"OK"
,
"uni.picker.cancel"
:
"Annuler"
,
"uni.picker.cancel"
:
"Annuler"
,
"uni.video.danmu"
:
"Danmu"
,
"uni.video.danmu"
:
"Danmu"
,
...
...
src/core/helpers/i18n/zh-Hans.json
浏览文件 @
e8d7958b
...
@@ -16,6 +16,11 @@
...
@@ -16,6 +16,11 @@
"uni.previewImage.save.success"
:
"保存图像到相册成功"
,
"uni.previewImage.save.success"
:
"保存图像到相册成功"
,
"uni.previewImage.save.fail"
:
"保存图像到相册失败"
,
"uni.previewImage.save.fail"
:
"保存图像到相册失败"
,
"uni.setClipboardData.success"
:
"内容已复制"
,
"uni.setClipboardData.success"
:
"内容已复制"
,
"uni.scanCode.title"
:
"扫码"
,
"uni.scanCode.album"
:
"相册"
,
"uni.scanCode.fail"
:
"识别失败"
,
"uni.scanCode.flash.on"
:
"轻触照亮"
,
"uni.scanCode.flash.off"
:
"轻触关闭"
,
"uni.picker.done"
:
"完成"
,
"uni.picker.done"
:
"完成"
,
"uni.picker.cancel"
:
"取消"
,
"uni.picker.cancel"
:
"取消"
,
"uni.video.danmu"
:
"弹幕"
,
"uni.video.danmu"
:
"弹幕"
,
...
...
src/core/helpers/i18n/zh-Hant.json
浏览文件 @
e8d7958b
...
@@ -16,6 +16,11 @@
...
@@ -16,6 +16,11 @@
"uni.previewImage.save.success"
:
"保存圖像到相冊成功"
,
"uni.previewImage.save.success"
:
"保存圖像到相冊成功"
,
"uni.previewImage.save.fail"
:
"保存圖像到相冊失敗"
,
"uni.previewImage.save.fail"
:
"保存圖像到相冊失敗"
,
"uni.setClipboardData.success"
:
"內容已復制"
,
"uni.setClipboardData.success"
:
"內容已復制"
,
"uni.scanCode.title"
:
"掃碼"
,
"uni.scanCode.album"
:
"相冊"
,
"uni.scanCode.fail"
:
"識別失敗"
,
"uni.scanCode.flash.on"
:
"輕觸照亮"
,
"uni.scanCode.flash.off"
:
"輕觸關閉"
,
"uni.picker.done"
:
"完成"
,
"uni.picker.done"
:
"完成"
,
"uni.picker.cancel"
:
"取消"
,
"uni.picker.cancel"
:
"取消"
,
"uni.video.danmu"
:
"彈幕"
,
"uni.video.danmu"
:
"彈幕"
,
...
...
src/platforms/app-plus/service/api/device/scan-code-webview.js
浏览文件 @
e8d7958b
...
@@ -20,6 +20,11 @@ import {
...
@@ -20,6 +20,11 @@ import {
consumePlusMessage
consumePlusMessage
}
from
'
../../framework/plus-message
'
}
from
'
../../framework/plus-message
'
import
{
t
,
getLocale
}
from
'
uni-core/helpers/i18n
'
export
const
SCAN_ID
=
'
__UNIAPP_SCAN
'
export
const
SCAN_ID
=
'
__UNIAPP_SCAN
'
export
const
SCAN_PATH
=
'
_www/__uniappscan.html
'
export
const
SCAN_PATH
=
'
_www/__uniappscan.html
'
...
@@ -95,7 +100,7 @@ export function scanCode ({
...
@@ -95,7 +100,7 @@ export function scanCode ({
if
(
!
onlyFromCamera
)
{
if
(
!
onlyFromCamera
)
{
buttons
.
push
({
buttons
.
push
({
float
:
'
right
'
,
float
:
'
right
'
,
text
:
'
相册
'
,
text
:
t
(
'
uni.scanCode.album
'
)
,
fontSize
:
'
17px
'
,
fontSize
:
'
17px
'
,
width
:
'
60px
'
,
width
:
'
60px
'
,
onclick
:
function
()
{
onclick
:
function
()
{
...
@@ -111,11 +116,13 @@ export function scanCode ({
...
@@ -111,11 +116,13 @@ export function scanCode ({
}
}
webview
.
close
(
'
auto
'
)
webview
.
close
(
'
auto
'
)
},
()
=>
{
},
()
=>
{
plus
.
nativeUI
.
toast
(
'
识别失败
'
)
plus
.
nativeUI
.
toast
(
t
(
'
uni.scanCode.fail
'
)
)
},
filters
,
autoDecodeCharSet
)
},
filters
,
autoDecodeCharSet
)
},
err
=>
{
},
err
=>
{
if
(
err
.
code
!==
12
)
{
// iOS {"code":-2,"message":"用户取消,https://ask.dcloud.net.cn/article/282"}
plus
.
nativeUI
.
toast
(
'
选择失败
'
)
// Android {"code":12,"message":"User cancelled"}
if
(
err
.
code
!==
(
plus
.
os
.
name
===
'
Android
'
?
12
:
-
2
))
{
plus
.
nativeUI
.
toast
(
t
(
'
uni.scanCode.fail
'
))
}
}
},
{
},
{
multiple
:
false
,
multiple
:
false
,
...
@@ -133,7 +140,7 @@ export function scanCode ({
...
@@ -133,7 +140,7 @@ export function scanCode ({
type
:
'
float
'
,
type
:
'
float
'
,
backgroundColor
:
'
rgba(0,0,0,0)
'
,
backgroundColor
:
'
rgba(0,0,0,0)
'
,
titleColor
:
'
#ffffff
'
,
titleColor
:
'
#ffffff
'
,
titleText
:
'
扫码
'
,
titleText
:
t
(
'
uni.scanCode.title
'
)
,
titleSize
:
'
17px
'
,
titleSize
:
'
17px
'
,
buttons
buttons
},
},
...
@@ -144,6 +151,7 @@ export function scanCode ({
...
@@ -144,6 +151,7 @@ export function scanCode ({
__uniapp_dark
:
isDark
,
__uniapp_dark
:
isDark
,
__uniapp_scan_type
:
filters
,
__uniapp_scan_type
:
filters
,
__uniapp_auto_decode_char_set
:
autoDecodeCharSet
,
__uniapp_auto_decode_char_set
:
autoDecodeCharSet
,
__uniapp_locale
:
getLocale
(),
'
uni-app
'
:
'
none
'
'
uni-app
'
:
'
none
'
})
})
const
waiting
=
plus
.
nativeUI
.
showWaiting
()
const
waiting
=
plus
.
nativeUI
.
showWaiting
()
...
...
src/platforms/app-plus/service/api/device/scan-code-weex.js
浏览文件 @
e8d7958b
...
@@ -6,6 +6,10 @@ import {
...
@@ -6,6 +6,10 @@ import {
showPage
showPage
}
from
'
../page.js
'
}
from
'
../page.js
'
import
{
t
}
from
'
uni-core/helpers/i18n
'
function
getStatusBarStyle
()
{
function
getStatusBarStyle
()
{
let
style
=
plus
.
navigator
.
getStatusBarStyle
()
let
style
=
plus
.
navigator
.
getStatusBarStyle
()
if
(
style
===
'
UIStatusBarStyleBlackTranslucent
'
||
style
===
'
UIStatusBarStyleBlackOpaque
'
||
style
===
'
null
'
)
{
if
(
style
===
'
UIStatusBarStyleBlackTranslucent
'
||
style
===
'
UIStatusBarStyleBlackOpaque
'
||
style
===
'
null
'
)
{
...
@@ -23,17 +27,23 @@ export function scanCode (options, callbackId) {
...
@@ -23,17 +27,23 @@ export function scanCode (options, callbackId) {
let
result
let
result
const
page
=
showPage
({
const
page
=
showPage
({
url
:
'
__uniappscan
'
,
url
:
'
__uniappscan
'
,
data
:
options
,
data
:
Object
.
assign
({},
options
,
{
messages
:
{
fail
:
t
(
'
uni.scanCode.fail
'
),
'
flash.on
'
:
t
(
'
uni.scanCode.flash.on
'
),
'
flash.off
'
:
t
(
'
uni.scanCode.flash.off
'
)
}
}),
style
:
{
style
:
{
animationType
:
options
.
animationType
||
'
pop-in
'
,
animationType
:
options
.
animationType
||
'
pop-in
'
,
titleNView
:
{
titleNView
:
{
autoBackButton
:
true
,
autoBackButton
:
true
,
type
:
'
float
'
,
type
:
'
float
'
,
titleText
:
options
.
titleText
||
'
扫码
'
,
titleText
:
options
.
titleText
||
t
(
'
uni.scanCode.title
'
)
,
titleColor
:
'
#ffffff
'
,
titleColor
:
'
#ffffff
'
,
backgroundColor
:
'
rgba(0,0,0,0)
'
,
backgroundColor
:
'
rgba(0,0,0,0)
'
,
buttons
:
!
options
.
onlyFromCamera
?
[{
buttons
:
!
options
.
onlyFromCamera
?
[{
text
:
options
.
albumText
||
'
相册
'
,
text
:
options
.
albumText
||
t
(
'
uni.scanCode.album
'
)
,
fontSize
:
'
17px
'
,
fontSize
:
'
17px
'
,
width
:
'
60px
'
,
width
:
'
60px
'
,
onclick
:
()
=>
{
onclick
:
()
=>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录