新建电池组

whychdw

2019-10-23 445c4b1b561a8c36c31d03de8eec9a502f5cd7ad

新建电池组

 platforms/android/app/src/main/AndroidManifest.xml

@@ -14,10 +14,7 @@
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
        </activity>

        <service android:name=".CheckExitService"
            android:enabled="true"
            android:exported="true">
        <service android:enabled="true" android:exported="true" android:name=".CheckExitService">
        </service>
    </application>
</manifest>

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

@@ -61,12 +61,12 @@
var startTestWorker = '';



// Android启动放电测试接口

function startDischargecalljs() {

function startDischargecalljs(content) {

    startTestWorker.postMessage(content);

}



// Android启动充电测试接口

function startChargecalljs() {

function startChargecalljs(content) {

    startTestWorker.postMessage(content);

}



@@ -74,12 +74,12 @@
var stopTestWorker = '';



// Android停止放电测试接口

function stopDischargecalljs() {

function stopDischargecalljs(content) {

    stopTestWorker.postMessage(content);

}



// Android停止充电测试接口

function stopChargecalljs() {

function stopChargecalljs(content) {

    stopTestWorker.postMessage(content);

}



@@ -87,11 +87,19 @@
var pauseTestWorker = '';



// Android暂停放电测试接口

function pauseDischargecalljs() {

function pauseDischargecalljs(content) {

    pauseTestWorker.postMessage(content);

}



// Android暂停充电测试接口

function pauseChargecalljs() {

function pauseChargecalljs(content) {

    pauseTestWorker.postMessage(content);

}



// 建立一个新建电池组的线程

var newBattWorker = '';



// Android新建电池组接口

function newBattcalljs(content) {

    newBattWorker.postMessage(content);

}


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

@@ -13,7 +13,8 @@
                <div class="flex-inner" style="text-align:right;">

                    <i-button 

                    type="info"

                    icon="md-add">新建</i-button>

                    icon="md-add"

                    @click="newBattPrompt()">新建</i-button>

                </div>

            </div>

        </div>


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

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

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

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

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

        var params = router.getPageParams();

        // 引入vue

        this.vm = new Vue({

@@ -27,6 +28,7 @@
                getBattNamesWorker: getBattNamesWorker,

                changeBattWorker: changeBattWorker,

                setTestParamWorker: setTestParamWorker,

                newBattWorker: newBattWorker,

                pages: {

                    name: 'activity',

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

@@ -209,6 +211,33 @@
                        bui.alert("请使用手机端登陆！");

                    }

                },

                newBattPrompt: function() {

                    var self = this;

                    bui.prompt("请输入电池组名",function(e){

                        var text = $(e.target).text();

                            if( text == "取消"){

                                this.close();

                            }else{

                                if( this.value() ){

                                    // 获取输入的值

                                    self.newBatt(this.value());

                                    this.close();

                                }else{

                                    bui.hint("名字不能为空");

                                }

                            }

                  })

                }, 
                newBatt: function(battName) {        // 新建电池组

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

                        // 显示等待框

                        this.loading.show();

                        // 与后台通信

                        JSInterface.newBatt(battName);

                    }else {

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

                    }

                },

                setTestParam: function() {

                    // 修改保存按钮的状态

                    this.saveState.isDisabled = true;

@@ -358,7 +387,7 @@
                    }

                    

                }



				
                // 切换电池参数

                this.changeBattWorker.onmessage = function(res) {

                    self.getTestParam();

@@ -375,6 +404,19 @@
                        bui.alert('修改成功！');

                    }

                }

				
                //  设置新建电池组返回结果线程

                this.newBattWorker.onmessage = function(res) {

                    // 关闭等待框

                    self.loading.hide();

                    var rs = res.data;

                    if(rs.code == 1) {

                        bui.alert('新建成功！');

                        self.getBattNames();

                    }else {

                        bui.alert('新建失败！');

                    }

                }

                // 设置高度

                //this.setTabPaneHt();

            },

@@ -384,6 +426,7 @@
                this.getBattNamesWorker.terminate();

                this.changeBattWorker.terminate();

                this.setTestParamWorker.terminate();

                this.newBattWorker.terminate();

            }

        });

    },


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

@@ -26,7 +26,7 @@
                                        <tbody>

                                            <tr>

                                                <td>组端电压：<span>{{testData.groupVol}}</span> V</td>

                                                <td>放电电流：<span>{{testData.chargeCurr}}</span> A</td>

                                                <td>测试电流：<span>{{testData.chargeCurr}}</span> A</td>

                                            </tr>

                                            <tr>

                                                <td>已测时间：<span>{{testData.chageDate}}</span></td>


 www/js/workers.js

