hybirdApp.git - Gitblit

parent: 113706b3 | 补丁 | 提交 | ignore whitespace

Merge branch 'hybird' of http://118.89.139.230:10101/r/hybirdApp into hybird

whyclj

2019-10-24 5ea995b9e94d3a8afd9c0affc48e7a5b00a93ee2

Merge branch 'hybird' of http://118.89.139.230:10101/r/hybirdApp into hybird

8个文件已修改

	platforms/android/app/src/main/assets/www/js/workers.js	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	platforms/android/app/src/main/assets/www/pages/batttest/batttest.js	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	platforms/android/app/src/main/assets/www/pages/testdata/testdata.html	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	platforms/android/app/src/main/assets/www/pages/testdata/testdata.js	77 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	www/js/workers.js	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	www/pages/batttest/batttest.js	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	www/pages/testdata/testdata.html	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	www/pages/testdata/testdata.js	77 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

@@ -70,6 +70,11 @@
    startTestWorker.postMessage(content);

}



// Android启动活化测试接口

function startHHTestcalljs(content) {

    startTestWorker.postMessage(content);

}



// 建立一个停止测试的线程

var stopTestWorker = '';



@@ -83,6 +88,11 @@
    stopTestWorker.postMessage(content);

}



// Android停止活化测试的接口

function stopHHTestcalljs(content) {

    stopTestWorker.postMessage(content);

}



// 建立一个暂停测试的线程

var pauseTestWorker = '';



@@ -96,6 +106,11 @@
    pauseTestWorker.postMessage(content);

}



// Android暂停活化的接口

function pauseHHTestcalljs(content) {

    pauseTestWorker.postMessage(content);

}



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

var newBattWorker = '';




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

@@ -155,6 +155,7 @@
                            monVol: testParams.mon_vol,        // 单体电压

                            monCount: testParams.monCount,    // 单体数量

                            groupCount: testParams.groupCount,    // 电池组数

                            cycleTimes: testParams.cycleTimes,    // 循环次数

                            isSave: isSave,            // 是否保存

                        }

                    });


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

@@ -36,6 +36,9 @@
                                                <td>已到单体个数：<span>{{testData.lowerCount}}</span> 个</td>

                                                <td>当前状态：<span>{{testData.btnState|btnStatesFilter}}</span> </td>

                                            </tr>

                                            <tr v-if="params.name == 'activity'">

                                                <td>活化进度：{{ testData.hhProgress }}/{{ params.cycleTimes }}</td>

                                            </tr>

                                        </tbody>

                                    </table>

                                </div>


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

@@ -43,6 +43,7 @@
                    maxVol: 0,        // 最高单体电压

                    minVolNum: 0,    // 最低单体号

                    minVol: 0,        // 最低单体电压

                    hhProgress: 0,     // 活化进度

                },

            },

            filters: {

@@ -132,6 +133,13 @@
                                // 启动放电测试

                                this.startDischarge();

                            break;

                            case 'activity':

                                // 启动活化测试

                                this.startHHTest();

                            break;

                            default:

                                bui.alert('未知测试类型，无法启动测试！');

                            break;

                        }

                    }else {

                        this.$Modal.warning({

@@ -150,11 +158,20 @@
                        bui.alert('请使用手机端登陆！');

                    }

                },

                startCharge: function() {

                startCharge: function() {        // 启动充电测试

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

                        // 显示等待框

                        this.loading.show();

                        JSInterface.startCharge();

                    }else {

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

                    }

                },

                startHHTest: function() {        // 启动活化测试

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

                        // 显示等待框

                        this.loading.show();

                        JSInterface.startHHTest();

                    }else {

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

                    }

@@ -171,9 +188,16 @@
                            // 停止放电测试

                            this.stopDischarge();

                        break;

                        case 'activity':

                            // 启动活化测试

                            this.stopHHTest();

                        break;

                        default:

                            bui.alert('未知测试类型，无法停止测试！');

                        break;

                    }

                },

                stopDischarge: function() {

                stopDischarge: function() {            // 停止放电测试

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

                        // 显示等待框

                        this.loading.show();

@@ -182,11 +206,20 @@
                        bui.alert('请使用手机端登陆！');

                    }

                },

                stopCharge: function() {

                stopCharge: function() {            // 停止充电测试

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

                        // 显示等待框

                        this.loading.show();

                        JSInterface.stopCharge();

                    }else {

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

                    }

                },

                stopHHTest: function() {        // 停止活化测试

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

                        // 显示等待框

                        this.loading.show();

                        JSInterface.stopHHTest();

                    }else {

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

                    }

