From 61867b0f23278af0b3b588543087db0f0a383f5f Mon Sep 17 00:00:00 2001
From: liuwu <975499773@qq.com>
Date: Fri, 10 Nov 2023 09:34:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9tmr=E8=93=9D=E7=89=99?=
 =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E6=88=90=E5=8A=9F=E5=A4=B1=E8=B4=A5notice?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=94=B6=E9=9B=86=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=88=90=E5=8A=9F=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=9C=88=E8=88=8D=E9=97=AE=E9=A2=98=E4=B8=94=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E4=B8=8D=E6=98=AFtmr=E7=9A=84=E8=93=9D=E7=89=99=EF=BC=8C?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B5=E9=9D=A2=E9=A2=84=E7=95=99=E6=89=8B?=
 =?UTF-8?q?=E5=8A=A8=E6=9B=B4=E6=96=B0=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 html/collection.html | 10 ++++------
 html/config.html     | 26 +++++++++++++++++++++++++-
 script/ble.js        |  5 ++++-
 script/index.js      | 12 +++++++-----
 4 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/html/collection.html b/html/collection.html
index eacef1a..46ca994 100644
--- a/html/collection.html
+++ b/html/collection.html
@@ -175,8 +175,8 @@
         });
     }
 
-    function handleClassClick(obj,batch,name){
-        batch = batch
+    function handleClassClick(obj,b,name){
+        batch = b
         mui.toast(name+'切换成功');
         var doms = document.getElementsByClassName('classes');
         if (doms.length > 0) {
@@ -294,8 +294,8 @@
             }
         }, function (ret, err) {
             if (ret){
-                cowshedName = '收集重量'
                 mui.toast(cowshedName+"上传成功");
+                cowshedName = '收集重量'
             }
         })
 
@@ -457,8 +457,7 @@
                 ret.peripherals.forEach(function (p) {
                     if (undefined !== p.name) {
                         console.log(p.name);
-                        // if (p.name.indexOf("TMR_BLE") === -1){
-                        if (p.name === -1){
+                        if (p.name.indexOf("TMR_BLE") === -1){
                             return false
                         }else{
                             mui.toast("已扫描到" +p.name,{duration:3500,type:'div'});
@@ -548,7 +547,6 @@
                 document.getElementById('nextCowshed').setAttribute("class", 'btnc mui-btn-success flex dis');
                 connectTimes ++;
                 console.log('主机端连接失败'+connectTimes+' '+uuid)
-                // addNotice(sbId + '主机端连接失败'+connectTimes+'次 '+uuid);
                 wifiDom.innerHTML = '连接失败';
                 api.hideProgress();
                 setTimeout(function (){
diff --git a/html/config.html b/html/config.html
index c4a3c4d..fb9418a 100644
--- a/html/config.html
+++ b/html/config.html
@@ -133,7 +133,7 @@
             </div>
         </div>
         <div class="mui-col-sm-6">
-
+<!--            <button class="flex1 mui-btn-inline mui-btn-info" style="font-size: large;color: seagreen !important;" onclick="downloadApp()">下载文件</button>-->
         </div>
     </div>
     <div class="footer flex mui-row">
@@ -195,6 +195,30 @@
         }
     }
 
+    function downloadApp(){
+        var mam = api.require('mam');
+        mam.checkUpdate(function(ret, err) {
+            if (ret) {
+                console.log(JSON.stringify(ret))
+            }
+        })
+        // api.download({
+        //     url: 'https://tmr.nxcyx.com/apk/TMRv2.0.5.apk',
+        //     savePath: 'fs://TMRv2.0.6.apk',
+        //     report: true,
+        //     cache: true,
+        //     allowResume: true
+        // }, function(ret, err) {
+        //     console.log(JSON.stringify(ret))
+        //     if (ret.state == 1) {
+                
+        //         //下载成功
+        //     } else {
+        //         console.log(JSON.stringify(err))
+        //     }
+        // });
+    }
+
     //返回主页
     function handleBackMain() {
         api.closeWin();
diff --git a/script/ble.js b/script/ble.js
index 6f1b6c2..399706f 100644
--- a/script/ble.js
+++ b/script/ble.js
@@ -131,6 +131,7 @@ function connect(param) {
             wifiDom.innerHTML = '已连接';
             connectTimes = 0;
             document.getElementById('text').innerHTML = '设备已连接';
+            addNotice(1,'#02a7f0',sbId + '主机端连接成功'+uuid);
             text = '设备已连接';
             console.log('主机端连接成功')
             ble.setMtu({
@@ -148,7 +149,9 @@ function connect(param) {
             connetcedStatus = false
             connectTimes ++;
             console.log('主机端连接失败'+connectTimes+' '+uuid)
-            addNotice(sbId + '主机端连接失败'+connectTimes+'次 '+uuid);
+            if(connectTimes%50 === 0 || connectTimes === 1){
+                addNotice(4,'red',sbId + '主机端连接失败'+connectTimes+'次 '+uuid);
+            }
             wifiDom.innerHTML = '连接失败';
             api.hideProgress();
             setTimeout(function (){
diff --git a/script/index.js b/script/index.js
index 234c527..18f3b60 100644
--- a/script/index.js
+++ b/script/index.js
@@ -196,8 +196,8 @@ function submitData() {
             }, 500);
             // },500)
         } else if (err) {
-            addNotice('submitData,' + err.msg);
-            mui.alert("submitData:" + err.msg);
+            addNotice(4,'red','submitData,' + err.msg);
+            mui.alert( err.msg);
         }
     });
 }
@@ -313,13 +313,15 @@ function uploadTotalWeight() {
 
 /**
  * 添加异常通知
+ * @param type
+ * @param color
  * @param {} describe
  */
-function addNotice(describe) {
+function addNotice(type,color,describe) {
     var param = {
         sourceCow: api.getPrefs({sync: true, key: 'sourceCow'}),
-        type: 4,
-        color: 'red',
+        type: type?type:4,
+        color: color?color:'red',
         time: currTimeFn(new Date()),
         describe: describe
     };