@@ -61,12 +61,12 @@
var startTestWorker = '';



// Android启动放电测试接口

function startDischargecalljs() {

function startDischargecalljs(content) {

    startTestWorker.postMessage(content);

}



// Android启动充电测试接口

function startChargecalljs() {

function startChargecalljs(content) {

    startTestWorker.postMessage(content);

}



@@ -74,12 +74,12 @@
var stopTestWorker = '';



// Android停止放电测试接口

function stopDischargecalljs() {

function stopDischargecalljs(content) {

    stopTestWorker.postMessage(content);

}



// Android停止充电测试接口

function stopChargecalljs() {

function stopChargecalljs(content) {

    stopTestWorker.postMessage(content);

}



@@ -87,11 +87,19 @@
var pauseTestWorker = '';



// Android暂停放电测试接口

function pauseDischargecalljs() {

function pauseDischargecalljs(content) {

    pauseTestWorker.postMessage(content);

}



// Android暂停充电测试接口

function pauseChargecalljs() {

function pauseChargecalljs(content) {

    pauseTestWorker.postMessage(content);

}



// 建立一个新建电池组的线程

var newBattWorker = '';



// Android新建电池组接口

function newBattcalljs(content) {

    newBattWorker.postMessage(content);

}


 www/pages/batttest/batttest.html

@@ -13,7 +13,8 @@
                <div class="flex-inner" style="text-align:right;">

                    <i-button 

                    type="info"

                    icon="md-add">新建</i-button>

                    icon="md-add"

                    @click="newBattPrompt()">新建</i-button>

                </div>

            </div>

        </div>


 www/pages/batttest/batttest.js

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

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

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

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

        var params = router.getPageParams();

        // 引入vue

        this.vm = new Vue({

@@ -27,6 +28,7 @@
                getBattNamesWorker: getBattNamesWorker,

                changeBattWorker: changeBattWorker,

                setTestParamWorker: setTestParamWorker,

                newBattWorker: newBattWorker,

                pages: {

                    name: 'activity',

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

@@ -209,6 +211,33 @@
                        bui.alert("请使用手机端登陆！");

                    }

                },

                newBattPrompt: function() {

                    var self = this;

                    bui.prompt("请输入电池组名",function(e){

                        var text = $(e.target).text();

                            if( text == "取消"){

                                this.close();

                            }else{

                                if( this.value() ){

                                    // 获取输入的值

                                    self.newBatt(this.value());

                                    this.close();

                                }else{

                                    bui.hint("名字不能为空");

                                }

                            }

                  })

                }, 
                newBatt: function(battName) {        // 新建电池组

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

                        // 显示等待框

                        this.loading.show();

                        // 与后台通信

                        JSInterface.newBatt(battName);

                    }else {

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

                    }

                },

                setTestParam: function() {

                    // 修改保存按钮的状态

                    this.saveState.isDisabled = true;

@@ -358,7 +387,7 @@
                    }

                    

                }



				
                // 切换电池参数

                this.changeBattWorker.onmessage = function(res) {

                    self.getTestParam();

@@ -375,6 +404,19 @@
                        bui.alert('修改成功！');

                    }

                }

				
                //  设置新建电池组返回结果线程

                this.newBattWorker.onmessage = function(res) {

                    // 关闭等待框

                    self.loading.hide();

                    var rs = res.data;

                    if(rs.code == 1) {

                        bui.alert('新建成功！');

                        self.getBattNames();

                    }else {

                        bui.alert('新建失败！');

                    }

                }

                // 设置高度

                //this.setTabPaneHt();

            },

@@ -384,6 +426,7 @@
                this.getBattNamesWorker.terminate();

                this.changeBattWorker.terminate();

                this.setTestParamWorker.terminate();

                this.newBattWorker.terminate();

            }

        });

    },


 www/pages/testdata/testdata.html

@@ -26,7 +26,7 @@
                                        <tbody>

                                            <tr>

                                                <td>组端电压：<span>{{testData.groupVol}}</span> V</td>

                                                <td>放电电流：<span>{{testData.chargeCurr}}</span> A</td>

                                                <td>测试电流：<span>{{testData.chargeCurr}}</span> A</td>

                                            </tr>

                                            <tr>

                                                <td>已测时间：<span>{{testData.chageDate}}</span></td>