diff --git a/pages.json b/pages.json
index f067a47ccc219e6ed95ca9bc08b834c9e61749e3..eb7ff08b3c9473f70560aa0a60f8bb24c9b56ac3 100644
--- a/pages.json
+++ b/pages.json
@@ -599,12 +599,6 @@
"navigationBarTitleText": "get-app-authorize-setting"
}
},
- {
- "path": "pages/API/save-image-to-photos-album/save-image-to-photos-album",
- "style": {
- "navigationBarTitleText": "保存图片到相册"
- }
- },
// #endif
{
"path": "pages/API/preview-image/preview-image",
@@ -618,7 +612,7 @@
"navigationBarTitleText": "拍摄图片或从相册中选择图片"
}
},
- // #ifdef APP-ANDROID
+ // #ifdef APP-ANDROID || WEB
{
"path" : "pages/API/get-image-info/get-image-info",
"style" :
@@ -626,6 +620,8 @@
"navigationBarTitleText" : "获取图片信息"
}
},
+ // #endif
+ // #ifdef APP-ANDROID
{
"path" : "pages/API/compress-image/compress-image",
"style" :
@@ -634,7 +630,6 @@
}
},
// #endif
- // #ifdef APP
{
"path" : "pages/API/choose-video/choose-video",
"style" :
@@ -642,6 +637,13 @@
"navigationBarTitleText" : "拍摄视频或从相册中选择视频"
}
},
+ // #ifndef WEB
+ {
+ "path": "pages/API/save-image-to-photos-album/save-image-to-photos-album",
+ "style": {
+ "navigationBarTitleText": "保存图片到相册"
+ }
+ },
{
"path" : "pages/API/save-video-to-photos-album/save-video-to-photos-album",
"style" :
@@ -650,7 +652,7 @@
}
},
// #endif
- // #ifdef APP-ANDROID
+ // #ifdef APP-ANDROID || WEB
{
"path" : "pages/API/get-video-info/get-video-info",
"style" :
@@ -658,6 +660,8 @@
"navigationBarTitleText" : "获取视频信息"
}
},
+ // #endif
+ // #ifdef APP-ANDROID
{
"path" : "pages/API/compress-video/compress-video",
"style" :
diff --git a/pages/API/choose-video/choose-video.uvue b/pages/API/choose-video/choose-video.uvue
index 28e6e7feb0b81f2ce4d5bd60c28397cd7e0286c5..d265d7b1b22b45ccf6df497a50c1eadcb313d7fc 100644
--- a/pages/API/choose-video/choose-video.uvue
+++ b/pages/API/choose-video/choose-video.uvue
@@ -4,13 +4,15 @@
-
+
-
+
+
+
@@ -19,7 +21,7 @@
-
diff --git a/pages/API/get-current-pages/page-style.uts b/pages/API/get-current-pages/page-style.uts
new file mode 100644
index 0000000000000000000000000000000000000000..726f711732f2f3c8172ff2f678f72fbec3d3ee66
--- /dev/null
+++ b/pages/API/get-current-pages/page-style.uts
@@ -0,0 +1,99 @@
+
+export type PageStyleItem = {
+ type : string
+ value : UTSJSONObject
+}
+
+export const PageStyleMap = new Map([
+ ["navigationBarBackgroundColor", {
+ type: "string",
+ value: {
+ oldValue: "#F8F8F8",
+ newValue: "#F0F0F0",
+ }
+ } as PageStyleItem],
+ ["navigationBarTextStyle", {
+ type: "string",
+ value: {
+ oldValue: "white",
+ newValue: "black",
+ }
+ } as PageStyleItem],
+ ["navigationBarTitleText", {
+ type: "string",
+ value: {
+ oldValue: "old title",
+ newValue: "new title",
+ }
+ } as PageStyleItem],
+ ["navigationStyle", {
+ type: "string",
+ value: {
+ oldValue: "default",
+ newValue: "custom",
+ }
+ } as PageStyleItem],
+ ["backgroundColor", {
+ type: "string",
+ value: {
+ oldValue: "#ffffff",
+ newValue: "#000000",
+ }
+ } as PageStyleItem],
+ ["backgroundColorContent", {
+ type: "string",
+ value: {
+ oldValue: "#ffffff",
+ newValue: "#000000",
+ }
+ } as PageStyleItem],
+ ["backgroundTextStyle", {
+ type: "string",
+ value: {
+ oldValue: "dark",
+ newValue: "light",
+ }
+ } as PageStyleItem],
+ ["enablePullDownRefresh", {
+ type: "boolean",
+ value: {
+ oldValue: true,
+ newValue: false,
+ }
+ } as PageStyleItem],
+ ["onReachBottomDistance", {
+ type: "number",
+ value: {
+ oldValue: 50,
+ newValue: 100,
+ }
+ } as PageStyleItem],
+ ["pageOrientation", {
+ type: "string",
+ value: {
+ oldValue: "auto",
+ newValue: "portrait",
+ }
+ } as PageStyleItem],
+ ["backgroundColorTop", {
+ type: "string",
+ value: {
+ oldValue: "#ffffff",
+ newValue: "#000000",
+ }
+ } as PageStyleItem],
+ ["backgroundColorBottom", {
+ type: "string",
+ value: {
+ oldValue: "#ffffff",
+ newValue: "#000000",
+ }
+ } as PageStyleItem],
+ ["navigationBarAutoBackButton", {
+ type: "boolean",
+ value: {
+ oldValue: true,
+ newValue: false,
+ }
+ } as PageStyleItem],
+])
diff --git a/pages/API/get-file-system-manager/get-file-system-manager.uvue b/pages/API/get-file-system-manager/get-file-system-manager.uvue
index 22367a84501f482dae3dc512bf77459cf910db88..2ae9c050d799d9fd85c7e4e1a374af8055693df1 100644
--- a/pages/API/get-file-system-manager/get-file-system-manager.uvue
+++ b/pages/API/get-file-system-manager/get-file-system-manager.uvue
@@ -164,12 +164,12 @@
this.statsRet = res.stats
console.log('this.statsRet', this.statsRet)
},
- fail: (res : UniError) => {
+ fail: (res:IUniError ) => {
if (this.logAble) {
this.log += 'statFileInfoTest fail:' + JSON.stringify(res) + '\n\n'
}
console.log('statFileInfoTest fail', res)
- this.lastFailError = res
+ this.lastFailError=new UniError(res.errSubject, res.errCode, res.errMsg)
},
complete: (res : any) => {
console.log("statFileInfoTest complete", res)
@@ -195,12 +195,12 @@
this.getFileInfoSize = res.size
this.getFileInfoDigest = res.digest
},
- fail: (res : UniError) => {
+ fail: (res : IUniError) => {
if (this.logAble) {
this.log += 'getFileInfoTest fail:' + JSON.stringify(res) + '\n\n'
}
console.log('fail', res)
- this.lastFailError = res
+ this.lastFailError=new UniError(res.errSubject, res.errCode, res.errMsg)
},
complete: (res : any) => {
console.log("complete", res)
@@ -224,12 +224,12 @@
}
console.log('success', res)
},
- fail: (res : UniError) => {
+ fail: (res : IUniError) => {
if (this.logAble) {
this.log += 'copyFileTest fail:' + JSON.stringify(res) + '\n\n'
}
console.log('fail', res)
- this.lastFailError = res
+ this.lastFailError=new UniError(res.errSubject, res.errCode, res.errMsg)
},
complete: (res : any) => {
console.log("complete", res)
@@ -253,12 +253,12 @@
}
console.log('success', res)
},
- fail: (res : UniError) => {
+ fail: (res : IUniError) => {
if (this.logAble) {
this.log += 'renameFileTest fail:' + JSON.stringify(res) + '\n\n'
}
console.log('fail', res)
- this.lastFailError = res
+ this.lastFailError=new UniError(res.errSubject, res.errCode, res.errMsg)
},
complete: (res : any) => {
this.done = true
@@ -281,12 +281,12 @@
console.log("success", res)
this.fileListSuccess = res.files
},
- fail: (res : UniError) => {
+ fail: (res : IUniError) => {
if (this.logAble) {
this.log += 'readDirTest fail:' + JSON.stringify(res) + '\n\n'
}
console.log('fail', res)
- this.lastFailError = res
+ this.lastFailError=new UniError(res.errSubject, res.errCode, res.errMsg)
},
complete: (res : any) => {
console.log("complete", res)
@@ -313,12 +313,12 @@
}
console.log('success', res)
},
- fail: (res : UniError) => {
+ fail: (res : IUniError) => {
if (this.logAble) {
this.log += 'writeFileTest fail:' + JSON.stringify(res) + '\n\n'
}
console.log('fail')
- this.lastFailError = res
+ this.lastFailError=new UniError(res.errSubject, res.errCode, res.errMsg)
},
complete: (res : any) => {
this.done = true
@@ -344,12 +344,12 @@
console.log('success', res)
this.readFileRet = res.data
},
- fail: (res : UniError) => {
+ fail: (res : IUniError) => {
if (this.logAble) {
this.log += 'readFileTest fail:' + JSON.stringify(res) + '\n\n'
}
console.log('fail', res)
- this.lastFailError = res
+ this.lastFailError=new UniError(res.errSubject, res.errCode, res.errMsg)
},
complete: (res : any) => {
console.log("complete", res)
@@ -372,12 +372,12 @@
}
console.log('success', res)
},
- fail: (res : UniError) => {
+ fail: (res : IUniError) => {
if (this.logAble) {
this.log += 'rmdirTest fail:' + JSON.stringify(res) + '\n\n'
}
console.log('fail', res)
- this.lastFailError = res
+ this.lastFailError=new UniError(res.errSubject, res.errCode, res.errMsg)
},
complete: (res : any) => {
console.log("complete", res)
@@ -402,12 +402,13 @@
}
console.log('success', res)
},
- fail: (res : UniError) => {
+ fail: (res : IUniError) => {
if (this.logAble) {
this.log += 'mkdirTest fail:' + JSON.stringify(res) + '\n\n'
}
console.log('fail', res)
- this.lastFailError = res
+ this.lastFailError=new UniError(res.errSubject, res.errCode, res.errMsg)
+
},
complete: (res : any) => {
if (res instanceof UniError) {
@@ -431,12 +432,13 @@
console.log('success', res)
this.accessFileRet = res.errMsg
},
- fail: (res : UniError) => {
+ fail: (res : IUniError) => {
if (this.logAble) {
this.log += 'accessFileTest fail:' + JSON.stringify(res) + '\n\n'
}
console.log('fail', res)
- this.lastFailError = res
+ this.lastFailError=new UniError(res.errSubject, res.errCode, res.errMsg)
+
},
complete: (res : any) => {
if (res instanceof UniError) {
@@ -459,12 +461,13 @@
}
console.log('success', res)
},
- fail: (res : UniError) => {
+ fail: (res : IUniError) => {
if (this.logAble) {
this.log += 'unlinkTest fail:' + JSON.stringify(res) + '\n\n'
}
console.log('fail', res)
- this.lastFailError = res
+ this.lastFailError=new UniError(res.errSubject, res.errCode, res.errMsg)
+
},
complete: (res : any) => {
if (res instanceof UniError) {
@@ -497,12 +500,13 @@
}
console.log('success unlink', res)
},
- fail: (res : UniError) => {
+ fail: (res : IUniError) => {
if (this.logAble) {
this.log += 'unlinkAllFileTest fail:' + JSON.stringify(res) + '\n\n'
}
console.log('fail unlink', res)
- this.lastFailError = res
+ this.lastFailError=new UniError(res.errSubject, res.errCode, res.errMsg)
+
},
complete: (res : any) => {
if (res instanceof UniError) {
@@ -514,12 +518,13 @@
} as UnLinkOptions)
});
},
- fail: (res : UniError) => {
+ fail: (res : IUniError) => {
if (this.logAble) {
this.log += 'unlinkAllFileTest fail:' + JSON.stringify(res) + '\n\n'
}
console.log('fail to readdir', res)
- this.lastFailError = res
+ this.lastFailError=new UniError(res.errSubject, res.errCode, res.errMsg)
+
},
complete: (res : any) => {
console.log("complete readdir", res)
@@ -544,12 +549,13 @@
}
console.log('success', res)
},
- fail: (res : UniError) => {
+ fail: (res : IUniError) => {
if (this.logAble) {
this.log += 'copyFileTest fail:' + JSON.stringify(res) + '\n\n'
}
console.log('fail', res)
- this.lastFailError = res
+ this.lastFailError=new UniError(res.errSubject, res.errCode, res.errMsg)
+
},
complete: (res : any) => {
console.log("complete", res)
@@ -573,12 +579,13 @@
}
console.log('success', res)
},
- fail: (res : UniError) => {
+ fail: (res : IUniError) => {
if (this.logAble) {
this.log += 'appendFileTest fail:' + JSON.stringify(res) + '\n\n'
}
console.log('fail')
- this.lastFailError = res
+ this.lastFailError=new UniError(res.errSubject, res.errCode, res.errMsg)
+
},
complete: (res : any) => {
this.done = true
@@ -757,12 +764,13 @@
this.saveFileRet = res.savedFilePath
this.done = true
},
- fail: (res : UniError) => {
+ fail: (res : IUniError) => {
if (this.logAble) {
this.log += 'saveFileTest fail:' + JSON.stringify(res) + '\n\n'
}
console.log('saveFileTest fail', res)
- this.lastFailError = res
+ this.lastFailError=new UniError(res.errSubject, res.errCode, res.errMsg)
+
this.done = true
},
complete: (_) => {
@@ -801,12 +809,13 @@
}
console.log('success', res)
},
- fail: (res : UniError) => {
+ fail: (res : IUniError) => {
if (this.logAble) {
this.log += 'unzipFileTest fail:' + JSON.stringify(res) + '\n\n'
}
console.log('fail', res)
- this.lastFailError = res
+ this.lastFailError=new UniError(res.errSubject, res.errCode, res.errMsg)
+
},
complete: (_) => {
this.done = true
@@ -825,12 +834,13 @@
this.fileListSuccess = res.fileList
this.getSavedFileListRet = "getSavedFileList:ok"
},
- fail: (res : UniError) => {
+ fail: (res : IUniError) => {
if (this.logAble) {
this.log += 'getSavedFileListTest fail:' + JSON.stringify(res) + '\n\n'
}
console.log('getSavedFileListTest fail', res)
- this.lastFailError = res
+ this.lastFailError=new UniError(res.errSubject, res.errCode, res.errMsg)
+
this.getSavedFileListRet = JSON.stringify(res)
},
complete: (res : any) => {
@@ -855,12 +865,13 @@
}
console.log("success", res)
},
- fail: (res : UniError) => {
+ fail: (res : IUniError) => {
if (this.logAble) {
this.log += 'truncateFileTest fail:' + JSON.stringify(res) + '\n\n'
}
console.log('fail', res)
- this.lastFailError = res
+ this.lastFailError=new UniError(res.errSubject, res.errCode, res.errMsg)
+
},
complete: (res : any) => {
console.log("complete", res)
@@ -894,12 +905,13 @@
}
console.log("success", res)
},
- fail: (res : UniError) => {
+ fail: (res : IUniError) => {
if (this.logAble) {
this.log += 'readCompressedFileTest fail:' + JSON.stringify(res) + '\n\n'
}
console.log('fail', res)
- this.lastFailError = res
+ this.lastFailError=new UniError(res.errSubject, res.errCode, res.errMsg)
+
},
complete: (_) => {
this.done = true
@@ -937,7 +949,7 @@
this.removeSavedFileRet = res.errMsg
console.log("removeSavedFileTest success", res)
},
- fail: (res : UniError) => {
+ fail: (res : IUniError) => {
if (this.logAble) {
this.log += 'removeSavedFileTest fail:' + JSON.stringify(res) + '\n\n'
}
@@ -981,12 +993,13 @@
console.log("success", res)
this.fd = res.fd
},
- fail: (res : UniError) => {
+ fail: (res : IUniError) => {
if (this.logAble) {
this.log += 'openFileTest fail:' + JSON.stringify(res) + '\n\n'
}
console.log('fail', res)
- this.lastFailError = res
+ this.lastFailError=new UniError(res.errSubject, res.errCode, res.errMsg)
+
},
complete: (_) => {
this.done = true
@@ -1047,12 +1060,13 @@
this.closeFileRet = res.errMsg
console.log("success", res)
},
- fail: (res : UniError) => {
+ fail: (res : IUniError) => {
if (this.logAble) {
this.log += 'closeTest fail:' + JSON.stringify(res) + '\n\n'
}
console.log('fail', res)
- this.lastFailError = res
+ this.lastFailError=new UniError(res.errSubject, res.errCode, res.errMsg)
+
},
complete: (_) => {
this.done = true
@@ -1079,12 +1093,13 @@
console.log("success", res)
this.bytesWritten = res.bytesWritten
},
- fail: (res : UniError) => {
+ fail: (res : IUniError) => {
if (this.logAble) {
this.log += 'writeTest fail:' + JSON.stringify(res) + '\n\n'
}
console.log('fail', res)
- this.lastFailError = res
+ this.lastFailError=new UniError(res.errSubject, res.errCode, res.errMsg)
+
},
complete: (_) => {
this.done = true
@@ -1128,12 +1143,13 @@
this.done = true
}
},
- fail: (res : UniError) => {
+ fail: (res : IUniError) => {
if (this.logAble) {
this.log += 'openFileTest fail:' + JSON.stringify(res) + '\n\n'
}
console.log('fail', res)
- this.lastFailError = res
+ this.lastFailError=new UniError(res.errSubject, res.errCode, res.errMsg)
+
this.done = true
}
} as OpenFileOptions)
@@ -1150,12 +1166,13 @@
console.log("success", res)
this.fstat = res.stats
},
- fail: (res : UniError) => {
+ fail: (res : IUniError) => {
if (this.logAble) {
this.log += 'fstatTest fail:' + JSON.stringify(res) + '\n\n'
}
console.log('fail', res)
- this.lastFailError = res
+ this.lastFailError=new UniError(res.errSubject, res.errCode, res.errMsg)
+
},
complete: (_) => {
this.done = true
@@ -1193,12 +1210,13 @@
}
this.ftruncateRet = res.errMsg
},
- fail: (res : UniError) => {
+ fail: (res : IUniError) => {
if (this.logAble) {
this.log += 'ftruncateFileTest fail:' + JSON.stringify(res) + '\n\n'
}
console.log('fail', res)
- this.lastFailError = res
+ this.lastFailError=new UniError(res.errSubject, res.errCode, res.errMsg)
+
},
complete: (res : any) => {
console.log("complete", res)
@@ -1239,12 +1257,13 @@
}
console.log("success", res)
},
- fail: (res : UniError) => {
+ fail: (res : IUniError) => {
if (this.logAble) {
this.log += 'readZipEntry fail:' + JSON.stringify(res) + '\n\n'
}
console.log('fail', res)
- this.lastFailError = res
+ this.lastFailError=new UniError(res.errSubject, res.errCode, res.errMsg)
+
}
} as ReadZipEntryOptions)
},
diff --git a/pages/API/get-video-info/get-video-info.uvue b/pages/API/get-video-info/get-video-info.uvue
index 972794f612ac6fc78ccec450191a3ded3ac606e3..23c05ce91168fdca7e9a50fef379ce5830610fee 100644
--- a/pages/API/get-video-info/get-video-info.uvue
+++ b/pages/API/get-video-info/get-video-info.uvue
@@ -7,7 +7,7 @@
获取本地绝对路径视频信息
-
+
{{absoluteVideoInfo}}
@@ -37,7 +37,7 @@
src: res.tempFilePath,
success: (_res) => {
console.log("getVideoInfo success", JSON.stringify(res));
- this.absoluteVideoInfo = `视频画面方向: ${_res.orientation}\n视频格式: ${_res.type}\n视频长度: ${_res.duration}s\n视频大小: ${Math.ceil(_res.size / 1024)}kB\n视频宽度: ${_res.width}\n视频高度: ${_res.height}\n视频帧率: ${_res.fps}fps\n视频码率: ${_res.bitrate}kbps`;
+ this.absoluteVideoInfo = `视频画面方向: ${_res.orientation}\n视频格式: ${_res.type}\n视频长度: ${_res.duration}s\n视频大小: ${Math.ceil(_res.size / 1024)}KB\n视频宽度: ${_res.width}\n视频高度: ${_res.height}\n视频帧率: ${_res.fps}fps\n视频码率: ${_res.bitrate}kbps`;
},
fail: (err) => {
uni.showModal({
diff --git a/pages/API/request-payment/request-payment.uvue b/pages/API/request-payment/request-payment.uvue
index dd7ba0e258e6b4d8539e9697b62257016cd856a9..3a8cfa6bf8092622076c9f433c878529798f3b25 100644
--- a/pages/API/request-payment/request-payment.uvue
+++ b/pages/API/request-payment/request-payment.uvue
@@ -1,168 +1,183 @@
-
+
-
-
-
+
+
+