对接c07/c10

App.vue

@@ -3,10 +3,6 @@
 		mapState
 	} from "vuex";
 	export default {
-		onTabItemClick(itemPath) {
-			// 例如，你可以在这里添加一个确认对话框
-			console.log("itemPath", itemPath)
-		},
 		computed: {
 			...mapState(["bleValue"]),
 		},
@@ -17,6 +13,8 @@
 			console.log('App Show')
 		},
 		onHide: function() {
+			// this.$ble.closeBLEConnection(this.bleValue.deviceId)
+			// this.$ble.closeBluetoothAdapter()
 			console.log('App Hide')
 		},
 		methods: {}

components/bluetooth_food.vue

@@ -129,7 +129,8 @@
 					unit: "g",
 					type: 1,
 					unitList: that.$json.unitMinus,
-					countWeight: "",
+					countWeight: 0,
+					oldCountWeight: 0,
 					bleTipsText: "蓝牙搜索中",
 					isConnectStatus: 0,
 				})

pageTwo/me/menudetail.vue

@@ -108,7 +108,7 @@
 							</view>
 							<view class="kcal" v-else>
 								<view class="num" v-if="ite.newweight">
-									{{ite.newweight}}{{ite.newunit=="oz"?'盎司':'克'}}
+									{{ite.newweight}}{{ite.newunit}}
 								</view>
 								<view class="num" v-if="ite.newkcal">
 									{{ite.newkcal}}
@@ -292,7 +292,7 @@
 							meals_type: that.foodItem[that.selectSaveType].name,
 							id: that.info.tags[0].list[i].id,
 							weight: that.info.tags[0].list[i].newweight,
-							unit: that.info.tags[0].list[i].newunit == '克' ? '克' : '盎司'
+							unit: that.info.tags[0].list[i].newunit
 						})
 					}
 				}

pages/index/index.vue

