v3.0b20170713 released!

qiang841129 · Jul 13, 2017 · 555f491 · 555f491
1 parent b55ba3a
commit 555f491
Show file tree

Hide file tree

Showing 16 changed files with 79 additions and 6 deletions.
diff --git a/demos/client/MobileIMSDKDemo-Android.apk b/demos/client/MobileIMSDKDemo-Android.apk
diff --git a/demos/client/MobileIMSDKDemo-Java.jar b/demos/client/MobileIMSDKDemo-Java.jar
diff --git a/release_notes/release_note_v3.0b20170713.txt b/release_notes/release_note_v3.0b20170713.txt
@@ -0,0 +1,10 @@
+
+-------------------------------------------------------------------------------------- v3.0������2017-06-25 19:08
+MobileIMSDK v3.0b20170713�����˵����
+�������Bug��
+1. [Android��java��iOS]�����Demo�������ڲ��˳�APP��������˳���½�������µ�½ʱ���ᱨcode=203�����bug��
+
+
+
+
+
diff --git a/...ll/demos/MobileIMSDK4aDemoX/src/net/openmob/mobileimsdk/android/demo/IMClientManager.java b/...ll/demos/MobileIMSDK4aDemoX/src/net/openmob/mobileimsdk/android/demo/IMClientManager.java
@@ -85,10 +85,24 @@ public void initMobileIMSDK()
 			init = true;
 		}
 	}
-
+	
 	public void release()
 	{
 		ClientCoreSDK.getInstance().release();
+		resetInitFlag();
+	}
+
+	/**
+	 * 重置init标识。
+	 * <p>
+	 * <b>重要说明：</b>不退出APP的情况下，重新登陆时记得调用一下本方法，不然再
+	 * 次调用 {@link #initMobileIMSDK()} 时也不会重新初始化MobileIMSDK（
+	 * 详见 {@link #initMobileIMSDK()}代码）而报 code=203错误！
+	 * 
+	 */
+	public void resetInitFlag()
+	{
+		init = false;
 	}
 
 	public ChatTransDataEventImpl getTransDataListener()

diff --git a/src_all/demos/MobileIMSDK4aDemoX/src/net/openmob/mobileimsdk/android/demo/LoginActivity.java b/src_all/demos/MobileIMSDK4aDemoX/src/net/openmob/mobileimsdk/android/demo/LoginActivity.java
@@ -73,6 +73,7 @@ protected void onCreate(Bundle savedInstanceState)
 		initListeners();
 
 		// 确保MobileIMSDK被初始化哦（整个APP生生命周期中只需调用一次哦）
+		// 提示：在不退出APP的情况下退出登陆后再重新登陆时，请确保调用本方法一次，不然会报code=203错误哦！
 		IMClientManager.getInstance(this).initMobileIMSDK();
 
 		// 登陆有关的初始化工作

diff --git a/src_all/demos/MobileIMSDK4aDemoX/src/net/openmob/mobileimsdk/android/demo/MainActivity.java b/src_all/demos/MobileIMSDK4aDemoX/src/net/openmob/mobileimsdk/android/demo/MainActivity.java
@@ -192,6 +192,11 @@ protected Integer doInBackground(Object... params)
 					Log.w(TAG, e);
 				}
 
+				//## BUG FIX: 20170713 START by JackJiang
+				// 退出登陆时记得一定要调用此行，不然不退出APP的情况下再登陆时会报 code=203错误哦！
+				IMClientManager.getInstance(MainActivity.this).resetInitFlag();
+				//## BUG FIX: 20170713 END by JackJiang
+
 				return code;
 			}
 

diff --git a/...eproj/project.xcworkspace/xcuserdata/jackjiang.xcuserdatad/UserInterfaceState.xcuserstate b/...eproj/project.xcworkspace/xcuserdata/jackjiang.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/src_all/demos/MobileIMSDK4iDemo_x/MobileIMSDK4iDemo/AppDelegate.m b/src_all/demos/MobileIMSDK4iDemo_x/MobileIMSDK4iDemo/AppDelegate.m
@@ -46,6 +46,7 @@ @implementation AppDelegate
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
 
     // init MobileIMSDK first