@@ -196,16 +229,23 @@
                    var params = this.params;

                    switch(params.name) {

                        case 'charge':

                            // 停止充电测试

                            // 暂停充电测试

                            this.pauseCharge();

                        break;

                        case 'discharge':

                            // 停止放电测试

                            // 暂停放电测试

                            this.pauseDischarge();

                        break;

                        case 'activity':

                            // 暂停活化测试

                            this.pauseHHTest();

                        break;

                        default:

                            bui.alert('未知测试类型，无法停止测试！');

                        break;

                    }

                },

                pauseDischarge: function() {

                pauseDischarge: function() {        // 暂停放电测试

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

                        // 显示等待框

                        this.loading.show();

@@ -214,7 +254,7 @@
                        bui.alert('请使用手机端登陆！');

                    }

                },

                pauseCharge: function() {

                pauseCharge: function() {            // 暂停充电测试

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

                        // 显示等待框

                        this.loading.show();

@@ -223,18 +263,25 @@
                        bui.alert('请使用手机端登陆！');

                    }

                },

                pauseHHTest: function() {            // 暂停活化测试

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

                        // 显示等待框

                        this.loading.show();

                        JSInterface.pauseHHTest();

                    }else {

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

                    }

                },

                getTestData: function() {

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

                        JSInterface.getTestData();

                    }else {

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

                    }

                    }

                }

            },

            computed: {

                isCanStop: function() {

                    return this.testData.btnState == 0?true:false;

                }

                },

            },

            mounted() {

                var self = this;

@@ -248,7 +295,7 @@
                // 获取参数

                this.getTestData();

                

                // 设置实时请求

                // 设置实时请求测试参数

                this.getTestDataTimer = setInterval(function() {

                    self.getTestData();

                }, 4000);

@@ -271,6 +318,8 @@
                    }else {

                        bui.alert('启动失败！');

                    }

                    // 获取测试参数

                    self.getTestData();

                };

                

                // 监控停止测试返回结果

@@ -283,6 +332,8 @@
                    }else {

                        bui.alert('停止失败！');

                    }

                    // 获取测试参数

                    self.getTestData();

                };

                

                // 监控暂停测试返回结果

@@ -295,6 +346,8 @@
                    }else {

                        bui.alert('暂停失败！');

                    }

                    // 获取测试参数

                    self.getTestData();

                }

            },

            destroyed() {


 www/js/workers.js

@@ -70,6 +70,11 @@
    startTestWorker.postMessage(content);

}



// Android启动活化测试接口

function startHHTestcalljs(content) {

    startTestWorker.postMessage(content);

}



// 建立一个停止测试的线程

var stopTestWorker = '';



@@ -83,6 +88,11 @@
    stopTestWorker.postMessage(content);

}



// Android停止活化测试的接口

function stopHHTestcalljs(content) {

    stopTestWorker.postMessage(content);

}



// 建立一个暂停测试的线程

var pauseTestWorker = '';



@@ -96,6 +106,11 @@
    pauseTestWorker.postMessage(content);

}



// Android暂停活化的接口

function pauseHHTestcalljs(content) {

    pauseTestWorker.postMessage(content);

}



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

var newBattWorker = '';




 www/pages/batttest/batttest.js

