线程修改

whychdw

2019-10-21 54600370180eaf287e2f03d5d1c6f6b92dcaaa30

线程修改

 platforms/android/app/src/main/assets/www/js/workers.js

@@ -43,3 +43,10 @@
function changeBattcalljs(content) {

    changeBattWorker.postMessage(content);

}



// 建立一个设置电池参数的Worker线程

var setTestParamWorker = '';



function setTestParamcalljs(content) {

    setTestParamWorker.postMessage(content);

}


 platforms/android/app/src/main/assets/www/pages/batttest/batttest.html

@@ -123,7 +123,7 @@
                                    placeholder="请输入预放时间">

                                </div>

                            </div>

                            <div class="span1">H:M</div>

                            <div class="span1">分钟</div>

                        </li>

                        <li class="bui-btn bui-box clearactive">

                            <label class="bui-label">组端下限：</label>

@@ -257,7 +257,7 @@
                                    placeholder="请输入均充时长">

                                </div>

                            </div>

                            <div class="span1">H:M</div>

                            <div class="span1">分钟</div>

                        </li>

                        <li class="bui-btn bui-box clearactive">

                            <label class="bui-label">浮充时长：</label>

@@ -270,7 +270,7 @@
                                    placeholder="请输入浮充时长">

                                </div>

                            </div>

                            <div class="span1">H:M</div>

                            <div class="span1">分钟</div>

                        </li>

                    </ul>

                </tab-pane>

@@ -333,7 +333,9 @@
                <i-button 

                type="info" 

                icon="ios-lock" 

                :disabled="saveState.isDisabled">保存</i-button>

                :disabled="saveState.isDisabled"

                @click="setTestParam()">保存</i-button>

                <i-button type="info" @click="getTestParam(true)">读取参数</i-button>

                <i-button type="info" @click="routerTo">进入测试</i-button>

            </div>

        </footer>


 platforms/android/app/src/main/assets/www/pages/batttest/batttest.js

@@ -14,6 +14,7 @@
        getTestParamWorker = new Worker('worker/data.worker.js');

        getBattNamesWorker = new Worker('worker/data.worker.js');

        changeBattWorker = new Worker('worker/data.worker.js');

        setTestParamWorker = new Worker('worker/data.worker.js');

        var params = router.getPageParams();

        // 引入vue

        this.vm = new Vue({

@@ -25,6 +26,7 @@
                getTestParamWorker: getTestParamWorker,

                getBattNamesWorker: getBattNamesWorker,

                changeBattWorker: changeBattWorker,

                setTestParamWorker: setTestParamWorker,

                pages: {

                    name: 'activity',

                    title: '活化测试->参数',

@@ -142,11 +144,16 @@
                        }

                    });

                },

                getTestParam: function() {

                getTestParam: function(loading) {

                    // 判断是否获取等待框

                    if(loading) {

                        // 显示等待框

                        this.loading.show();

                    }

                    // 修改保存按钮的状态

                    this.saveState.isNew = true;

                    this.saveState.isDisabled = true;

                    if(typeof(JSInterface) != 'undefined') {

                        // 修改保存按钮的状态

                        this.saveState.isNew = true;

                        this.saveState.isDisabled = true;

                        JSInterface.getTestParam();

                    }else {

                        // bui.alert('请使用手机端登陆！');

@@ -183,6 +190,18 @@
                        // 与后台通信

                        JSInterface.changeBatt(battName);

                    }else {

                        bui.alert("请使用手机端登陆！");

                    }

                },

                setTestParam: function() {

                    var testParam = this.testParams;

                    if(typeof(JSInterface) != 'undefined') {

                        var json = JSON.stringify(testParam);

                        // 显示等待框

                        this.loading.show();

                        // 与后台通信

                        JSInterface.setTestParam(json);

                    }else {

                        bui.alert("请使用手机端登陆！");

                    }

                },

@@ -289,6 +308,18 @@
                this.changeBattWorker.onmessage = function(res) {

                    self.getTestParam();

                }

				
                // 设置电池参数返回结果监控

                this.setTestParamWorker.onmessage = function(res) {

                    // 关闭等待框

                    self.loading.hide();

                    var rs = res.data;

                    if(rs.code == 1) {

                        bui.alert('修改成功！');

                    }else {

                        bui.alert('修改成功！');

                    }

                }

                // 设置高度

                //this.setTabPaneHt();

            },

@@ -297,6 +328,7 @@
                this.getTestParamWorker.terminate();

                this.getBattNamesWorker.terminate();

                this.changeBattWorker.terminate();

                this.setTestParamWorker.terminate();

            }

        });

    },