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
ab39aee0
Commit
ab39aee0
authored
Aug 06, 2021
by
Peace
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed to not hide name card when favorite add or removed
parent
58027879
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
33 deletions
+16
-33
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebViewActivity.java
+16
-29
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/view/ChatWebView.java
+0
-4
No files found.
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebViewActivity.java
View file @
ab39aee0
...
...
@@ -1176,17 +1176,12 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity implements
}
public
boolean
addFavoriteUser
(
String
shopMemberId
)
throws
AcmsException
{
Integer
favoriteCount
=
communicationLogic
.
getFavoriteCount
();
if
(
favoriteCount
>=
ABookCommConstants
.
SIZE
.
MAX_FAVORITE_COUNT
)
{
mChatWebView
.
showAlert
(
getString
(
R
.
string
.
msg_error_favorites_100_over
));
if
(!
validateFavoriteLimit
())
{
return
false
;
}
try
{
boolean
result
=
chatData
.
insertFavoriteUser
(
shopMemberId
);
if
(!
result
)
{
return
false
;
}
mChatWebView
.
refreshContactScreen
();
return
true
;
return
chatData
.
insertFavoriteUser
(
shopMemberId
);
}
catch
(
NetworkDisconnectedException
e
)
{
mChatWebView
.
showAlert
(
getString
(
R
.
string
.
msg_eroor_network_offline
));
}
...
...
@@ -1196,12 +1191,7 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity implements
public
boolean
removeFavoriteUser
(
String
shopMemberId
)
throws
AcmsException
{
try
{
boolean
result
=
chatData
.
deleteFavoriteUser
(
shopMemberId
);
if
(!
result
)
{
return
false
;
}
mChatWebView
.
refreshContactScreen
();
return
true
;
return
chatData
.
deleteFavoriteUser
(
shopMemberId
);
}
catch
(
NetworkDisconnectedException
e
)
{
mChatWebView
.
showAlert
(
getString
(
R
.
string
.
msg_eroor_network_offline
));
}
...
...
@@ -1209,19 +1199,12 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity implements
}
public
boolean
addFavoriteGroup
(
String
groupId
)
throws
AcmsException
{
Integer
favoriteCount
=
communicationLogic
.
getFavoriteCount
();
if
(
favoriteCount
>=
ABookCommConstants
.
SIZE
.
MAX_FAVORITE_COUNT
)
{
mChatWebView
.
showAlert
(
getString
(
R
.
string
.
msg_error_favorites_100_over
));
if
(!
validateFavoriteLimit
())
{
return
false
;
}
try
{
boolean
result
=
chatData
.
insertFavoriteGroup
(
groupId
);
if
(!
result
)
{
return
false
;
}
mChatWebView
.
refreshContactScreen
();
return
true
;
return
chatData
.
insertFavoriteGroup
(
groupId
);
}
catch
(
NetworkDisconnectedException
e
)
{
mChatWebView
.
showAlert
(
getString
(
R
.
string
.
msg_eroor_network_offline
));
}
...
...
@@ -1231,12 +1214,7 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity implements
public
boolean
removeFavoriteGroup
(
String
groupId
)
throws
AcmsException
{
try
{
boolean
result
=
deleteFavoriteGroup
(
groupId
);
if
(!
result
)
{
return
false
;
}
mChatWebView
.
refreshContactScreen
();
return
true
;
return
deleteFavoriteGroup
(
groupId
);
}
catch
(
NetworkDisconnectedException
e
)
{
mChatWebView
.
showAlert
(
getString
(
R
.
string
.
msg_eroor_network_offline
));
}
...
...
@@ -1247,6 +1225,15 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity implements
chatData
.
updateFavoriteInfo
();
}
private
boolean
validateFavoriteLimit
()
{
Integer
favoriteCount
=
communicationLogic
.
getFavoriteCount
();
if
(
favoriteCount
>=
ABookCommConstants
.
SIZE
.
MAX_FAVORITE_COUNT
)
{
mChatWebView
.
showAlert
(
getString
(
R
.
string
.
msg_error_favorites_100_over
));
return
false
;
}
return
true
;
}
public
int
createContentView
()
{
finishBeforeContentListActivity
();
PictureInPictureParams
.
Builder
mPipBuilder
=
new
PictureInPictureParams
.
Builder
();
...
...
@@ -1294,7 +1281,7 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity implements
meetingManager
.
close
();
try
{
connectMeetingServer
();
List
<
MeetingDto
>
meetingList
=
meetingManager
.
getMeetingList
(
mSkey
);
List
<
MeetingDto
>
meetingList
=
meetingManager
.
getMeetingList
(
mSkey
);
meetingManager
.
join
(
chatData
.
joinMeetingId
,
mSkey
,
chatData
.
roomId
.
toString
(),
false
);
meetingManager
.
setCollaboration
(
true
);
}
catch
(
Exception
e
)
{
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/view/ChatWebView.java
View file @
ab39aee0
...
...
@@ -640,8 +640,4 @@ public class ChatWebView extends WebView {
public
void
startAudioCollaboration
()
{
loadChatViewUrl
(
String
.
format
(
"javascript:Common.startCollaboration('%s');"
,
ABookCommConstants
.
FLAG
.
COLLABORATION_TYPE
.
AUDIO
));
}
public
void
refreshContactScreen
()
{
loadChatViewUrl
(
"javascript:Common.refreshContactScreen();"
);
}
}
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