Lubancat2/device_rockchip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

oem_ipc: update prebuilt web applicantion and fix bug

Browse Source 
Signed-off-by: Fenrir Lin <fenrir.lin@rock-chips.com>
Change-Id: Iaa05d0b54d25c42fbee9d54dbe492b182f4c5fc2
This commit is contained in:
Fenrir Lin
2020-03-13 16:27:16 +08:00
parent f26a61059a
commit 28391e74e0
7 changed files with 141 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
oem/oem_ipc/www/assets/json/config-video-encoder.json
View File

@ -16,12 +16,23 @@
},
{
"name": "resolution",
"items": [
"1280*720",
"1280*960",
"1920*1080",
"1920*1536"
]
"items": {
"mainStream": [
"1280*720",
"1920*1080",
"2560*1440"
],
"subStream": [
"640*480",
"704*576"
],
"thirdStream": [
"640*480",
"704*576",
"1280*720",
"1920*1080"
]
}
},
{
"name": "RCMode",

142
oem/oem_ipc/www/assets/json/db.json
View File

@ -289,7 +289,7 @@
"iPositionX": 0,
"iPositionY": 0,
"sChannelName": "channel 2",
"sChannelNameOverlayEnabled": "false"
"iChannelNameOverlayEnabled": 1
},
"characterOverlay": [
{
@ -297,72 +297,72 @@
"iPositionY": 0,
"id": 0,
"sDisplayText": "test",
"sIsPersistentText": "true",
"sTextOverlayEnabled": "false"
"iIsPersistentText": 1,
"iTextOverlayEnabled": 1
},
{
"iPositionX": 0,
"iPositionY": 0,
"id": 1,
"sDisplayText": "test",
"sIsPersistentText": "true",
"sTextOverlayEnabled": "false"
"iIsPersistentText": 1,
"iTextOverlayEnabled": 0
},
{
"iPositionX": 0,
"iPositionY": 0,
"id": 2,
"sDisplayText": "test",
"sIsPersistentText": "true",
"sTextOverlayEnabled": "false"
"iIsPersistentText": 1,
"iTextOverlayEnabled": 0
},
{
"iPositionX": 0,
"iPositionY": 0,
"id": 3,
"sDisplayText": "test",
"sIsPersistentText": "true",
"sTextOverlayEnabled": "false"
"iIsPersistentText": 1,
"iTextOverlayEnabled": 0
},
{
"iPositionX": 0,
"iPositionY": 0,
"id": 4,
"sDisplayText": "test",
"sIsPersistentText": "true",
"sTextOverlayEnabled": "false"
"iIsPersistentText": 1,
"iTextOverlayEnabled": 0
},
{
"iPositionX": 0,
"iPositionY": 0,
"id": 5,
"sDisplayText": "test",
"sIsPersistentText": "true",
"sTextOverlayEnabled": "false"
"iIsPersistentText": 1,
"iTextOverlayEnabled": 0
},
{
"iPositionX": 0,
"iPositionY": 0,
"id": 6,
"sDisplayText": "test",
"sIsPersistentText": "true",
"sTextOverlayEnabled": "false"
"iIsPersistentText": 1,
"iTextOverlayEnabled": 0
},
{
"iPositionX": 0,
"iPositionY": 0,
"id": 7,
"sDisplayText": "test",
"sIsPersistentText": "true",
"sTextOverlayEnabled": "false"
"iIsPersistentText": 1,
"iTextOverlayEnabled": 0
}
],
"dataTimeOverlay": {
"dateTimeOverlay": {
"iPositionX": 0,
"iPositionY": 0,
"sDateStyle": "MM-DD-YYYY",
"sDateTimeOverlayEnabled": "false",
"sDisplayWeek": "true",
"iDateTimeOverlayEnabled": 0,
"iDisplayWeekEnabled": 1,
"sTimeStyle": "24hour"
},
"normalizedScreenSize": {
@ -370,6 +370,60 @@
"iNormalizedScreenWidth": 704
}
},
"privacy-mask": {
"privacyMask": [
{
"iMaskHeight": 100,
"iMaskWidth": 100,
"iPositionX": 0,
"iPositionY": 0,
"id": 0,
"iPrivacyMaskEnabled": 0
},
{
"iMaskHeight": 100,
"iMaskWidth": 100,
"iPositionX": 0,
"iPositionY": 0,
"id": 1,
"iPrivacyMaskEnabled": 0
},
{
"iMaskHeight": 100,
"iMaskWidth": 100,
"iPositionX": 0,
"iPositionY": 0,
"id": 2,
"iPrivacyMaskEnabled": 0
},
{
"iMaskHeight": 100,
"iMaskWidth": 100,
"iPositionX": 0,
"iPositionY": 0,
"id": 3,
"iPrivacyMaskEnabled": 0
}
],
"normalizedScreenSize": {
"iNormalizedScreenHeight": 480,
"iNormalizedScreenWidth": 704
}
},
"PicForm": {
"imageOverlay": {
"iImageHeight": 100,
"iImageWidth": 100,
"iPositionX": 0,
"iPositionY": 0,
"iImageOverlayEnabled": 1,
"iTransparentColorEnabled": 1
},
"normalizedScreenSize": {
"iNormalizedScreenHeight": 480,
"iNormalizedScreenWidth": 704
}
},
"hdd-list": [
{
"iFormatProg": 0,
@ -442,5 +496,51 @@
"iTotalVideoVolume": 2.262224,
"iVideoQuotaRatio": 50,
"id": 2
}
},
"wifi-enabled": {
"iPower": 1,
"id": 1,
"sType": "wifi"
},
"wifi-list": [
{
"Favorite": 1,
"Strength": 68,
"sName": "zxmr-24",
"sSecurity": "psk",
"sService": "wifi_8cf710c4e981_7a786d722d3234_managed_psk1",
"sState": "ready",
"sType": "wifi"
},
{
"Favorite": 0,
"Strength": 58,
"sName": "zxmr-23",
"sSecurity": "psk",
"sService": "wifi_8cf710c4e981_7a786d722d3234_managed_psk2",
"sState": "ready",
"sType": "wifi"
},
{
"Favorite": 0,
"Strength": 70,
"sName": "zxmr-22",
"sSecurity": "psk",
"sService": "wifi_8cf710c4e981_7a786d722d3234_managed_psk3",
"sState": "ready",
"sType": "wifi"
},
{
"Favorite": 0,
"Strength": 3,
"sName": "zxmr-21",
"sSecurity": "psk",
"sService": "wifi_8cf710c4e981_7a786d722d3234_managed_psk4",
"sState": "ready",
"sType": "wifi"
}
],
"scan": {},
"wifi-on": {},
"wifi-off": {}
}

