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
1ecfdc06
Commit
1ecfdc06
authored
Apr 13, 2021
by
Lee Munkyeong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
プッシュメッセージボタン追加。
parent
b5e324fe
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
6 deletions
+21
-6
ABVJE_Res_Default_Android/res/values-ja/strings.xml
+1
-0
ABVJE_Res_Default_Android/res/values-ko/strings.xml
+1
-0
ABVJE_Res_Default_Android/res/values/strings.xml
+1
-0
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ShowPushMessageDailogActivity.java
+16
-4
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebviewActivity.java
+2
-2
No files found.
ABVJE_Res_Default_Android/res/values-ja/strings.xml
View file @
1ecfdc06
...
...
@@ -3,6 +3,7 @@
<string
name=
"progress"
>
Loading
…
</string>
<string
name=
"edit"
>
編集
</string>
<string
name=
"ok"
>
OK
</string>
<string
name=
"move"
>
遷移
</string>
<string
name=
"yes"
>
はい
</string>
<string
name=
"confirm"
>
確認
</string>
<string
name=
"no"
>
いいえ
</string>
...
...
ABVJE_Res_Default_Android/res/values-ko/strings.xml
View file @
1ecfdc06
...
...
@@ -3,6 +3,7 @@
<string
name=
"progress"
>
로딩
…
</string>
<string
name=
"edit"
>
편집
</string>
<string
name=
"ok"
>
OK
</string>
<string
name=
"move"
>
이동
</string>
<string
name=
"yes"
>
예
</string>
<string
name=
"confirm"
>
확인
</string>
<string
name=
"no"
>
아니오
</string>
...
...
ABVJE_Res_Default_Android/res/values/strings.xml
View file @
1ecfdc06
...
...
@@ -3,6 +3,7 @@
<string
name=
"progress"
>
Loading
…
</string>
<string
name=
"edit"
>
Edit
</string>
<string
name=
"ok"
>
OK
</string>
<string
name=
"move"
>
Move
</string>
<string
name=
"yes"
>
Yes
</string>
<string
name=
"confirm"
>
Confirm
</string>
<string
name=
"no"
>
No
</string>
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ShowPushMessageDailogActivity.java
View file @
1ecfdc06
...
...
@@ -113,10 +113,9 @@ public class ShowPushMessageDailogActivity extends ABVUIActivity {
alertDialog
.
show
();
}
else
{
final
ABookAlertDialog
alertDialog
=
AlertDialogUtil
.
createAlertDialog
(
ShowPushMessageDailogActivity
.
this
,
getRString
(
R
.
string
.
app_name
),
getIntent
().
getExtras
().
getString
(
PushMessageKey
.
message
));
alertDialog
.
setPositiveButton
(
R
.
string
.
ok
,
null
);
alertDialog
.
setOnDismissListener
(
new
DialogInterface
.
OnDismissListener
()
{
@Override
public
void
onDismiss
(
DialogInterface
dialog
)
{
alertDialog
.
setPositiveButton
(
R
.
string
.
move
,
new
DialogInterface
.
OnClickListener
()
{
@Override
public
void
onClick
(
DialogInterface
dialog
,
int
which
)
{
// Check PushMessage
Bundle
extras
=
getIntent
().
getExtras
();
if
(
extras
!=
null
)
{
...
...
@@ -144,6 +143,19 @@ public class ShowPushMessageDailogActivity extends ABVUIActivity {
}
}
finish
();
}
});
alertDialog
.
setNegativeButton
(
R
.
string
.
cancel
,
new
DialogInterface
.
OnClickListener
()
{
@Override
public
void
onClick
(
DialogInterface
dialog
,
int
which
)
{
finish
();
}
});
alertDialog
.
setOnDismissListener
(
new
DialogInterface
.
OnDismissListener
()
{
@Override
public
void
onDismiss
(
DialogInterface
dialog
)
{
}
});
alertDialog
.
show
();
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebviewActivity.java
View file @
1ecfdc06
...
...
@@ -210,6 +210,8 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
Integer
integerRoomId
=
Integer
.
parseInt
(
roomId
.
toString
());
roomType
=
communicationLogic
.
getChatRoom
(
integerRoomId
).
type
.
toString
();
String
parameterData
=
"sid="
+
sid
+
"&loginId="
+
loginId
+
"&shopName="
+
shopName
+
"&roomId="
+
roomId
+
"&roomName="
+
roomName
+
fixedParam
;
mChatWebView
.
postUrl
(
CHAT_ROOM_PAGE_URL
,
parameterData
.
getBytes
());
}
...
...
@@ -225,8 +227,6 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
mChatWebView
.
setWebChromeClient
(
new
FullscreenableChromeClient
(
this
)
{
@Override
public
boolean
onShowFileChooser
(
WebView
webView
,
ValueCallback
<
Uri
[]>
filePathCallback
,
FileChooserParams
fileChooserParams
)
{
boolean
result
=
false
;
...
...
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