@@ -155,6 +155,7 @@
                            monVol: testParams.mon_vol,        // 单体电压

                            monCount: testParams.monCount,    // 单体数量

                            groupCount: testParams.groupCount,    // 电池组数

                            cycleTimes: testParams.cycleTimes,    // 循环次数

                            isSave: isSave,            // 是否保存

                        }

                    });


 www/pages/testdata/testdata.html

@@ -36,6 +36,9 @@
                                                <td>已到单体个数：<span>{{testData.lowerCount}}</span> 个</td>

                                                <td>当前状态：<span>{{testData.btnState|btnStatesFilter}}</span> </td>

                                            </tr>

                                            <tr v-if="params.name == 'activity'">

                                                <td>活化进度：{{ testData.hhProgress }}/{{ params.cycleTimes }}</td>

                                            </tr>

                                        </tbody>

                                    </table>

                                </div>


 www/pages/testdata/testdata.js

@@ -43,6 +43,7 @@
                    maxVol: 0,        // 最高单体电压

                    minVolNum: 0,    // 最低单体号

                    minVol: 0,        // 最低单体电压

                    hhProgress: 0,     // 活化进度

                },

            },

            filters: {

@@ -132,6 +133,13 @@
                                // 启动放电测试

                                this.startDischarge();

                            break;

                            case 'activity':

                                // 启动活化测试

                                this.startHHTest();

                            break;

                            default:

                                bui.alert('未知测试类型，无法启动测试！');

                            break;

                        }

                    }else {

                        this.$Modal.warning({

@@ -150,11 +158,20 @@
                        bui.alert('请使用手机端登陆！');

                    }

                },

                startCharge: function() {

                startCharge: function() {        // 启动充电测试

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

                        // 显示等待框

                        this.loading.show();

                        JSInterface.startCharge();

                    }else {

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

                    }

                },

                startHHTest: function() {        // 启动活化测试

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

                        // 显示等待框

                        this.loading.show();

                        JSInterface.startHHTest();

                    }else {

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

                    }

@@ -171,9 +188,16 @@
                            // 停止放电测试

                            this.stopDischarge();

                        break;

                        case 'activity':

                            // 启动活化测试

                            this.stopHHTest();

                        break;

                        default:

                            bui.alert('未知测试类型，无法停止测试！');

                        break;

                    }

                },

                stopDischarge: function() {

                stopDischarge: function() {            // 停止放电测试

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

                        // 显示等待框

                        this.loading.show();

@@ -182,11 +206,20 @@
                        bui.alert('请使用手机端登陆！');

                    }

                },

                stopCharge: function() {

                stopCharge: function() {            // 停止充电测试

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

                        // 显示等待框

                        this.loading.show();

                        JSInterface.stopCharge();

                    }else {

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

                    }

                },

                stopHHTest: function() {        // 停止活化测试

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

                        // 显示等待框

                        this.loading.show();

                        JSInterface.stopHHTest();

                    }else {

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

                    }

@@ -196,16 +229,23 @@
                    var params = this.params;

                    switch(params.name) {

                        case 'charge':

                            // 停止充电测试

                            // 暂停充电测试

                            this.pauseCharge();

                        break;

                        case 'discharge':

                            // 停止放电测试

                            // 暂停放电测试

                            this.pauseDischarge();

                        break;

                        case 'activity':

                            // 暂停活化测试

                            this.pauseHHTest();

                        break;

                        default:

                            bui.alert('未知测试类型，无法停止测试！');

                        break;

                    }

                },

                pauseDischarge: function() {

                pauseDischarge: function() {        // 暂停放电测试

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

                        // 显示等待框

                        this.loading.show();

@@ -214,7 +254,7 @@
                        bui.alert('请使用手机端登陆！');

                    }

                },

                pauseCharge: function() {

                pauseCharge: function() {            // 暂停充电测试

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

                        // 显示等待框

                        this.loading.show();

@@ -223,18 +263,25 @@
                        bui.alert('请使用手机端登陆！');

                    }

                },

                pauseHHTest: function() {            // 暂停活化测试

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

                        // 显示等待框

                        this.loading.show();

                        JSInterface.pauseHHTest();

                    }else {

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

                    }

                },

                getTestData: function() {

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

                        JSInterface.getTestData();

                    }else {

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

                    }

                    }

                }

            },

            computed: {

                isCanStop: function() {

                    return this.testData.btnState == 0?true:false;

                }

                },

            },

            mounted() {

                var self = this;

@@ -248,7 +295,7 @@
                // 获取参数

                this.getTestData();

                

                // 设置实时请求

                // 设置实时请求测试参数

                this.getTestDataTimer = setInterval(function() {

                    self.getTestData();

                }, 4000);

@@ -271,6 +318,8 @@
                    }else {

                        bui.alert('启动失败！');

                    }

                    // 获取测试参数

                    self.getTestData();

                };

                

                // 监控停止测试返回结果