+    // 提示：在不退出APP的情况下退出登陆后再重新登陆时，请确保调用本方法一次，不然会报code=203错误哦！
     [[IMClientManager sharedInstance] initMobileIMSDK];
 
     self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];

diff --git a/src_all/demos/MobileIMSDK4iDemo_x/MobileIMSDK4iDemo/IMClientManager.h b/src_all/demos/MobileIMSDK4iDemo_x/MobileIMSDK4iDemo/IMClientManager.h
@@ -40,6 +40,17 @@
 
 - (void)releaseMobileIMSDK;
 
+
+/**
+ * 重置init标识。
+ * <p>
+ * <b>重要说明：</b>不退出APP的情况下，重新登陆时记得调用一下本方法，不然再
+ * 次调用 {@link #initMobileIMSDK()} 时也不会重新初始化MobileIMSDK（
+ * 详见 {@link #initMobileIMSDK()}代码）而报 code=203错误！
+ *
+ */
+- (void)resetInitFlag;
+
 - (ChatTransDataEventImpl *) getTransDataListener;
 - (ChatBaseEventImpl *) getBaseEventListener;
 - (MessageQoSEventImpl *) getMessageQoSListener;

diff --git a/src_all/demos/MobileIMSDK4iDemo_x/MobileIMSDK4iDemo/IMClientManager.m b/src_all/demos/MobileIMSDK4iDemo_x/MobileIMSDK4iDemo/IMClientManager.m
@@ -112,6 +112,12 @@ - (void)initMobileIMSDK
 - (void)releaseMobileIMSDK
 {
     [[ClientCoreSDK sharedInstance] releaseCore];
+    [self resetInitFlag];
+}
+
+- (void)resetInitFlag
+{
+    self._init = NO;
 }
 
 - (ChatTransDataEventImpl *) getTransDataListener

diff --git a/src_all/demos/MobileIMSDK4iDemo_x/MobileIMSDK4iDemo/Info.plist b/src_all/demos/MobileIMSDK4iDemo_x/MobileIMSDK4iDemo/Info.plist
@@ -25,7 +25,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>b170620.1</string>
+	<string>b170713.2</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>

diff --git a/src_all/demos/MobileIMSDK4iDemo_x/MobileIMSDK4iDemo/LoginViewController.xib b/src_all/demos/MobileIMSDK4iDemo_x/MobileIMSDK4iDemo/LoginViewController.xib
@@ -28,7 +28,7 @@
                     <rect key="frame" x="18" y="0.0" width="284" height="157"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <subviews>
-                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="192.168.1.190" borderStyle="roundedRect" placeholder="Domain or ip address #" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="WTR-Ew-UbY" userLabel="编辑框-ip">
+                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="rbcore.52im.net" borderStyle="roundedRect" placeholder="Domain or ip address #" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="WTR-Ew-UbY" userLabel="编辑框-ip">
                             <rect key="frame" x="0.0" y="20" width="196" height="30"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <color key="textColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -103,7 +103,7 @@
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>
                 <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" alpha="0.69999999999999996" contentMode="center" image="copyright_img.png" translatesAutoresizingMaskIntoConstraints="NO" id="g6y-O3-PAI">
-                    <rect key="frame" x="63" y="519" width="194" height="34"/>
+                    <rect key="frame" x="61" y="519" width="198" height="34"/>
                 </imageView>
             </subviews>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -118,7 +118,7 @@
         </view>
     </objects>
     <resources>
-        <image name="copyright_img.png" width="194" height="34"/>
+        <image name="copyright_img.png" width="198" height="34"/>
         <image name="dashed_line.png" width="568" height="1"/>
     </resources>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">