@@ -180,7 +180,12 @@
 			that.token = uni.getStorageSync('token')
 			that.$store.dispatch("getHomeConfig")
 			if (that.token) {
-				that.$ble.openBluetoothAdapter()
+				console.log("首页搜索蓝牙",that.bleValue)
+				that.$ble.closeBLEConnection(that.bleValue.deviceId)
+				that.$ble.closeBluetoothAdapter()
+				setTimeout(function() {
+					that.$ble.openBluetoothAdapter()
+				}, 500);
 			}
 			that.$ble.onBLEConnectionStateChange()
 			uni.onBluetoothAdapterStateChange(function(res) {
@@ -220,6 +225,7 @@
 				})
 			},
 			startWatching() {
+				console.log("99999999",this.bleValue)
 				this.unwatch = this.$watch('bleValue', (newVal, oldVal) => {
 					// 这里可以执行你的业务逻辑
 					if (newVal.serviceId != '' && newVal.oldCountWeight != newVal.countWeight) {

store/index.js

@@ -41,7 +41,14 @@ export default new Vuex.Store({
 			},
 			cookbook_label: [],
 			activity_level: [],
-			default_count_foot: {},
+			default_count_foot: {
+				date: "",
+				list: [],
+				details: {},
+				nutrients_four: [],
+				remaining_kcal: "",
+				trace_elements_all_day: []
+			},
 			business_cooperation: {}
 		},
 		// 计食器

tools/bluetooth.js

@@ -71,6 +71,10 @@ function onBluetoothDeviceFound() {
 			if (device.name.toLowerCase().indexOf('pc-c06pro') != -1 ||
 				device.name.toLowerCase().indexOf('pc-c02pro') != -1 ||
 				device.name.toLowerCase().indexOf('pc-c09pro') != -1 ||
+				device.name.toLowerCase().indexOf('pc-c10pro') != -1 ||
+				device.name.toLowerCase().indexOf('pc-c07pro') != -1 ||
+				(device.localName && device.localName.toLowerCase().indexOf('pc-c07pro') != -1) ||
+				(device.localName && device.localName.toLowerCase().indexOf('pc-c10pro') != -1) ||
 				(device.localName && device.localName.toLowerCase().indexOf('pc-c06pro') != -1) ||
 				(device.localName && device.localName.toLowerCase().indexOf('pc-c02pro') != -1) ||
 				(device.localName && device.localName.toLowerCase().indexOf('pc-c09pro') != -1)) {
@@ -209,7 +213,8 @@ function getBLECharacteristicValueChange(deviceId, serviceId, notify, write) {
 				write: write,
 				unit: "g",
 				type: 1,
-				countWeight: "",
+				countWeight: 0,
+				oldCountWeight: 0,
 				bleTipsText: "测量中，请将食物放到秤上",
 				isConnectStatus: 2
 			})
@@ -324,7 +329,8 @@ function closeBluetoothAdapter() {
 				notify: "",
 				write: "",
 				unit: "g",
-				countWeight: '',
+				countWeight: 0,
+				oldCountWeight: 0,
 				type: 1,
 				unitList: $data.unitMinus,
 				isConnectStatus: 1,

unpackage/dist/dev/mp-weixin/common/main.js

@@ -125,10 +125,6 @@ var _vuex = __webpack_require__(/*! vuex */ 30);
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var _default = {
-  onTabItemClick: function onTabItemClick(itemPath) {
-    // 例如，你可以在这里添加一个确认对话框
-    console.log("itemPath", itemPath);
-  },
   computed: _objectSpread({}, (0, _vuex.mapState)(["bleValue"])),
   onLaunch: function onLaunch() {
     console.log('App Launch');
@@ -137,6 +133,8 @@ var _default = {
     console.log('App Show');
   },
   onHide: function onHide() {
+    // this.$ble.closeBLEConnection(this.bleValue.deviceId)
+    // this.$ble.closeBluetoothAdapter()
     console.log('App Hide');
   },
   methods: {}

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -28073,7 +28073,14 @@ var _default = new _vuex.default.Store({
       },
       cookbook_label: [],
       activity_level: [],
-      default_count_foot: {},
+      default_count_foot: {
+        date: "",
+        list: [],
+        details: {},
+        nutrients_four: [],
+        remaining_kcal: "",
+        trace_elements_all_day: []
+      },
       business_cooperation: {}
     },
     // 计食器
@@ -29195,7 +29202,7 @@ function onBluetoothDeviceFound() {
       if (!device.name && !device.localName) {
         return;
       }
-      if (device.name.toLowerCase().indexOf('pc-c06pro') != -1 || device.name.toLowerCase().indexOf('pc-c02pro') != -1 || device.name.toLowerCase().indexOf('pc-c09pro') != -1 || device.localName && device.localName.toLowerCase().indexOf('pc-c06pro') != -1 || device.localName && device.localName.toLowerCase().indexOf('pc-c02pro') != -1 || device.localName && device.localName.toLowerCase().indexOf('pc-c09pro') != -1) {
+      if (device.name.toLowerCase().indexOf('pc-c06pro') != -1 || device.name.toLowerCase().indexOf('pc-c02pro') != -1 || device.name.toLowerCase().indexOf('pc-c09pro') != -1 || device.name.toLowerCase().indexOf('pc-c10pro') != -1 || device.name.toLowerCase().indexOf('pc-c07pro') != -1 || device.localName && device.localName.toLowerCase().indexOf('pc-c07pro') != -1 || device.localName && device.localName.toLowerCase().indexOf('pc-c10pro') != -1 || device.localName && device.localName.toLowerCase().indexOf('pc-c06pro') != -1 || device.localName && device.localName.toLowerCase().indexOf('pc-c02pro') != -1 || device.localName && device.localName.toLowerCase().indexOf('pc-c09pro') != -1) {
         clearTimeout(searchTimer);
         var bytes = new Uint8Array(device.advertisData);
         var macBytes = bytes.slice(6, 12);
@@ -29330,7 +29337,8 @@ function getBLECharacteristicValueChange(deviceId, serviceId, notify, write) {
         write: write,
         unit: "g",
         type: 1,
-        countWeight: "",
+        countWeight: 0,
+        oldCountWeight: 0,
         bleTipsText: "测量中，请将食物放到秤上",
         isConnectStatus: 2
       });
@@ -29430,7 +29438,8 @@ function closeBluetoothAdapter() {
         notify: "",
         write: "",
         unit: "g",
-        countWeight: '',
+        countWeight: 0,
+        oldCountWeight: 0,
         type: 1,
         unitList: _content.default.unitMinus,
         isConnectStatus: 1,

unpackage/dist/dev/mp-weixin/components/bluetooth_food.js

@@ -243,7 +243,8 @@ var _default = {
         unit: "g",
         type: 1,
         unitList: that.$json.unitMinus,
-        countWeight: "",
+        countWeight: 0,
+        oldCountWeight: 0,
         bleTipsText: "蓝牙搜索中",
         isConnectStatus: 0
       });

unpackage/dist/dev/mp-weixin/pageTwo/me/menudetail.js

@@ -335,7 +335,7 @@ var _default = {
             meals_type: that.foodItem[that.selectSaveType].name,
             id: that.info.tags[0].list[i].id,
             weight: that.info.tags[0].list[i].newweight,
-            unit: that.info.tags[0].list[i].newunit == '克' ? '克' : '盎司'
+            unit: that.info.tags[0].list[i].newunit
           });
         }
       }

unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -222,7 +222,12 @@ var _default = {
     that.token = uni.getStorageSync('token');
     that.$store.dispatch("getHomeConfig");
     if (that.token) {
-      that.$ble.openBluetoothAdapter();
+      console.log("首页搜索蓝牙", that.bleValue);
+      that.$ble.closeBLEConnection(that.bleValue.deviceId);
+      that.$ble.closeBluetoothAdapter();
+      setTimeout(function () {
+        that.$ble.openBluetoothAdapter();
+      }, 500);
     }
     that.$ble.onBLEConnectionStateChange();
     uni.onBluetoothAdapterStateChange(function (res) {
@@ -259,6 +264,7 @@ var _default = {
       });
     },
     startWatching: function startWatching() {
+      console.log("99999999", this.bleValue);
       this.unwatch = this.$watch('bleValue', function (newVal, oldVal) {
         // 这里可以执行你的业务逻辑
         if (newVal.serviceId != '' && newVal.oldCountWeight != newVal.countWeight) {