update v2 jar

@@ -22,13 +22,14 @@ public final class R {
         public static final int public_sdk_self_ya_login_bt_selector=0x7f020008;
         public static final int public_sdk_self_ya_login_bt_selector=0x7f020008;
     }
     }
     public static final class id {
     public static final class id {
-        public static final int forum_bt=0x7f050004;
-        public static final int logout_bt=0x7f050003;
+        public static final int forum_bt=0x7f050005;
+        public static final int logout_bt=0x7f050004;
         public static final int ya_channel_center=0x7f050000;
         public static final int ya_channel_center=0x7f050000;
-        public static final int ya_enter_game_bt=0x7f050006;
-        public static final int ya_login_bt=0x7f050005;
+        public static final int ya_enter_game_bt=0x7f050007;
+        public static final int ya_login_bt=0x7f050006;
         public static final int ya_pay_bt=0x7f050001;
         public static final int ya_pay_bt=0x7f050001;
-        public static final int ya_submit_role_data_bt=0x7f050002;
+        public static final int ya_submit_role_data_bt=0x7f050003;
+        public static final int ya_switch_account_bt=0x7f050002;
     }
     }
     public static final class layout {
     public static final class layout {
         public static final int public_sdk_self_game=0x7f030000;
         public static final int public_sdk_self_game=0x7f030000;

@@ -13,14 +13,14 @@
         android:background="@drawable/public_sdk_self_ya_bt_selector"
         android:background="@drawable/public_sdk_self_ya_bt_selector"
         android:onClick="yaOnClick"/>
         android:onClick="yaOnClick"/>
 
 
-  <!--   <Button
+  	<Button
         android:id="@+id/ya_switch_account_bt"
         android:id="@+id/ya_switch_account_bt"
         android:layout_width="180dp"
         android:layout_width="180dp"
         android:layout_height="60dp"
         android:layout_height="60dp"
         android:layout_alignParentRight="true"
         android:layout_alignParentRight="true"
         android:layout_alignTop="@+id/ya_submit_role_data_bt"
         android:layout_alignTop="@+id/ya_submit_role_data_bt"
         android:background="@drawable/public_sdk_self_ya_bt_selector"
         android:background="@drawable/public_sdk_self_ya_bt_selector"
-        android:onClick="yaOnClick" /> -->
+        android:onClick="yaOnClick" />
 
 
     <Button
     <Button
         android:id="@+id/ya_submit_role_data_bt"
         android:id="@+id/ya_submit_role_data_bt"

@@ -36,6 +36,7 @@ public class AppActivity extends Activity {
 	private Button yaChannelCenter;
 	private Button yaChannelCenter;
 	private Button yaLogoutBt;
 	private Button yaLogoutBt;
 	private Button yaForumBt;
 	private Button yaForumBt;
+	private Button yaSwitchAccountBt;
 
 
 	@Override
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 	protected void onCreate(Bundle savedInstanceState) {
@@ -241,6 +242,9 @@ public class AppActivity extends Activity {
 		
 		
 		yaLogoutBt = (Button) findViewById(getRedIdByName("logout_bt", "id"));
 		yaLogoutBt = (Button) findViewById(getRedIdByName("logout_bt", "id"));
 		
 		
+		yaSwitchAccountBt = (Button) findViewById(getRedIdByName("ya_switch_account_bt", "id"));
+		yaSwitchAccountBt.setText("切换账号");
+		
 		yaForumBt = (Button) findViewById(getRedIdByName("forum_bt", "id"));
 		yaForumBt = (Button) findViewById(getRedIdByName("forum_bt", "id"));
 	}
 	}
 
 
@@ -261,16 +265,34 @@ public class AppActivity extends Activity {
 			logout();
 			logout();
 		} else if (view == yaForumBt){
 		} else if (view == yaForumBt){
 			openForum();
 			openForum();
+		} else if(view == yaSwitchAccountBt){//切换账号
+			switchAccount();
 		}
 		}
 	}
 	}
 
 
+	/**
+	 * 切换帐号
+	 */
+	private void switchAccount() {
+		if(PoolSdkHelper.hasSwitchAccount()){
+			PoolSdkHelper.switchAccount(this);
+		}else if(PoolSdkHelper.hasChannelCenter()){//打开渠道中心看是否有切换账号
+			PoolSdkHelper.openChannelCenter();
+		}else{//直接回到登录界面调用登录
+			int layoutId = getResources().getIdentifier(
+					"public_sdk_self_game_login", "layout", getPackageName());
+			setContentView(layoutId);
+			initLoginView();
+		}
+	}
+	
 	private void openForum(){
 	private void openForum(){
 		PoolSdkHelper.openForum();
 		PoolSdkHelper.openForum();
 	}
 	}
 	
 	
 	private void logout(){
 	private void logout(){
-		PoolSdkHelper.logout(this);//结果回调通知到PoolLogoutListener
 		if(PoolSdkHelper.hasLogout()){
 		if(PoolSdkHelper.hasLogout()){
+			PoolSdkHelper.logout(this);//结果回调通知到PoolLogoutListener
 		}
 		}
 	}
 	}