diff --git a/manifest.json b/manifest.json index fffcc39..535a253 100644 --- a/manifest.json +++ b/manifest.json @@ -1,9 +1,9 @@ { "name" : "海驰24", - "appid" : "__UNI__F1AF57E", + "appid" : "__UNI__7302921", "description" : "111", - "versionName" : "1.2.0", - "versionCode" : "100", + "versionName" : "1.2.1", + "versionCode" : 102, "transformPx" : false, "app-plus" : { "usingComponents" : true, @@ -20,6 +20,7 @@ }, "distribute" : { "android" : { + "minSdkVersion" : 21, "permissions" : [ "", "", @@ -35,7 +36,7 @@ "", "" ], - "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ] + "abiFilters" : [ "armeabi-v7a" ] }, "ios" : { "dSYMs" : false, @@ -45,6 +46,22 @@ } }, "sdkConfigs" : {} + }, + "nativePlugins" : { + "ry-ipc-video" : { + "__plugin_info__" : { + "name" : "ry-ipc-video", + "description" : "IPC 监控视频组件插件", + "platforms" : "Android", + "url" : "", + "android_package_name" : "", + "ios_bundle_id" : "", + "isCloud" : false, + "bought" : -1, + "pid" : "", + "parameters" : {} + } + } } }, "quickapp" : {}, diff --git a/nativeplugins/ry-ipc-video/android/ipc-video-plugin-release.aar b/nativeplugins/ry-ipc-video/android/ipc-video-plugin-release.aar new file mode 100644 index 0000000..f1f486c Binary files /dev/null and b/nativeplugins/ry-ipc-video/android/ipc-video-plugin-release.aar differ diff --git a/nativeplugins/ry-ipc-video/android/libs/p2plibrary-release.aar b/nativeplugins/ry-ipc-video/android/libs/p2plibrary-release.aar new file mode 100644 index 0000000..750ddfc Binary files /dev/null and b/nativeplugins/ry-ipc-video/android/libs/p2plibrary-release.aar differ diff --git a/nativeplugins/ry-ipc-video/android/p2plibrary-release.aar b/nativeplugins/ry-ipc-video/android/p2plibrary-release.aar new file mode 100644 index 0000000..750ddfc Binary files /dev/null and b/nativeplugins/ry-ipc-video/android/p2plibrary-release.aar differ diff --git a/nativeplugins/ry-ipc-video/package.json b/nativeplugins/ry-ipc-video/package.json new file mode 100644 index 0000000..7e18d03 --- /dev/null +++ b/nativeplugins/ry-ipc-video/package.json @@ -0,0 +1,23 @@ +{ + "name": "ry-ipc-video", + "id": "ry-ipc-video", + "version": "1.0.0", + "description": "IPC 监控视频组件插件", + "_dp_type": "nativeplugin", + "_dp_nativeplugin": { + "android": { + "plugins": [ + { + "type": "component", + "name": "ry-ipc-video", + "class": "com.ry.ipcplugin.IpcVideoComponent" + } + ], + "integrateType": "aar", + "minSdkVersion": "21", + "permissions": [ + "android.permission.CHANGE_WIFI_MULTICAST_STATE" + ] + } + } +} diff --git a/package_a/monitor/monitor.nvue b/package_a/monitor/monitor.nvue new file mode 100644 index 0000000..e9ce448 --- /dev/null +++ b/package_a/monitor/monitor.nvue @@ -0,0 +1,184 @@ + + + + + \ No newline at end of file diff --git a/pages.json b/pages.json index 0f59058..9b56139 100644 --- a/pages.json +++ b/pages.json @@ -56,7 +56,18 @@ { "path": "mine/about/index", "style": { "navigationBarTitleText": "关于我们" } }, { "path": "mine/pwd/index", "style": { "navigationBarTitleText": "修改密码" } }, { "path": "common/webview/index", "style": { "navigationBarTitleText": "浏览网页" } }, - { "path": "common/textview/index", "style": { "navigationBarTitleText": "浏览文本" } } + { + "path": "common/textview/index", + "style": { + "navigationBarTitleText": "浏览文本" + } + }, + { + "path": "monitor/monitor", + "style": { + "navigationBarTitleText": "" + } + } ] } ], diff --git a/pages/index.vue b/pages/index.vue index b6ed29c..47ccd82 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -173,7 +173,7 @@ - + 实时监控 @@ -356,6 +356,20 @@ export default { url: '/package_a/product/product' }) }, + goToMonitor(){ + // #ifdef MP + uni.showToast({ + title: '小程序暂不支持查看监控请使用app', + icon: 'none' + }) + // #endif + + // #ifndef MP + uni.navigateTo({ + url: '/package_a/monitor/monitor' + }) + // #endif + }, goToAsset() { uni.navigateTo({ url: '/package_a/asset/asset'