@@ -283,6 +332,8 @@
                    }else {

                        bui.alert('停止失败！');

                    }

                    // 获取测试参数

                    self.getTestData();

                };

                

                // 监控暂停测试返回结果

@@ -295,6 +346,8 @@
                    }else {

                        bui.alert('暂停失败！');

                    }

                    // 获取测试参数

                    self.getTestData();

                }

            },

            destroyed() {

			@@ -70,6 +70,11 @@
			startTestWorker.postMessage(content);
			}

			// Android启动活化测试接口
			function startHHTestcalljs(content) {
			startTestWorker.postMessage(content);
			}

			// 建立一个停止测试的线程
			var stopTestWorker = '';

			@@ -83,6 +88,11 @@
			stopTestWorker.postMessage(content);
			}

			// Android停止活化测试的接口
			function stopHHTestcalljs(content) {
			stopTestWorker.postMessage(content);
			}

			// 建立一个暂停测试的线程
			var pauseTestWorker = '';

			@@ -96,6 +106,11 @@
			pauseTestWorker.postMessage(content);
			}

			// Android暂停活化的接口
			function pauseHHTestcalljs(content) {
			pauseTestWorker.postMessage(content);
			}

			// 建立一个新建电池组的线程
			var newBattWorker = '';

			@@ -155,6 +155,7 @@
			monVol: testParams.mon_vol, // 单体电压
			monCount: testParams.monCount, // 单体数量
			groupCount: testParams.groupCount, // 电池组数
			cycleTimes: testParams.cycleTimes, // 循环次数
			isSave: isSave, // 是否保存
			}
			});

			@@ -36,6 +36,9 @@
			<td>已到单体个数：<span>{{testData.lowerCount}}</span> 个</td>
			<td>当前状态：<span>{{testData.btnState\|btnStatesFilter}}</span> </td>
			</tr>
			<tr v-if="params.name == 'activity'">
			<td>活化进度：{{ testData.hhProgress }}/{{ params.cycleTimes }}</td>
			</tr>
			</tbody>
			</table>
			</div>

			@@ -43,6 +43,7 @@
			maxVol: 0, // 最高单体电压
			minVolNum: 0, // 最低单体号
			minVol: 0, // 最低单体电压
			hhProgress: 0, // 活化进度
			},
			},
			filters: {
			@@ -132,6 +133,13 @@
			// 启动放电测试
			this.startDischarge();
			break;
			case 'activity':
			// 启动活化测试
			this.startHHTest();
			break;
			default:
			bui.alert('未知测试类型，无法启动测试！');
			break;
			}
			}else {
			this.$Modal.warning({
			@@ -150,11 +158,20 @@
			bui.alert('请使用手机端登陆！');
			}
			},
			startCharge: function() {
			startCharge: function() { // 启动充电测试
			if(typeof(JSInterface) != 'undefined') {
			// 显示等待框
			this.loading.show();
			JSInterface.startCharge();
			}else {
			bui.alert('请使用手机端登陆！');
			}
			},
			startHHTest: function() { // 启动活化测试
			if(typeof(JSInterface) != 'undefined') {
			// 显示等待框
			this.loading.show();
			JSInterface.startHHTest();
			}else {
			bui.alert('请使用手机端登陆！');
			}
			@@ -171,9 +188,16 @@
			// 停止放电测试
			this.stopDischarge();
			break;
			case 'activity':
			// 启动活化测试
			this.stopHHTest();
			break;
			default:
			bui.alert('未知测试类型，无法停止测试！');
			break;
			}
			},
			stopDischarge: function() {
			stopDischarge: function() { // 停止放电测试
			if(typeof(JSInterface) != 'undefined') {
			// 显示等待框
			this.loading.show();
			@@ -182,11 +206,20 @@
			bui.alert('请使用手机端登陆！');
			}
			},
			stopCharge: function() {
			stopCharge: function() { // 停止充电测试
			if(typeof(JSInterface) != 'undefined') {
			// 显示等待框
			this.loading.show();
			JSInterface.stopCharge();
			}else {
			bui.alert('请使用手机端登陆！');
			}
			},
			stopHHTest: function() { // 停止活化测试
			if(typeof(JSInterface) != 'undefined') {
			// 显示等待框
			this.loading.show();
			JSInterface.stopHHTest();
			}else {
			bui.alert('请使用手机端登陆！');
			}
			@@ -196,16 +229,23 @@
			var params = this.params;
			switch(params.name) {
			case 'charge':
			// 停止充电测试
			// 暂停充电测试
			this.pauseCharge();
			break;
			case 'discharge':
			// 停止放电测试
			// 暂停放电测试
			this.pauseDischarge();
			break;
			case 'activity':
			// 暂停活化测试
			this.pauseHHTest();
			break;
			default:
			bui.alert('未知测试类型，无法停止测试！');
			break;
			}
			},
			pauseDischarge: function() {
			pauseDischarge: function() { // 暂停放电测试
			if(typeof(JSInterface) != 'undefined') {
			// 显示等待框
			this.loading.show();
			@@ -214,7 +254,7 @@
			bui.alert('请使用手机端登陆！');
			}
			},
			pauseCharge: function() {
			pauseCharge: function() { // 暂停充电测试
			if(typeof(JSInterface) != 'undefined') {
			// 显示等待框
			this.loading.show();
			@@ -223,18 +263,25 @@
			bui.alert('请使用手机端登陆！');
			}
			},
			pauseHHTest: function() { // 暂停活化测试
			if(typeof(JSInterface) != 'undefined') {
			// 显示等待框
			this.loading.show();
			JSInterface.pauseHHTest();
			}else {
			bui.alert('请使用手机端登陆！');
			}
			},
			getTestData: function() {
			if(typeof(JSInterface) != 'undefined') {
			JSInterface.getTestData();
			}else {
			bui.alert('请使用手机端登陆！');
			}
			}
			}
			},
			computed: {
			isCanStop: function() {
			return this.testData.btnState == 0?true:false;
			}
			},
			},
			mounted() {
			var self = this;
			@@ -248,7 +295,7 @@
			// 获取参数
			this.getTestData();

			// 设置实时请求
			// 设置实时请求测试参数
			this.getTestDataTimer = setInterval(function() {
			self.getTestData();
			}, 4000);
			@@ -271,6 +318,8 @@
			}else {
			bui.alert('启动失败！');
			}
			// 获取测试参数
			self.getTestData();
			};

			// 监控停止测试返回结果
			@@ -283,6 +332,8 @@
			}else {
			bui.alert('停止失败！');
			}
			// 获取测试参数
			self.getTestData();
			};

			// 监控暂停测试返回结果
			@@ -295,6 +346,8 @@
			}else {
			bui.alert('暂停失败！');
			}
			// 获取测试参数
			self.getTestData();
			}
			},
			destroyed() {