Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
abook_check
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abook_android
abook_check
Commits
5b22d85f
Commit
5b22d85f
authored
Nov 25, 2019
by
Takuya Ogawa
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'features/1.3.0_chat' into 'features/1.3.0'
- チャット See merge request
!41
parents
60263df3
9855ece4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
1 deletions
+9
-1
ABVJE_Launcher_Android/assets/chat/public/css/chat.css
+5
-0
ABVJE_Res_Default_Android/res/values-ja/strings.xml
+1
-0
ABVJE_Res_Default_Android/res/values-ko/strings.xml
+2
-0
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ActivityHandlingHelper.java
+1
-1
No files found.
ABVJE_Launcher_Android/assets/chat/public/css/chat.css
View file @
5b22d85f
...
...
@@ -552,3 +552,8 @@ a.article:hover {
#chatKeywordSearch
{
font-size
:
1.2rem
;
}
.message_content
{
white-space
:
pre-wrap
;
word-wrap
:
break-word
;
}
ABVJE_Res_Default_Android/res/values-ja/strings.xml
View file @
5b22d85f
...
...
@@ -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>
ABVJE_Res_Default_Android/res/values-ko/strings.xml
View file @
5b22d85f
...
...
@@ -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
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ActivityHandlingHelper.java
View file @
5b22d85f
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment