hybirdApp.git - Gitblit

parent: 6dd9eae8 | 补丁 | 提交 | ignore whitespace

whychdw

2019-10-21 0a72ef6f90ca2549c4747dfc8acdd79c8e391268

提交内容

4个文件已修改

	platforms/android/app/src/main/assets/www/js/workers.js	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	platforms/android/app/src/main/assets/www/pages/batttest/batttest.js	44 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	www/js/workers.js	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	www/pages/batttest/batttest.js	44 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

@@ -24,4 +24,15 @@
    testIpWorker.postMessage(content);

}



// 建立一个获取电池参数的Worker线程

var getTestParamWorker = '';

function getTestParamcalljs(content) {

    getTestParamWorker.postMessage(content);

}



// 建立一个获取电池列表的Worker线程

var getBattNamesWorker = '';



function getBattNamescalljs(content) {

    getBattNamesWorker.postMessage(content);

}


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

@@ -10,6 +10,9 @@
        vm: ''

    },

    loaded: function loaded(require, exports, module) {

        //  定义Worker线程

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

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

        var params = router.getPageParams();

        // 引入vue

        this.vm = new Vue({

@@ -17,6 +20,9 @@
            data: {

                params: params,

                uiSidebar: '',

                loading: bui.loading(),

                getTestParamWorker: getTestParamWorker,

                getBattNamesWorker: getBattNamesWorker,

                pages: {

                    name: 'activity',

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

@@ -29,7 +35,7 @@
                    monVol: '6',

                    nomCap: '100',

                    monNum: 24,

                }

                },

            },

            methods: {

                setPages: function() {

@@ -76,6 +82,20 @@
                            name: params.name

                        }

                    });

                },

                getTestParam: function() {

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

                        JSInterface.getTestParam();

                    }else {

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

                    }

                },

                getBattNames: function() {

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

                        JSInterface.getBattNames();

                    }else {

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

                    }

                }

            },

            mounted: function mounted() {

@@ -139,10 +159,30 @@
                        }

                    ]

                });

                
                // 获取电池参数

                // this.getTestParam();

                
                // 设置Worker线程监控

                this.getTestParamWorker.onmessage = function(res) {

                    bui.alert(res.data);

                }

                
                // 获取电池列表

                this.getBattNames();

                
                // 设置Worker线程监控

                this.getBattNamesWorker.onmessage = function(res) {

                    bui.alert(res.data);

                }

                // 设置高度

                //this.setTabPaneHt();

            },

            destroyed: function destroyed() {}

            destroyed: function destroyed() {

                // 关闭获取电池参数

                this.getTestParamWorker.terminate();

                this.getBattNamesWorker.terminate();

            }

        });

    },

    destroyed: function destroyed() {


 www/js/workers.js

@@ -24,4 +24,15 @@
    testIpWorker.postMessage(content);

}



// 建立一个获取电池参数的Worker线程

var getTestParamWorker = '';

function getTestParamcalljs(content) {

    getTestParamWorker.postMessage(content);

}



// 建立一个获取电池列表的Worker线程

var getBattNamesWorker = '';



function getBattNamescalljs(content) {

    getBattNamesWorker.postMessage(content);

}


 www/pages/batttest/batttest.js

@@ -10,6 +10,9 @@
        vm: ''

    },

    loaded: function loaded(require, exports, module) {

        //  定义Worker线程

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

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

        var params = router.getPageParams();

        // 引入vue

        this.vm = new Vue({

@@ -17,6 +20,9 @@
            data: {

                params: params,

                uiSidebar: '',

                loading: bui.loading(),

                getTestParamWorker: getTestParamWorker,

                getBattNamesWorker: getBattNamesWorker,

                pages: {

                    name: 'activity',

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

@@ -29,7 +35,7 @@
                    monVol: '6',

                    nomCap: '100',

                    monNum: 24,

                }

                },

            },

            methods: {

                setPages: function() {

@@ -76,6 +82,20 @@
                            name: params.name

                        }

                    });

                },

                getTestParam: function() {

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

                        JSInterface.getTestParam();

                    }else {

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

                    }

                },

                getBattNames: function() {

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

                        JSInterface.getBattNames();

                    }else {

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

                    }

                }

            },

            mounted: function mounted() {

@@ -139,10 +159,30 @@
                        }

                    ]

                });

                
                // 获取电池参数

                // this.getTestParam();

                
                // 设置Worker线程监控

                this.getTestParamWorker.onmessage = function(res) {

                    bui.alert(res.data);

                }

                
                // 获取电池列表

                this.getBattNames();

                
                // 设置Worker线程监控

                this.getBattNamesWorker.onmessage = function(res) {

                    bui.alert(res.data);

                }

                // 设置高度

                //this.setTabPaneHt();

            },

            destroyed: function destroyed() {}

            destroyed: function destroyed() {

                // 关闭获取电池参数

                this.getTestParamWorker.terminate();

                this.getBattNamesWorker.terminate();

            }

        });

    },

    destroyed: function destroyed() {

			@@ -24,4 +24,15 @@
			testIpWorker.postMessage(content);
			}

			// 建立一个获取电池参数的Worker线程
			var getTestParamWorker = '';
			function getTestParamcalljs(content) {
			getTestParamWorker.postMessage(content);
			}

			// 建立一个获取电池列表的Worker线程
			var getBattNamesWorker = '';

			function getBattNamescalljs(content) {
			getBattNamesWorker.postMessage(content);
			}

			@@ -10,6 +10,9 @@
			vm: ''
			},
			loaded: function loaded(require, exports, module) {
			// 定义Worker线程
			getTestParamWorker = new Worker('worker/data.worker.js');
			getBattNamesWorker = new Worker('worker/data.worker.js');
			var params = router.getPageParams();
			// 引入vue
			this.vm = new Vue({
			@@ -17,6 +20,9 @@
			data: {
			params: params,
			uiSidebar: '',
			loading: bui.loading(),
			getTestParamWorker: getTestParamWorker,
			getBattNamesWorker: getBattNamesWorker,
			pages: {
			name: 'activity',
			title: '活化测试->参数',
			@@ -29,7 +35,7 @@
			monVol: '6',
			nomCap: '100',
			monNum: 24,
			}
			},
			},
			methods: {
			setPages: function() {
			@@ -76,6 +82,20 @@
			name: params.name
			}
			});
			},
			getTestParam: function() {
			if(typeof(JSInterface) != 'undefined') {
			JSInterface.getTestParam();
			}else {
			bui.alert('请使用手机端登陆！');
			}
			},
			getBattNames: function() {
			if(typeof(JSInterface) != 'undefined') {
			JSInterface.getBattNames();
			}else {
			bui.alert('请使用手机端登陆！');
			}
			}
			},
			mounted: function mounted() {
			@@ -139,10 +159,30 @@
			}
			]
			});

			// 获取电池参数
			// this.getTestParam();

			// 设置Worker线程监控
			this.getTestParamWorker.onmessage = function(res) {
			bui.alert(res.data);
			}

			// 获取电池列表
			this.getBattNames();

			// 设置Worker线程监控
			this.getBattNamesWorker.onmessage = function(res) {
			bui.alert(res.data);
			}
			// 设置高度
			//this.setTabPaneHt();
			},
			destroyed: function destroyed() {}
			destroyed: function destroyed() {
			// 关闭获取电池参数
			this.getTestParamWorker.terminate();
			this.getBattNamesWorker.terminate();
			}
			});
			},
			destroyed: function destroyed() {