pad分支安卓函数调用

package.json

@@ -18,6 +18,7 @@
     "axios": "0.18.1",
     "bpmn-js": "^6.1.1",
     "bpmn-js-properties-panel": "^0.33.1",
+    "dsbridge": "^3.1.3",
     "echarts": "^5.3.2",
     "element-resize-detector": "^1.2.4",
     "element-ui": "2.13.0",

src/main.js

@@ -29,7 +29,7 @@ import permission from './directive/permission'
 import '@/icons' // icon
 import '@/assets/icons' // icon
 import '@/permission' // permission control
-
+import { WebView } from '@/utils/WebViewContact'
 /**
  * If you don't want to use mock-server
  * you want to use MockJs for mock api
@@ -59,6 +59,7 @@ Viewer.setDefaults({
 })
 
 // 全局方法挂载
+Vue.prototype.$WebView = WebView
 Vue.prototype.getDict = getDict
 Vue.prototype.getConfigKey = getConfigKey
 Vue.prototype.parseTime = parseTime

src/utils/WebViewContact.js

+const DS_BRIDGE = require('dsbridge')
+
+// 拍照
+export const openCamera = (params) => {
+  return new Promise(resolve => {
+    DS_BRIDGE.call('openCamera', params, res => {
+      resolve(res)
+    })
+  })
+}
+// 拍照取相册 实现调用存储功能(带相册,文件资源功能)
+export const openCameraStorage = (params) => {
+  return new Promise(resolve => {
+    DS_BRIDGE.call('openCameraStorage', params, res => {
+      resolve(res)
+    })
+  })
+}
+// 全部实现功能(带相机,相册,文件资源功能)
+export const openCameraAll = (params) => {
+  return new Promise(resolve => {
+    DS_BRIDGE.call('openCameraAll', params, res => {
+      resolve(res)
+    })
+  })
+}
+// 扫码
+export const openScan = (params) => {
+  return new Promise(resolve => {
+    DS_BRIDGE.call('openScan', params, res => {
+      resolve(res)
+    })
+  })
+}
+
+export const WebView = {
+  openCamera,
+  openCameraStorage,
+  openCameraAll,
+  openScan
+}

src/views/login/login.vue

 <template>
   <div class="login">
-    <el-form ref="loginForm" v-loading="vLoading" :model="loginForm" :rules="rules" class="login-form">
+<!--    v-loading="vLoading"-->
+    <el-form ref="loginForm"  :model="loginForm" :rules="rules" class="login-form">
       <!--      <img class="fy-logo" src="../../assets/image/denglu_logo.png">-->
       <div class="login_logoRow">
 <!--         图片大小不能随分辨率变化而变化，所以要写行内样式-->

src/views/setup/index.vue

+<template>
+  <div class="setup_module">
+    <!--    <div class="button_row">-->
+    <div class="button_row">
+      <el-button type="primary" @click="handleOpenScan">扫码</el-button>
+    </div>
+    <div class="button_row">
+      <el-button type="primary" @click="handleTakePhotos">拍照1</el-button>
+      <span>实现拍照功能(直接调照相机)</span>
+    </div>
+    <div class="button_row">
+      <el-button type="primary" @click="handleTakePhotosAlbum">拍照2</el-button>
+      <span>实现调用存储功能(带相册,文件资源功能)</span>
+    </div>
+    <div class="button_row">
+      <el-button type="primary" @click="handlePpenCameraAll">拍照3</el-button>
+      <span>全部实现功能(带相机,相册,文件资源功能)</span>
+    </div>
+    <!--    </div>-->
+    <!--    <div class="button_row">-->
+    <!--      <el-button type="primary" @click="handleOutbound">出库</el-button>-->
+    <!--      <el-button type="primary">入库</el-button>-->
+    <!--    </div>-->
+    <div>扫码获取:</div>
+    <div>{{ scanCode }}</div>
+    <div style="margin-top: 50px">拍照获取:</div>
+    <div><img style="width: 200px;height: 200px" :src="imgUrlForm.url" class="sidebar-logo"></div>
+  </div>
+</template>
+
+<script>
+import { getToken } from '@/utils/auth'
+import { openCameraAll, openCameraStorage } from '@/utils/WebViewContact'
+export default {
+  name: 'Index',
+  data() {
+    return {
+      scanCode: '',
+      imgUrlForm: {
+
+      }
+    }
+  },
+  created() {
+  },
+  methods: {
+    handleOpenScan() {
+      const params = {
+        flag: 'openScan'
+      }
+      this.$WebView.openScan(params).then(res => {
+        this.scanCode = res
+        console.log('提交后结果', res)
+      })
+    },
+    /** 拍照按钮*/
+    handleTakePhotos() {
+      console.log('调用前', getToken())
+      const params = {
+        flag: 'openCamera',
+        tokenMsg: getToken()
+      }
+      this.$WebView.openCamera(params).then(res => {
+        console.log('11111', res)
+        console.log('22222', JSON.parse(res))
+        this.imgUrlForm = JSON.parse(res)
+      })
+    },
+    /** 拍照取相册按钮*/
+    handleTakePhotosAlbum() {
+      const params = {
+        tokenMsg: getToken()
+      }
+      this.$WebView.openCameraStorage(params).then(res => {
+        console.log('拍照2', res)
+        this.imgUrlForm = JSON.parse(res)
+      })
+    },
+    /** 全部实现功能(带相机,相册,文件资源功能)*/
+    handlePpenCameraAll() {
+      const params = {
+        tokenMsg: getToken()
+      }
+      this.$WebView.openCameraAll(params).then(res => {
+        this.imgUrlForm = JSON.parse(res)
+      })
+    },
+    handleOutbound() {
+      this.$router.push({
+        path: '/setup/outbound'
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.setup_module{
+  padding: 20px;
+  .button_row{
+    margin: 20px;
+  }
+}
+</style>

vue.config.js

@@ -93,7 +93,7 @@ module.exports = {
         // target: `http://117.122.212.91:32012/`,
         // target: `http://192.168.1.31:8082/`,
         // target: `http://192.168.1.12:8082/`, // 孙浩
-        target: `http://192.168.1.14:8082/`, // 张宇
+        target: `http://49.232.167.247:20014/`,
         // target: `http://192.168.1.30:8082/`,
         // changeOrigin: true,
         pathRewrite: {