完善头像修改，微调UI，更新聊天室接入

Classes/gframe/drawing.cpp

@@ -542,8 +542,8 @@ void Game::DrawMisc() {
 		}
 	}
 	//avatar image
-	driver->draw2DImage(imageManager.tAvatar[0], recti(335 * mainGame->xScale, 15 * mainGame->yScale, 390 * mainGame->xScale, 70 * mainGame->yScale), recti(0, 0, 55, 55), 0, 0, true);
-	driver->draw2DImage(imageManager.tAvatar[1], recti(930 * mainGame->xScale, 15 * mainGame->yScale, 985 * mainGame->xScale, 70 * mainGame->yScale), recti(0, 0, 55, 55), 0, 0, true);
+	driver->draw2DImage(imageManager.tAvatar[0], recti(335 * mainGame->xScale, 15 * mainGame->yScale, 390 * mainGame->xScale, 70 * mainGame->yScale), recti(0, 0, 128, 128), 0, 0, true);
+	driver->draw2DImage(imageManager.tAvatar[1], recti(930 * mainGame->xScale, 15 * mainGame->yScale, 985 * mainGame->xScale, 70 * mainGame->yScale), recti(0, 0, 128, 128), 0, 0, true);
 	if((dInfo.turn % 2 && dInfo.isFirst) || (!(dInfo.turn % 2) && !dInfo.isFirst)) {
 		driver->draw2DImage(imageManager.tLPBarFrame, recti(327 * mainGame->xScale, 8 * mainGame->yScale, 630 * mainGame->xScale, 78 * mainGame->yScale), recti(0, 0, 305, 70), 0, 0, true);
 		driver->draw2DImage(imageManager.tLPBarFrame, recti(689 * mainGame->xScale, 8 * mainGame->yScale, 991 * mainGame->xScale, 78 * mainGame->yScale), recti(0, 210, 305, 280), 0, 0, true);

mobile/src/main/java/cn/garymb/ygomobile/ui/preference/fragments/SettingFragment.java

@@ -313,7 +313,7 @@ public class SettingFragment extends PreferenceFragmentPlus {
         String key = preference.getKey();
         if (Constants.DEBUG)
             Log.i("kk", "onChooseFileOk:" + key + ",file=" + file);
-        if (SETTINGS_COVER.equals(key) || SETTINGS_CARD_BG.equals(key)) {
+        if (SETTINGS_AVATAR.equals(key) || SETTINGS_COVER.equals(key) || SETTINGS_CARD_BG.equals(key)) {
             super.onChooseFileOk(preference, file);
             onPreferenceClick(preference);
         } else if (PREF_GAME_PATH.equalsIgnoreCase(preference.getKey())) {

mobile/src/main/res/xml/preference_game.xml

@@ -77,10 +77,6 @@
 
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/settings_category_diy">
-        <Preference
-            android:key="pref_key_game_font_name"
-            android:persistent="true"
-            android:title="@string/settings_game_font_name"/>
 
         <Preference
             android:key="settings_game_avatar"
@@ -96,6 +92,12 @@
             android:key="settings_game_diy_card_bg"
             android:persistent="true"
             android:title="@string/settings_game_diy_cover"/>
+
+        <Preference
+            android:key="pref_key_game_font_name"
+            android:persistent="true"
+            android:title="@string/settings_game_font_name"/>
+
         <!--<CheckBoxPreference
             android:key="settings_game_diy_card_db"
             android:persistent="true"

mobile/src/mycard/java/cn/garymb/ygomobile/ui/online/mcchat/management/ServiceManagement.java

@@ -74,6 +74,7 @@ public class ServiceManagement
 			.setXmppDomain("mycard.moe")
 			.setKeystoreType(null)
 			.setSecurityMode(ConnectionConfiguration.SecurityMode.disabled)
+				.setHost("chat.mycard.moe")
 			.build();
 			con= new XMPPTCPConnection(config);
 		return con;

mobile/src/mycard/java/cn/garymb/ygomobile/ui/online/mcchat/util/ImageUtil.java

 package cn.garymb.ygomobile.ui.online.mcchat.util;
+import android.net.Uri;
 import android.widget.*;
 import com.bumptech.glide.*;
-import android.net.*;
 import android.content.*;
 import com.bumptech.glide.load.engine.*;