diff --git a/src_all/demos/MobileIMSDK4iDemo_x/MobileIMSDK4iDemo/MainViewController.m b/src_all/demos/MobileIMSDK4iDemo_x/MobileIMSDK4iDemo/MainViewController.m
@@ -189,6 +189,11 @@ - (void)doLogout
         NSString *msg = [NSString stringWithFormat:@"注销登陆请求发送失败，错误码：%d", code];
         [self E_showToastInfo:@"错误" withContent:msg onParent:self.view];
     }
+
+    //## BUG FIX: 20170713 START by JackJiang
+    // 退出登陆时记得一定要调用此行，不然不退出APP的情况下再登陆时会报 code=203错误哦！
+    [[IMClientManager sharedInstance] resetInitFlag];
+    //## BUG FIX: 20170713 END by JackJiang
 }
 
 - (void)doExit

diff --git a/src_all/demos/MobileIMSDK4jDemoX/src/net/openmob/mobileimsdk/java/demo/IMClientManager.java b/src_all/demos/MobileIMSDK4jDemoX/src/net/openmob/mobileimsdk/java/demo/IMClientManager.java
@@ -82,6 +82,20 @@ public void initMobileIMSDK()
 	public void release()
 	{
 		ClientCoreSDK.getInstance().release();
+		resetInitFlag();
+	}
+
+	/**
+	 * 重置init标识。
+	 * <p>
+	 * <b>重要说明：</b>不退出APP的情况下，重新登陆时记得调用一下本方法，不然再
+	 * 次调用 {@link #initMobileIMSDK()} 时也不会重新初始化MobileIMSDK（
+	 * 详见 {@link #initMobileIMSDK()}代码）而报 code=203错误！
+	 * 
+	 */
+	public void resetInitFlag()
+	{
+		init = false;
 	}
 
 	public ChatTransDataEventImpl getTransDataListener()

diff --git a/src_all/demos/MobileIMSDK4jDemoX/src/net/openmob/mobileimsdk/java/demo/LoginGUI.java b/src_all/demos/MobileIMSDK4jDemoX/src/net/openmob/mobileimsdk/java/demo/LoginGUI.java
@@ -72,6 +72,7 @@ public LoginGUI()
 		initListeners();
 
 		// 确保MobileIMSDK被初始化哦（整个APP生生命周期中只需调用一次哦）
+		// 提示：在不退出APP的情况下退出登陆后再重新登陆时，请确保调用本方法一次，不然会报code=203错误哦！
 		IMClientManager.getInstance().initMobileIMSDK();
 
 		// 登陆有关的初始化工作
@@ -112,7 +113,7 @@ private void initViews()
 		mainPanel.addTitledLineSeparator("");
 		JPanel btnAndVerPanel = new JPanel();
 		btnAndVerPanel.setLayout(new BoxLayout(btnAndVerPanel, BoxLayout.LINE_AXIS));
-		JLabel lbVer= new JLabel("v3.0b170626.1");
+		JLabel lbVer= new JLabel("v3.0b170713.1");
 		lbVer.setForeground(new Color(184,184,184));
 		btnAndVerPanel.add(lbVer);
 		btnAndVerPanel.add(Box.createHorizontalGlue());

diff --git a/src_all/demos/MobileIMSDK4jDemoX/src/net/openmob/mobileimsdk/java/demo/MainGUI.java b/src_all/demos/MobileIMSDK4jDemoX/src/net/openmob/mobileimsdk/java/demo/MainGUI.java
@@ -234,6 +234,11 @@ private void doLogout()
 			System.out.println("注销登陆请求已完成！");
 		else
 			System.out.println("注销登陆请求发送失败。错误码是："+code+"！");
+
+		//## BUG FIX: 20170713 START by JackJiang
+		// 退出登陆时记得一定要调用此行，不然不退出APP的情况下再登陆时会报 code=203错误哦！
+		IMClientManager.getInstance().resetInitFlag();
+		//## BUG FIX: 20170713 END by JackJiang
 	}
 
 	public static void doExit()