Ver código fonte

fix im 解决问题:切换网络的时候,同时有wifi和流量的时候,切换wifi开关导致im连接断开的情况,现在已经解决。在im库之前没有升级版本之前,是不会产生这个问题。

Arison 8 anos atrás
pai
commit
e8eefb5137

+ 3 - 1
WeiChat/build.gradle

@@ -106,6 +106,8 @@ dependencies {
     compile deps.stickyListHeaders
     compile deps.stickyGridHeaders
     compile deps.materialDialogs
+    compile deps.okhttp
+    
     androidTestCompile deps.leakcanaryNp
     debugCompile deps.leakcanary
     releaseCompile deps.leakcanaryNp
@@ -119,7 +121,7 @@ dependencies {
     compile project(':appme')
     compile project(':appworks')
     compile project(":appbooking")
-    compile 'com.squareup.okhttp3:okhttp:3.8.1'
+  
     compile project(':android-pdf-viewer')
 }
 

+ 17 - 10
app_core/common/src/main/java/com/core/xmpp/XmppConnectionManager.java

@@ -9,8 +9,10 @@ import android.os.Handler;
 import android.os.Message;
 import android.util.Log;
 
+import com.alibaba.fastjson.JSON;
+import com.common.LogUtil;
 import com.core.app.MyApplication;
-import com.core.utils.CommonUtil;
+import com.core.net.utils.NetUtils;
 
 import org.apache.harmony.javax.security.sasl.SaslException;
 import org.jivesoftware.smack.AbstractConnectionListener;
@@ -107,18 +109,22 @@ public class XmppConnectionManager {
 //		NetworkInfo wifi = mConnectivityManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
 //		boolean isConnectedGprs = gprs != null && gprs.isConnected();
 //		boolean isConnectedWifi = wifi != null && wifi.isConnected();
-		return CommonUtil.isNetWorkConnected(MyApplication.getInstance());
+		return NetUtils.isNetWorkConnected(MyApplication.getInstance());
 	}
 
 	private BroadcastReceiver mNetWorkChangeReceiver = new BroadcastReceiver() {
 		@Override
 		public void onReceive(Context context, Intent intent) {
+			LogUtil.d("roamer","app net intent:"+ JSON.toJSONString(intent));
 			if (!intent.getAction().equals(ConnectivityManager.CONNECTIVITY_ACTION)) {
 				return;
 			}
 			final boolean isConnected = isGprsOrWifiConnected();
-			if (mIsNetWorkActive != isConnected) {// 和之前的状态不同
-				Log.d("roamer", "网络状态改变了doLogining:"+doLogining);
+			LogUtil.d("roamer"," app net isConnected:"+isConnected);
+			LogUtil.d("roamer"," app net mIsNetWorkActive:"+mIsNetWorkActive);
+			LogUtil.d("roamer"," app net mConnection:"+mConnection.isConnected());
+			if (mIsNetWorkActive != isConnected||!mConnection.isConnected()) {// 和之前的状态不同
+				Log.d("roamer", " doLogining:"+doLogining);
 				mIsNetWorkActive = isConnected;
 				// 网络状态改变了
 				if (!mIsNetWorkActive) {// 由有网变为没网
@@ -128,6 +134,7 @@ public class XmppConnectionManager {
 				} else {
 					doLogining=true;
 					if (isLoginAllowed()) {
+						Log.d("roamer", "app try login:"+isLoginAllowed());
 						login(mLoginUserId, mLoginPassword);
 					}
 				}
@@ -198,12 +205,12 @@ public class XmppConnectionManager {
 	private boolean doLogining = false;
 
 	private boolean isLoginAllowed() {
-//		LogUtil.d("Xmpp","---------isLoginAllowed()------------");
-//		LogUtil.d("Xmpp","doLogining:"+doLogining);
-//		LogUtil.d("Xmpp","mIsNetWorkActive:"+mIsNetWorkActive);
-//		LogUtil.d("Xmpp","!mConnection.isConnected():"+!mConnection.isConnected());
-//		LogUtil.d("Xmpp","!mConnection.isAuthenticated():"+!mConnection.isAuthenticated());
-//		LogUtil.d("Xmpp","---------isLoginAllowed()------------");
+		LogUtil.d("roamer","---------isLoginAllowed()------------");
+		LogUtil.d("roamer","doLogining:"+doLogining);
+		LogUtil.d("roamer","mIsNetWorkActive:"+mIsNetWorkActive);
+		LogUtil.d("roamer","!mConnection.isConnected():"+!mConnection.isConnected());
+		LogUtil.d("roamer","!mConnection.isAuthenticated():"+!mConnection.isAuthenticated());
+		LogUtil.d("roamer","---------isLoginAllowed()------------");
 		return doLogining && mIsNetWorkActive && (!mConnection.isConnected() || !mConnection.isAuthenticated());
 	}
 

+ 2 - 0
app_modular/appbooking/build.gradle

@@ -24,4 +24,6 @@ dependencies {
     testCompile deps.junit
 
     compile project(':common')
+
+    compile 'com.android.support.constraint:constraint-layout:+'
 }

+ 9 - 1
app_modular/appbooking/src/main/AndroidManifest.xml

@@ -1,2 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.modular.booking" />
+    package="com.modular.booking">
+
+    <application>
+        <activity android:name=".activity.business.BbookingAddActivity" />
+        <activity android:name=".activity.shares.SharesListActivity"></activity>
+    </application>
+
+</manifest>

+ 19 - 0
app_modular/appbooking/src/main/java/com/modular/booking/activity/business/BbookingAddActivity.java

@@ -0,0 +1,19 @@
+package com.modular.booking.activity.business;
+
+import android.os.Bundle;
+
+import com.core.base.BaseActivity;
+import com.modular.booking.R;
+
+/**
+  * @desc:商务预约新增界面
+  * @author:Arison on 2017/9/7
+  */
+public class BbookingAddActivity extends BaseActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_bbooking_add);
+    }
+}

+ 15 - 0
app_modular/appbooking/src/main/java/com/modular/booking/activity/shares/SharesListActivity.java

@@ -0,0 +1,15 @@
+package com.modular.booking.activity.shares;
+
+import android.os.Bundle;
+
+import com.core.base.BaseActivity;
+import com.modular.booking.R;
+
+public class SharesListActivity extends BaseActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_shares_list);
+    }
+}

+ 9 - 0
app_modular/appbooking/src/main/res/layout/activity_bbooking_add.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.modular.booking.activity.business.BbookingAddActivity">
+
+</android.support.constraint.ConstraintLayout>

+ 12 - 0
app_modular/appbooking/src/main/res/layout/activity_shares_list.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.modular.booking.activity.shares.SharesListActivity">
+    <com.handmark.pulltorefresh.library.PullToRefreshListView
+        android:id="@+id/shareList"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</android.support.constraint.ConstraintLayout>

+ 2 - 2
app_modular/appbooking/src/main/res/values/strings.xml

@@ -1,10 +1,10 @@
 <resources>
     <string name="app_name">appbooking</string>
-    
+
     <!--预约功能-->
     <string name="booking_personal">个人预约</string>
     <string name="booking_business">商务预约</string>
     <string name="booking_service">服务预约</string>
     <string name="booking_share">共享预约</string>
-    
+
 </resources>

+ 3 - 0
build.gradle

@@ -18,6 +18,9 @@ allprojects {
     repositories {
         jcenter()
         maven { url "https://jitpack.io" }
+        maven {
+            url 'https://maven.google.com'
+        }
     }
 }