wui-components-v2 1.1.18 → 1.1.20

package/api/core/index.ts

@@ -19,7 +19,7 @@ interface RequestOptions {
 function request(options: RequestOptions): Promise<any> {
   const baseUrl = uni.getStorageSync('BASE_URL') || '/'
   const hydrocarbonProgramToken = uni.getStorageSync('HYDROCARBON_PROGRAM_TOKEN') || ''
-  const token = uni.getStorageSync('TOKEN') || ''
+  const token = uni.getStorageSync('TOKEN') || uni.getStorageSync('token') ||''
   const hydrocarbonClient = uni.getStorageSync('HYDROCARBON_CLIENT') || ''
   console.log('request', baseUrl + options.url, options.data)
   return new Promise((resolve, reject) => {

package/index.ts

@@ -23,7 +23,6 @@ import WuiScanBindingSensor from './components/wui-scan-binding-sensor/wui-scan-
 import WuiUser from './components/wui-user/wui-user.vue'
 import WuiAutoUpdateComponent from './components/wui-auto-update-component/wui-auto-update-component.vue'
 import iData from './utils/idata-scan'
-import nfc from './utils/nfc'
 
 // 组件列表
 const coms: Array<{ name: string }> = [
@@ -67,7 +66,7 @@ export {
   useUser,
   persistPlugin,
   iData, // PAD扫描
-  nfc, // nfc读取
+  // nfc, // nfc读取
 }
 
 export default install

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wui-components-v2",
-  "version": "1.1.18",
+  "version": "1.1.20",
   "description": "wui 组件库",
   "author": "wgxshh",
   "license": "MIT",

package/utils/idata-scan.ts

@@ -1,99 +1,99 @@
-// 注意：需要在插件市场 安装 安卓原生插件“iData条码扫描插件”,https://ext.dcloud.net.cn/plugin?id=3898#
-interface callback {
-  (scanData: any): void
-}
-let barcodeModel: { initScan: (arg0: (ret: any) => void) => void, closeScan: (arg0: (ret: any) => void) => void, scanStop: (arg0: (ret: any) => void) => void, scanStart: (arg0: (ret: any) => void) => void } | null = null
-let globalEvent: {
-  addEventListener: (arg0: string, arg1: (e: any) => void) => void
-  removeEventListener: (arg0: string) => void
-} | null = null
-
-// 初始化手持机扫码模块
-function initBarcode(callback: callback) {
-  // #ifdef APP-PLUS
-  console.log('initBarcode')
-
-  // 获取手持机扫描module
-  barcodeModel = uni.requireNativePlugin('iData-BarcodePlugin-BarcodeModule')
-
-  if (!barcodeModel) {
-    return uni.showToast({
-      icon: 'none',
-      title: '请在插件市场安装安卓原生插件“iData条码扫描插件”',
-    })
-  }
-  // 初始化
-  barcodeModel.initScan(() => {
-
-  })
-
-  // 页面监听event事件,建议在页面onLoad方法里调用
-  globalEvent = uni.requireNativePlugin('globalEvent')
-
-  if (globalEvent) {
-    globalEvent.addEventListener('iDataBarcodeEvent', (e: any) => {
-      console.log(`收到条码：${e.barcode}`)
-      // 判断是否登录
-      const token = uni.getStorageSync('token')
-      if (!token) {
-        return uni.showModal({
-          title: '提示',
-          content: '请登录，才可使用扫码功能',
-          success(res) {
-            if (res.confirm) {
-              console.log('用户点击确定')
-              uni.reLaunch({
-                url: '/pages/login/login',
-              })
-            }
-            else if (res.cancel) {
-              console.log('用户点击取消')
-            }
-          },
-        })
-      }
-      callback(e)
-    })
-  }
-
-  // #endif
-}
-function closeBarcode() {
-  // #ifdef APP-PLUS
-  // 建议在页面onExit方法里调用
-  // 接口closeScan(UniJSCallback callback)
-  // 结束扫描
-  barcodeModel?.closeScan((ret: any) => {
-    console.log(ret)
-  })
-  // #endif
-}
-
-function stopBarcode() {
-  // #ifdef APP-PLUS
-  /// 手动调用
-  // 停止扫描
-  // 接口scanStop(UniJSCallback callback)
-  globalEvent?.removeEventListener('iDataBarcodeEvent')
-  barcodeModel?.scanStop((ret) => {
-    console.log(ret)
-  })
-
-  // #endif
-}
-function startBarcode() {
-  // #ifdef APP-PLUS
-  // 手动调用
-  // 开始扫描
-  // 接口scanStop(UniJSCallback callback)
-  barcodeModel?.scanStart((ret) => {
-    console.log(ret)
-  })
-  // #endif
-}
-export default {
-  initBarcode,
-  closeBarcode,
-  stopBarcode,
-  startBarcode,
-}
+// 注意：需要在插件市场 安装 安卓原生插件“iData条码扫描插件”,https://ext.dcloud.net.cn/plugin?id=3898#
+interface callback {
+  (scanData: any): void
+}
+let barcodeModel: { initScan: (arg0: (ret: any) => void) => void, closeScan: (arg0: (ret: any) => void) => void, scanStop: (arg0: (ret: any) => void) => void, scanStart: (arg0: (ret: any) => void) => void } | null = null
+let globalEvent: {
+  addEventListener: (arg0: string, arg1: (e: any) => void) => void
+  removeEventListener: (arg0: string) => void
+} | null = null
+
+// 初始化手持机扫码模块
+function initBarcode(callback: callback) {
+  // #ifdef APP-PLUS
+  console.log('initBarcode')
+
+  // 获取手持机扫描module
+  barcodeModel = uni.requireNativePlugin('iData-BarcodePlugin-BarcodeModule')
+
+  if (!barcodeModel) {
+    return uni.showToast({
+      icon: 'none',
+      title: '请在插件市场安装安卓原生插件“iData条码扫描插件”',
+    })
+  }
+  // 初始化
+  barcodeModel.initScan(() => {
+
+  })
+
+  // 页面监听event事件,建议在页面onLoad方法里调用
+  globalEvent = uni.requireNativePlugin('globalEvent')
+
+  if (globalEvent) {
+    globalEvent.addEventListener('iDataBarcodeEvent', (e: any) => {
+      console.log(`收到条码：${e.barcode}`)
+      // 判断是否登录
+      const token = uni.getStorageSync('token')
+      if (!token) {
+        return uni.showModal({
+          title: '提示',
+          content: '请登录，才可使用扫码功能',
+          success(res) {
+            if (res.confirm) {
+              console.log('用户点击确定')
+              uni.reLaunch({
+                url: '/pages/login/login',
+              })
+            }
+            else if (res.cancel) {
+              console.log('用户点击取消')
+            }
+          },
+        })
+      }
+      callback(e)
+    })
+  }
+
+  // #endif
+}
+function closeBarcode() {
+  // #ifdef APP-PLUS
+  // 建议在页面onExit方法里调用
+  // 接口closeScan(UniJSCallback callback)
+  // 结束扫描
+  barcodeModel?.closeScan((ret: any) => {
+    console.log(ret)
+  })
+  // #endif
+}
+
+function stopBarcode() {
+  // #ifdef APP-PLUS
+  /// 手动调用
+  // 停止扫描
+  // 接口scanStop(UniJSCallback callback)
+  globalEvent?.removeEventListener('iDataBarcodeEvent')
+  barcodeModel?.scanStop((ret) => {
+    console.log(ret)
+  })
+
+  // #endif
+}
+function startBarcode() {
+  // #ifdef APP-PLUS
+  // 手动调用
+  // 开始扫描
+  // 接口scanStop(UniJSCallback callback)
+  barcodeModel?.scanStart((ret) => {
+    console.log(ret)
+  })
+  // #endif
+}
+export default {
+  initBarcode,
+  closeBarcode,
+  stopBarcode,
+  startBarcode,
+}

package/utils/nfc.js

@@ -1,285 +0,0 @@
-import { changeLanguageConmon } from '../Locale'
-
-let NfcAdapter
-let NdefRecord
-let NdefMessage
-let _getCardNo
-
-export default {
-  initNFC() {
-    if (uni.getSystemInfoSync().platform == 'android') {
-      listenNFCStatus()
-    }
-  },
-  readNFC(callback) {
-    if (uni.getSystemInfoSync().platform == 'android') {
-      readData(callback)
-    }
-  },
-  closeNFC() {
-    if (uni.getSystemInfoSync().platform == 'android') {
-      closeReadAndWrite()
-    }
-  },
-}
-
-function listenNFCStatus() {
-  try {
-    const main = plus.android.runtimeMainActivity()
-    const Intent = plus.android.importClass('android.content.Intent')
-    const Activity = plus.android.importClass('android.app.Activity')
-    const PendingIntent = plus.android.importClass('android.app.PendingIntent')
-    const IntentFilter = plus.android.importClass('android.content.IntentFilter')
-    NfcAdapter = plus.android.importClass('android.nfc.NfcAdapter')
-    const nfcAdapter = NfcAdapter.getDefaultAdapter(main)
-
-    if (nfcAdapter == null) {
-      uni.showToast({
-        title: changeLanguageConmon('设备不支持NFC！'),
-        icon: 'none',
-      })
-      return
-    }
-
-    if (!nfcAdapter.isEnabled()) {
-      uni.showToast({
-        title: changeLanguageConmon('请在系统设置中先启用NFC功能！'),
-        icon: 'none',
-      })
-      return
-    }
-
-    const intent = new Intent(main, main.getClass())
-    intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)
-    const pendingIntent = PendingIntent.getActivity(main, 0, intent, 0)
-    const ndef = new IntentFilter('android.nfc.action.TECH_DISCOVERED')
-    ndef.addDataType('*/*')
-    const intentFiltersArray = [ndef]
-    const techListsArray = [
-      ['android.nfc.tech.IsoDep'],
-      ['android.nfc.tech.NfcA'],
-      ['android.nfc.tech.NfcB'],
-      ['android.nfc.tech.NfcF'],
-      ['android.nfc.tech.Nfcf'],
-      ['android.nfc.tech.NfcV'],
-      ['android.nfc.tech.NdefFormatable'],
-      ['android.nfc.tech.MifareClassic'],
-      ['android.nfc.tech.MifareUltralight'],
-    ]
-    plus.globalEvent.addEventListener('newintent', () => {
-      setTimeout(handle_nfc_data1, 1000)
-    }, false)
-    plus.globalEvent.addEventListener('pause', (e) => {
-      if (nfcAdapter) {
-        nfcAdapter.disableForegroundDispatch(main)
-      }
-    }, false)
-    plus.globalEvent.addEventListener('resume', (e) => {
-      if (nfcAdapter) {
-        // console.log('resume');
-        nfcAdapter.enableForegroundDispatch(main, pendingIntent, intentFiltersArray, techListsArray)
-      }
-    }, false)
-    nfcAdapter.enableForegroundDispatch(main, pendingIntent, intentFiltersArray, techListsArray)
-  }
-  catch (e) {
-    console.error(e)
-  }
-}
-
-function handle_nfc_data1() {
-  NdefRecord = plus.android.importClass('android.nfc.NdefRecord')
-  NdefMessage = plus.android.importClass('android.nfc.NdefMessage')
-  const main = plus.android.runtimeMainActivity()
-  const intent = main.getIntent()
-  // console.log("action type:" + intent.getAction());
-  if (intent.getAction() == 'android.nfc.action.TECH_DISCOVERED') {
-    if (readyWriteData) {
-      // __write(intent);
-      readyWriteData = false
-    }
-    else if (readyRead) {
-      __read(intent)
-      readyRead = false
-    }
-  }
-}
-
-function showToast(msg) {
-  plus.nativeUI.toast(msg)
-}
-
-// function __write(intent) {
-//  try {
-//      waiting.setTitle('请勿移开标签\n正在写入...');
-//      var text = document.getElementById('text').value;
-//      console.log("text=" + text);
-//      var textBytes = plus.android.invoke(text, "getBytes");
-//      var textRecord = new NdefRecord(NdefRecord.TNF_MIME_MEDIA,
-//          plus.android.invoke("text/plain", "getBytes"), plus.android.invoke("", "getBytes"), textBytes);
-//      var message = new NdefMessage([textRecord]);
-//      var Ndef = plus.android.importClass('android.nfc.tech.Ndef');
-//      var NdefFormatable = plus.android.importClass('android.nfc.tech.NdefFormatable');
-//      var tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG);
-//      var ndef = Ndef.get(tag);
-//      if (ndef != null) {
-//          var size = message.toByteArray().length;
-//          console.log("size=" + size);
-//          ndef.connect();
-//          if (!ndef.isWritable()) {
-//              showToast("tag不允许写入");
-//              waiting.close();
-//              return;
-//          }
-//          if (ndef.getMaxSize() < size) {
-//              showToast("文件大小超出容量");
-//              waiting.close();
-//              return;
-//          }
-
-//          ndef.writeNdefMessage(message);
-//          waiting.close();
-//          showToast("写入数据成功.");
-//          return;
-//      } else {
-//          var format = NdefFormatable.get(tag);
-//          if (format != null) {
-//              try {
-//                  format.connect();
-//                  format.format(message);
-//                  showToast("格式化tag并且写入message");
-//                  waiting.close();
-//                  return;
-//              } catch (e) {
-//                  showToast("格式化tag失败.");
-//                  waiting.close();
-//                  return;
-//              }
-//          } else {
-//              showToast("Tag不支持NDEF");
-//              waiting.close();
-//              return;
-//          }
-//      }
-//  } catch (e) {
-//      console.log("error=" + e);
-//      waiting.close();
-//      alert('写入失败');
-//  }
-
-// }
-
-function __read(intent) {
-  try {
-    const content = ''
-    waiting.setTitle(`${changeLanguageConmon('请勿移开卡')}\n${changeLanguageConmon('正在读取数据')}...`)
-    let tag = plus.android.importClass('android.nfc.Tag')
-    tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG)
-    const bytesId = intent.getByteArrayExtra(NfcAdapter.EXTRA_ID)
-    waiting.close()
-    const tagid = bytesToDecimalString(tag.getId())
-    if (typeof _getCardNo === 'function') {
-      _getCardNo(tagid)
-    }
-  }
-  catch (e) {
-    uni.showToast({
-      title: e,
-      icon: 'none',
-    })
-  }
-}
-
-// function bytesToHexString(inarray) {
-//     var i, j, x;
-//     var hex = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A",
-//         "B", "C", "D", "E", "F"
-//     ];
-//     var out = "";
-//     for (j = 0; j < inarray.length; ++j) {
-//         x = parseInt(inarray[j]) & 0xff;
-//         i = (x >> 4) & 0x0f;
-//         out += hex[i];
-//         i = x & 0x0f;
-//         out += hex[i];
-//     }
-//     return out;
-// }
-// function bytesToDecimalString(inarray) {
-//     let result = BigInt(0);
-//     // 反转数组以适配大端序
-//     const reversed = [...inarray].reverse();
-//     for (let j = 0; j < reversed.length; j++) {
-//         const byte = BigInt(parseInt(reversed[j])) & BigInt(0xff);
-//         result = (result << BigInt(8)) | byte;
-//     }
-//     return result.toString();
-// }
-
-function bytesToDecimalString(inarray) {
-  let result = BigInt(0)
-
-  // 反转数组以适配大端序
-  const reversed = [...inarray].reverse()
-  for (let j = 0; j < reversed.length; j++) {
-    const byte = BigInt(Number.parseInt(reversed[j])) & BigInt(0xFF)
-    result = (result << BigInt(8)) | byte
-  }
-  return result.toString().padStart(10, '0')
-}
-
-function reverseTwo(str) {
-  let str1 = ''
-  for (var i = 1; i <= str.length; i++) {
-    str1 += str[i - 1]
-    if (i % 2 == 0) {
-      if (i == str.length) {
-        break
-      }
-      str1 += ':'
-    }
-  }
-  let str2 = ''
-  for (var i = str1.split(':').length - 1; i >= 0; i--) {
-    str2 += str1.split(':')[i]
-  }
-  return str2
-}
-
-if (uni.getSystemInfoSync().platform == 'android') {
-  // plus.globalEvent.addEventListener('plusready', listenNFCStatus, false);
-}
-
-let waiting
-var readyWriteData = false
-var readyRead = false
-
-function writeData() {
-  const textEle = plus.globalEvent.getElementById('text')
-  if (!textEle.value) {
-    uni.showToast({
-      title: '请输入要写入的内容！',
-      icon: 'none',
-    })
-    return
-  }
-  readyWriteData = true
-  waiting = plus.nativeUI.showWaiting(changeLanguageConmon('请将卡靠近！'))
-}
-
-function readData(getCardNo) {
-  readyRead = true
-  _getCardNo = getCardNo
-  waiting = plus.nativeUI.showWaiting(changeLanguageConmon('请将卡靠近！'), {
-    modal: false,
-  })
-}
-
-function closeReadAndWrite() {
-  readyWriteData = false
-  readyRead = false
-
-  if (waiting) {
-    waiting.close()
-  }
-}