whyclj
2019-10-23 ed1a24a5bf58e4bc5166e768177946b1cf62ba8b
后台添加app退出连接方法
3个文件已修改
39 ■■■■■ 已修改文件
platforms/android/app/src/main/java/com/service/MyInteractionService.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platforms/android/app/src/main/java/com/socket/MySocketClientThread.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platforms/android/app/src/main/java/io/hybird/jsbridge/JsInterface.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platforms/android/app/src/main/java/com/service/MyInteractionService.java
@@ -100,6 +100,9 @@
                    jsInterface.SendCallDataToJS("clearAllAlarm",model);
                }else if(FBS_ComBase.CMD_RETURNMAIN == model.cmd){
                    jsInterface.SendCallDataToJS("changeAppForm",model);
                }else if(FBS_ComBase.CMD_EXITMACHINECONTROL == model.cmd){
                    sockethread.closeConn();
                    jsInterface.SendCallDataToJS("exitDeiviceConn",model);
                }
            }
        };
@@ -114,9 +117,8 @@
                            sendMessageToSocketClient(mSocketHandle, FBS_ComBase.CMD_HEARTBEAT, "");
                            Log.e(TAG, "run: ######################################" );
                        }
                        //handler.removeCallbacks(runnable);
                        Thread.sleep(4000);
                    } catch (InterruptedException e) {
                    } catch (Exception e) {
                        e.printStackTrace();
                    }
                }
@@ -137,6 +139,12 @@
        return flag;
    }
    //退出上位机连接
    public void exitDeiviceConn(){
        isRunning = false;              //暂停发送心跳包
        sendMessageToSocketClient(mSocketHandle, FBS_ComBase.CMD_EXITMACHINECONTROL, "");
    }
    //测试当前连接是否可以连接上
    public boolean testDeviceIp(String serverip){
        boolean flag = false;
platforms/android/app/src/main/java/com/socket/MySocketClientThread.java
@@ -499,6 +499,14 @@
                    System.out.println("切换界面成功");
                }
            }
            //---------------------  退出上位机控制   ----------------------------------
            else if(FBS_ComBase.CMD_EXITMACHINECONTROL == m_FBS_Cmd.CMD) {
                if(FBS_ComBase.RETURN_SUCCESS == m_FBS_Cmd.RecState) {
                    isSuccess = true;
                    System.out.println("退出上位机控制");
                }
            }
        }
        return isSuccess;
    }
@@ -517,6 +525,17 @@
        return false;
    }
    //关闭socket连接
    public void closeConn(){
        if(this.socket != null){
            try {
                this.socket.close();
            } catch (IOException e) {
                e.printStackTrace();
            }
        }
    }
    //测试当前ip是否可以连接
    public boolean testSockConn(String server_ip){
        boolean flag = false;
platforms/android/app/src/main/java/io/hybird/jsbridge/JsInterface.java
@@ -230,10 +230,16 @@
     */
    @JavascriptInterface
    public void changeAppForm(String index){
        Log.e(TAG, "changeAppForm: index="+index );
        //Log.e(TAG, "changeAppForm: index="+index );
        service.changeAppForm(index);
    }
    //退出上位机连接
    @JavascriptInterface
    public void exitDeiviceConn(){
        service.exitDeiviceConn();
    }
    //获取设备ip
    public String readServerIp(){
        String server_ip = "127.0.0.1";