whyclj
2019-10-23 5ff539b35722f059019057fa7a214906b695d6c8
修改bug
3个文件已修改
12 ■■■■■ 已修改文件
platforms/android/app/src/main/assets/www/pages/testdata/testdata.js 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platforms/android/app/src/main/java/com/socket/MySocketClientThread.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platforms/android/app/src/main/java/io/hybird/jsbridge/JsInterface.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platforms/android/app/src/main/assets/www/pages/testdata/testdata.js
@@ -265,7 +265,7 @@
                this.startTestWorker.onmessage = function(res) {
                    // 关闭等待框
                    self.loading.hide();
                    var rs = res.data(res);
                    var rs = res.data;
                    if(rs.code == 1) {
                        bui.alert('启动成功!');
                    }else {
@@ -277,7 +277,7 @@
                this.stopTestWorker.onmessage = function(res) {
                    // 关闭等待框
                    self.loading.hide();
                    var rs = res.data(res);
                    var rs = res.data;
                    if(rs.code == 1) {
                        bui.alert('停止成功!');
                    }else {
@@ -289,7 +289,7 @@
                this.pauseTestWorker.onmessage = function(res) {
                    // 关闭等待框
                    self.loading.hide();
                    var rs = res.data(res);
                    var rs = res.data;
                    if(rs.code == 1) {
                        bui.alert('暂停成功!');
                    }else {
platforms/android/app/src/main/java/com/socket/MySocketClientThread.java
@@ -264,6 +264,7 @@
                thread_run_flag = false;
            }
        } catch (IOException | InterruptedException e) {
            model.code = 0;
            thread_run_flag = false;
        } finally {
            if(!thread_run_flag){
platforms/android/app/src/main/java/io/hybird/jsbridge/JsInterface.java
@@ -34,7 +34,7 @@
        this.webView = webView;
        this.activity = activity;
        String server_ip = readServerIp();
        //server_ip = "192.168.7.130";
        server_ip = "192.168.43.33";
        service = new MyInteractionService(server_ip,this);
@@ -67,9 +67,10 @@
    //设置当前设备IP
    @JavascriptInterface
    public void setUpDeviceIp(String deviceIp){
        writeServerIp(deviceIp);
        Log.e(TAG, "setUpDeviceIp: "+deviceIp );
        ServiceModel model = new ServiceModel();
        boolean flag = service.setUpDeviceIp(deviceIp);
        writeServerIp(deviceIp);
        if(flag){
            model.code = 1;
        }