diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..23916a8 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +gridclient \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..7643783 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,123 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..79ee123 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index fb7f4a8..61a9130 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml new file mode 100644 index 0000000..659024d --- /dev/null +++ b/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 1d5f7c6..6d6dc65 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -5,7 +5,7 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index 7c7f635..90ac33c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,7 +5,15 @@ - + + + + diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 797acea..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/release/市域治理-1.0.8.apk b/app/release/市域治理-1.0.8.apk deleted file mode 100644 index 2c08010..0000000 Binary files a/app/release/市域治理-1.0.8.apk and /dev/null differ diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/sockets/WsManager.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/sockets/WsManager.java index 9691221..55292e7 100755 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/sockets/WsManager.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/sockets/WsManager.java @@ -35,6 +35,7 @@ import okio.ByteString; public class WsManager implements IWsManager { private final static int RECONNECT_INTERVAL = 10 * 1000; //重连自增步长 private final static long RECONNECT_MAX_TIME = 120 * 1000; //最大重连间隔 + private final static int PING_TIME=50; private Context mContext; private String wsUrl; private WebSocket mWebSocket; @@ -152,7 +153,7 @@ public class WsManager implements IWsManager { private void initWebSocket() { if (mOkHttpClient == null) { mOkHttpClient = new OkHttpClient.Builder() - .pingInterval(50, TimeUnit.SECONDS) + .pingInterval(PING_TIME, TimeUnit.SECONDS) .retryOnConnectionFailure(true) .build(); } diff --git a/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/MainTabActivity.java b/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/MainTabActivity.java index 7225264..15c46bd 100644 --- a/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/MainTabActivity.java +++ b/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/MainTabActivity.java @@ -865,6 +865,7 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro } } else if (PathConfig.ACTION_MSG_FORCE_LOGIN_OUT.equals(action)) { //强制退出 + LoginMangerV2.getInstance().logout(); showLoginOutDialog(); } else if (PathConfig.ACTION_LOGIN_OUT.equals(action)) { reStartApp(); @@ -1105,7 +1106,7 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro if (mReceiver != null) { unregisterReceiver(mReceiver); } - LoginMangerV2.getInstance().logout(); +// LoginMangerV2.getInstance().logout(); super.onDestroy(); } diff --git a/mainmodule/src/main/res/layout/activity_login.xml b/mainmodule/src/main/res/layout/activity_login.xml index f829d73..5d21f5a 100755 --- a/mainmodule/src/main/res/layout/activity_login.xml +++ b/mainmodule/src/main/res/layout/activity_login.xml @@ -162,7 +162,9 @@ + + \ No newline at end of file