2
oem/oem_ipc/www/index.html
View File

@ -10,5 +10,5 @@
<link rel="stylesheet" href="styles.712c8526a8d67c55d579.css"></head>
<body>
<app-root></app-root>
<script src="runtime-es2015.13ea55c0fc1a7ebecd69.js" type="module"></script><script src="runtime-es5.13ea55c0fc1a7ebecd69.js" nomodule defer></script><script src="polyfills-es5.78a5d69071e8056883df.js" nomodule defer></script><script src="polyfills-es2015.5b32bfe2bbeadfceb3b8.js" type="module"></script><script src="scripts.0fa9469f7a608ce712c4.js" defer></script><script src="main-es2015.36ff31fa52a874d03418.js" type="module"></script><script src="main-es5.36ff31fa52a874d03418.js" nomodule defer></script></body>
<script src="runtime-es2015.13ea55c0fc1a7ebecd69.js" type="module"></script><script src="runtime-es5.13ea55c0fc1a7ebecd69.js" nomodule defer></script><script src="polyfills-es5.78a5d69071e8056883df.js" nomodule defer></script><script src="polyfills-es2015.5b32bfe2bbeadfceb3b8.js" type="module"></script><script src="scripts.0fa9469f7a608ce712c4.js" defer></script><script src="main-es2015.184dd4a6f3e234a5f618.js" type="module"></script><script src="main-es5.184dd4a6f3e234a5f618.js" nomodule defer></script></body>
</html>

1
oem/oem_ipc/www/main-es2015.184dd4a6f3e234a5f618.js Normal file
View File

File diff suppressed because one or more lines are too long

1
oem/oem_ipc/www/main-es2015.36ff31fa52a874d03418.js
View File

File diff suppressed because one or more lines are too long

1
oem/oem_ipc/www/main-es5.184dd4a6f3e234a5f618.js Normal file
View File

File diff suppressed because one or more lines are too long

1
oem/oem_ipc/www/main-es5.36ff31fa52a874d03418.js
View File

File diff suppressed because one or more lines are too long