Commit 5b22d85f by Takuya Ogawa

Merge branch 'features/1.3.0_chat' into 'features/1.3.0'

- チャット

See merge request !41
parents 60263df3 9855ece4
......@@ -552,3 +552,8 @@ a.article:hover {
#chatKeywordSearch {
font-size : 1.2rem;
}
.message_content {
white-space: pre-wrap;
word-wrap: break-word;
}
......@@ -1428,4 +1428,5 @@
<string name="msg_error_chat_room_not_found">既に削除されたチャットルームです。</string>
<string name="msg_error_chat_500">チャットサーバーでシステムエラーが発生しました。</string>
<string name="msg_error_chat_join">チャットサーバーと接続に失敗しました。\n再度操作してください。</string>
<string name="msg_error_chat_text_length">メッセージの長さは0です。1文字以上を入力してください。</string>
</resources>
......@@ -1436,4 +1436,5 @@
<string name="msg_error_chat_room_not_found">이미 삭제된 채팅룸입니다.</string>
<string name="msg_error_chat_500">채팅 서버에서 시스템 오류가 발생했습니다.</string>
<string name="msg_error_chat_join">채팅서버 접속에 실패했습니다.\n다시 접속을 시도해보시기 바랍니다.</string>
<string name="msg_error_chat_text_length">메시지 길이가 0입니다. 한글자 이상의 문자를 입력하십시오.</string>
</resources>
\ No newline at end of file
......@@ -1654,7 +1654,7 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
String className = ChatWebviewActivity.class.getName();
boolean isNormalSize = (mContext.getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) == Configuration.SCREENLAYOUT_SIZE_NORMAL;
Intent intent = new Intent();
intent.putExtra("chatWebviewUrl","file:///android_asset/chat/public/" + getLocaleFileName());
intent.putExtra("chatWebviewUrl","file:///android_asset/chat/public/newstart.html");
String sid = ABVDataCache.getInstance().getMemberInfo().sid;
intent.putExtra("sid", sid);
String loginId = ABVDataCache.getInstance().getMemberInfo().loginId;
......
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