Skip to content

Y
YGOMobile-Cn-Ko-En
Commit 10b07aa3 authored by fallenstardust's avatar fallenstardust
Browse files
Options

启动聊天室

parent 10cf0ec0
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 39 deletions
mobile/build.gradle
View file @ 10b07aa3
......@@ -8,7 +8,7 @@ android {
applicationId "cn.garymb.ygomobile.test"
minSdkVersion 16
targetSdkVersion 22
versionCode 32010515
versionCode 32010516
versionName "3.2.1"
flavorDimensions "versionCode"
vectorDrawables.useSupportLibrary = true
......@@ -61,11 +61,6 @@ android {
dirs 'libs'
}
}
/*configurations {
all {
exclude group: 'xpp3', module: 'xpp3'
}
}*/
dependencies {
implementation 'junit:junit:4.12'
implementation project(':libcore')
......@@ -83,26 +78,6 @@ dependencies {
implementation 'com.tubb.smrv:swipemenu-recyclerview:5.4.0'
//
mycardImplementation(name: 'xwalk_core_library-22.52.561.4', ext: 'aar')
/*implementation 'org.igniterealtime.smack:smack-android-extensions:4.2.0'
implementation 'org.igniterealtime.smack:smack-tcp:4.2.0'
implementation 'org.igniterealtime.smack:smack-android:4.2.0'
implementation 'org.igniterealtime.smack:smack-core:4.2.0'
implementation 'org.igniterealtime.smack:smack-extensions:4.2.0'
implementation 'org.igniterealtime.smack:smack-im:4.2.0'
implementation 'org.igniterealtime.smack:smack-resolver-minidns:4.2.0'
implementation 'org.igniterealtime.smack:smack-sasl-provided:4.2.0'
//implementation 'xpp3:xpp3:1.1.4c'
implementation 'org.jxmpp:jxmpp-core:0.5.0'
implementation 'org.jxmpp:jxmpp-jid:0.5.0'
implementation 'org.jxmpp:jxmpp-util-cache:0.5.0'
implementation 'de.measite.minidns:minidns-hla:0.2.4'
implementation 'de.measite.minidns:minidns-core:0.2.4'
implementation 'de.measite.minidns:minidns-dnssec:0.2.4'
implementation 'de.measite.minidns:minidns-iterative-resolver:0.2.4'
implementation 'com.github.bumptech.glide:glide:3.7.0'*/
//
implementation 'com.nightonke:boommenu:2.1.0'
implementation fileTree(dir: 'libs', include: ['*.jar'])
......
mobile/src/main/res/values-ko/strings.xml
View file @ 10b07aa3
......@@ -179,7 +179,10 @@
<string name="mycard">MYcard</string>
<string name="arena">듀얼리스트db</string>
<string name="mc_home">홈화면</string>
<string name="mc_chat">채팅</string>
<string name="mc_chat">채팅룸</string>
<string name="noting_to_send">发送内容不能为空</string>
<string name="sending_failed">发送失败</string>
<string name="logining_in">로그인 중</string>
<string name="send">보내기</string>
<string name="bbs">커뮤니티</string>
<string name="settings_pref_settings_only_game">앱 실행시 YGOCORE 바로 실행(설정하지마십시오)</string>
......
mobile/src/main/res/values-zh/strings.xml
View file @ 10b07aa3
......@@ -178,6 +178,8 @@
<string name="mycard">萌卡平台</string>
<string name="arena">决斗数据库</string>
<string name="mc_chat">聊天室</string>
<string name="noting_to_send">发送内容不能为空</string>
<string name="sending_failed">发送失败</string>
<string name="send">发送</string>
<string name="mc_home">大厅</string>
<string name="bbs">社区</string>
......
mobile/src/main/res/values/strings.xml
View file @ 10b07aa3
......@@ -180,7 +180,10 @@
<string name="mycard">MyCard</string>
<string name="arena">Duelist DataBase</string>
<string name="mc_home">Home</string>
<string name="mc_chat">Chat</string>
<string name="mc_chat">ChatRoom</string>
<string name="noting_to_send">noting to send</string>
<string name="sending_failed">sending failed</string>
<string name="logining_in">Logining in</string>
<string name="send">Send</string>
<string name="bbs">Community</string>
<string name="settings_pref_settings_only_game">Only start game</string>
......
mobile/src/mycard/AndroidManifest.xml
View file @ 10b07aa3
......@@ -10,12 +10,13 @@
android:launchMode="singleTop"
android:theme="@style/AppTheme.Mycard"
android:windowSoftInputMode="stateAlwaysHidden|adjustResize"/>
<!--activity
<activity
android:name="cn.garymb.ygomobile.ui.online.mcchat.McchatActivity"
android:windowSoftInputMode="stateHidden|adjustResize"
android:label="@string/app_name"/>
<activity
android:name="cn.garymb.ygomobile.ui.online.mcchat.SplashActivity"/-->
android:name="cn.garymb.ygomobile.ui.online.mcchat.SplashActivity"/>
</application>
</manifest>
\ No newline at end of file
mobile/src/mycard/java/cn/garymb/ygomobile/ui/online/mcchat/McchatActivity.java
View file @ 10b07aa3
......@@ -2,7 +2,6 @@ package cn.garymb.ygomobile.ui.online.mcchat;
import android.app.*;
import android.os.*;
import android.util.*;
import org.jivesoftware.smack.packet.Message;
import android.widget.*;
......@@ -109,15 +108,14 @@ public class McchatActivity extends Activity implements ChatListener
{
String message=main_send_message.getText().toString().trim();
if(message.equals("")){
Util.show("发送内容不能为空");
Util.show(getString(R.string.noting_to_send));
}else{
try
{
su.sendMessage(message);
main_send_message.setText("");
}catch (Exception e){
Util.show("发送失败");
Log.e("错误","错误为"+e);
Util.show(getString(R.string.sending_failed));
}
}
// TODO: Implement this method
......
mobile/src/mycard/res/layout/activity_splash.xml
View file @ 10b07aa3
......@@ -5,7 +5,8 @@
android:layout_height="fill_parent"
android:orientation="horizontal"
android:gravity="center"
android:id="@+id/sp_li">
android:id="@+id/sp_li"
android:background="@color/white">
<ProgressBar
android:layout_height="wrap_content"
......@@ -15,7 +16,8 @@
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="登录中,请稍等"
android:text="@string/logining_in"
android:textColor="@color/dark_purple"
android:textSize="18sp"
android:id="@+id/sp_tv"/>
......
mobile/src/mycard/res/layout/item_chat.xml
View file @ 10b07aa3
......@@ -5,7 +5,7 @@
android:layout_height="wrap_content"
android:background="#00000000">
<com.mcchat.feihua.view.YuanImage
<cn.garymb.ygomobile.ui.online.mcchat.view.YuanImage
android:layout_height="35dp"
android:layout_width="35dp"
android:id="@+id/ic_avatar"
......
mobile/src/mycard/res/layout/item_chat_me.xml
View file @ 10b07aa3
......@@ -4,7 +4,7 @@
android:layout_height="wrap_content"
android:background="#00000000">
<com.mcchat.feihua.view.YuanImage
<cn.garymb.ygomobile.ui.online.mcchat.view.YuanImage
android:id="@+id/icm_avatar"
android:layout_width="35dp"
android:layout_height="35dp"
......
mobile/src/mycard/res/layout/main.xml
View file @ 10b07aa3
......@@ -16,7 +16,7 @@
android:textColor="@color/white"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/app_name"
android:text="@string/mc_chat"
android:layout_margin="10dp"
android:textSize="20sp"
android:id="@+id/main_title"/>
......@@ -45,6 +45,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textSize="15sp"
android:textColor="@color/black"
android:layout_weight="10"
android:maxEms="3"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment