Skip to content

A
abook_check
Commit 1daa74dc by Lee Munkyeong
Options

Merge branch 'features/abcomm_sp6' of… 

Merge branch 'features/abcomm_sp6' of https://gitlab.agentec.jp/abook_android/abook_check into features/abcomm_sp6_document_collaboration
parents 08b20c80 bc84c3d7
Showing with 72 additions and 56 deletions
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/ChatRoomDao.java
......@@ -175,6 +175,7 @@ public class ChatRoomDao extends AbstractCommunicationDao {
for (ChatRoomDto chatRoomDto : chatRoomDtoList) {
roomIdList.add(chatRoomDto.chatRoomId);
insertChatRoom(chatRoomDto);
deleteChatRoomUsers(chatRoomDto.chatRoomId);
insertChatRoomUsers(chatRoomDto.attendUsers, chatRoomDto.chatRoomId);
}
update("delete from t_chat_room where chat_room_id NOT IN (" + StringUtil.join(" , ", roomIdList) + ")", null);
......@@ -187,12 +188,15 @@ public class ChatRoomDao extends AbstractCommunicationDao {
}
public void insertChatRoomUsers(List<Integer> attendUsers, Integer chatRoomId) {
update("delete from r_chat_room_shop_member where chat_room_id = ?", new Integer[]{chatRoomId});
for (Integer attendUserId : attendUsers) {
insert("insert or replace into r_chat_room_shop_member (chat_room_id, shop_member_id) values (?,?)", new Integer[]{chatRoomId, attendUserId});
}
}
public void deleteChatRoomUsers(Integer chatRoomId) {
update("delete from r_chat_room_shop_member where chat_room_id = ?", new Integer[]{chatRoomId});
}
public boolean updateChatRoom(ChatRoomDto dto) {
long count = update("update t_chat_room set chat_room_name=?, type=?, unread_count=?, user_count=?, favorite_register_date=? where chat_room_id=?", dto.getUpdateValues());
return count > 0;
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/CommunicationLogic.java
......@@ -189,6 +189,7 @@ public class CommunicationLogic extends AbstractLogic {
groupPathJsonArray.put(jsonObject);
}
resultJson.put(ABookCommConstants.KEY.SHOP_MEMBER_ID, shopMemberDto.shopMemberId);
resultJson.put(ABookCommConstants.KEY.LOGIN_ID, shopMemberDto.loginId);
resultJson.put(ABookCommConstants.KEY.SHOP_MEMBER_NAME, shopMemberDto.shopMemberName);
resultJson.put(ABookCommConstants.KEY.PROFILE_URL, getProfileUrlPath(shopMemberDto.profileUrl));
resultJson.put(ABookCommConstants.KEY.GROUP_PATH_LIST, groupPathJsonArray);
......
chat @ de7a33d3
Subproject commit d2a3c40e46287e1d3869fdc7aaeff3195cb4ae59
Subproject commit de7a33d34ccf3a0307abe0c4bfbb0be2f233b54f
ABVJE_Res_Default_Android/res/values-ja/strings.xml
......@@ -1479,6 +1479,7 @@
<string name="msg_error_chat_name_has_invalid_character">特殊文字 ;/?:@&amp;=+$,-_.!~*\'()#\\\"` はルーム名に含めることができません。</string>
<string name="msg_error_chat_room_sc_forbidden">認証に失敗しました。再度ログインが必要です。</string>
<string name="msg_error_already_exist_same_room">同じルームが既に存在します。</string>
<string name="msg_confirm_send_host_change">ホスト権限を渡しますか？</string>
<!-- 連続作業 -->
<string name="msg_error_all_process_delete">全削除の送信に失敗しました。</string>
......
ABVJE_Res_Default_Android/res/values-ko/strings.xml
......@@ -1486,4 +1486,5 @@
<string name="msg_error_chat_room_sc_forbidden">사용자 정보를 확인할 수 없습니다. 다시 로그인하시기 바랍니다.</string>
<string name="msg_error_all_process_delete">모두 삭제 송신에 실패하였습니다.</string>
<string name="msg_error_already_exist_same_room">동일한 채팅방이 이미 존재합니다.</string>
<string name="msg_confirm_send_host_change">방장 권한을 전달 받으시겠습니까?</string>
</resources>
\ No newline at end of file
ABVJE_Res_Default_Android/res/values/strings.xml
......@@ -1483,4 +1483,5 @@
<string name="msg_error_chat_room_sc_forbidden">Failed to authenticate. Please login again.</string>
<string name="msg_error_all_process_delete">Failed to send all deletes.</string>
<string name="msg_error_already_exist_same_room">Already exist same room.</string>
<string name="msg_confirm_send_host_change">Do you want to receive host permissions?</string>
</resources>
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebviewActivity.java
......@@ -401,10 +401,9 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
message = getString(R.string.msg_chat_confirm_delete);
} else if (message.equals("error_already_exist_same_user")) {
message = getString(R.string.msg_error_already_exist_same_room);
} else {
message = message;
} else if (message.equals("방장 권한을 전달 받으시겠습니까?")){
message = getString(R.string.msg_confirm_send_host_change);
}
ABookAlertDialog confirmAlert = AlertDialogUtil.createAlertDialog(ChatWebviewActivity.this, R.string.app_name);
confirmAlert.setMessage(message);
......@@ -431,7 +430,6 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
});
confirmAlert.setCancelable(false);
showAlertDialog(confirmAlert);
return true;
}
});
......@@ -915,7 +913,7 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
}
@JavascriptInterface
public void createChatRoom(String roomType, String userIdList, String encodedRoomName, String screenFlg) throws NetworkDisconnectedException, AcmsException {
public void createChatRoom(String roomType, String userIdList, String encodedRoomName, String screenFlg, boolean isVoice) throws NetworkDisconnectedException, AcmsException {
CreatedRoomJSON resultJson = AcmsClient.getInstance(ABVEnvironment.getInstance().networkAdapter).createRoom(sid, roomType, userIdList, encodedRoomName, loginId);
if (ABookCommConstants.FLAG.SCREEN_FLG.MAKE_ROOM.equals(Integer.parseInt(screenFlg))) {
final ChatRoomDto chatRoomDto = communicationLogic.getChatRoom(resultJson.chatRoomDto.chatRoomId);
......@@ -933,12 +931,23 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
communicationLogic.addUserInRoom(StringUtil.join(",", userIdList, shopMemberId.toString()), resultJson.chatRoomDto.chatRoomId);
final Integer chatRoomId = resultJson.chatRoomDto.chatRoomId;
final String chatRoomName = resultJson.chatRoomDto.chatRoomName;
mChatWebView.post(new Runnable() {
@Override
public void run() {
mChatWebView.loadUrl(String.format("javascript:CHAT_UI.joinRoom('%s', '%s');", chatRoomId, chatRoomName));
}
});
if (isVoice) {
roomId = chatRoomId.longValue();
roomName = chatRoomName;
mChatWebView.post(new Runnable() {
@Override
public void run() {
mChatWebView.loadUrl(String.format("javascript:CHAT_UI.startCollaboration('%s');", ABookCommConstants.FLAG.COLLABORATION_TYPE.AUDIO));
}
});
} else {
mChatWebView.post(new Runnable() {
@Override
public void run() {
mChatWebView.loadUrl(String.format("javascript:CHAT_UI.joinRoom('%s', '%s');", chatRoomId, chatRoomName));
}
});
}
}
@JavascriptInterface
......@@ -980,16 +989,18 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
}
@JavascriptInterface
public void inviteUsers(String userIds) throws NetworkDisconnectedException, AcmsException {
public void inviteUsers(String userIds, boolean isCollaboration) throws NetworkDisconnectedException, AcmsException {
final UserInviteResultJSON result = AcmsClient.getInstance(ABVEnvironment.getInstance().networkAdapter).inviteUsers(sid, roomId.intValue(), roomName, userIds);
if (result.roomId == null) {
communicationLogic.addUserInRoom(userIds, roomId.intValue());
mChatWebView.post(new Runnable() {
@Override
public void run() {
mChatWebView.loadUrl(CHAT_ROOM_PAGE_URL);
}
});
if (!isCollaboration) {
mChatWebView.post(new Runnable() {
@Override
public void run() {
mChatWebView.loadUrl(CHAT_ROOM_PAGE_URL);
}
});
}
} else {
mChatWebView.post(new Runnable() {
@Override
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/PreSplashActivity.java
......@@ -17,8 +17,8 @@ public class PreSplashActivity extends Activity {
try {
// アーキテクチャがx86以外の場合のみ、以下のライブラリをロードする。
if (!Build.CPU_ABI.contains("x86")) {
System.loadLibrary("skia_android");
System.loadLibrary("ozrv");
// System.loadLibrary("skia_android");
// System.loadLibrary("ozrv");
}
} catch (Exception e) {
e.printStackTrace();
......
gradle.properties
......@@ -38,17 +38,13 @@ app_versioncode=1
# abvEnvironments.xml
#cms server
#acms_address=http://10.0.2.2:8081/acms
#download_server_address=http://10.0.2.2:8081/acms
acms_address=https://checkdev1.agentec.jp/acms
download_server_address=https://checkdev1.agentec.jp/acms
#acms_address=https://check.abookcloud.com/acms
#download_server_address=https://check.abookcloud.com/acms
acms_address=https://check.abookcloud.com/acms
download_server_address=https://check.abookcloud.com/acms
#syncview server
websocket_server_http_url=https://checkdev1.agentec.jp/v1
websocket_server_ws_url=wss://checkdev1.agentec.jp/v1
#WebSocket debug�o��
#WebSocket debug出力
websocket_debug=false
#Payment Settings
......@@ -58,51 +54,51 @@ google_public_key3=LShEIudH7Q7jLZERczfa0PknZCC5I3G0bTNa/EndTMLIR6/W3DLHToDk5L5Nk
#Application Settings
app_name=ABook Check
#true:�X���[�v�֎~, false:�X���[�v����
#true:スリープ禁止, false:スリープ許可
keep_screen=false
scheme_url=jp.agentec.abook.check
#true:�����o�[�W�����m�F���s��Ȃ� false�FCMS�֎����o�[�W�����m�F���s��
#true:自動バージョン確認を行わない false：CMSへ自動バージョン確認を行う
store_version=false
product_code=1
#�R���e���c���\�[�X��cache�t�H���_�ɓW�J���邩���Ȃ���
#コンテンツリソースをcacheフォルダに展開するかしないか
use_cache=true
#�R���e���c���\�[�X��cache�t�H���_�ɓW�J���鐔
#コンテンツリソースをcacheフォルダに展開する数
cache_size=0
#�R���e���c��Head�Í������邩���Ȃ���
#コンテンツのHead暗号化するかしないか
content_protected=true
#use_cache�Ɠ��l��PDF�T���l�C��image���t�@�C�������邩���Ȃ���
#use_cacheと同様にPDFサムネイルimageをファイル化するかしないか
pdf_thumbnail_output=true
#use_cache�Ɠ��l��PDF�y�[�Wimage���t�@�C�������邩���Ȃ���
#use_cacheと同様にPDFページimageをファイル化するかしないか
pdf_image_output=true
#�����V���X�V�Ԋu(��) -1�̂Ƃ������X�V���Ȃ�
#自動新着更新間隔(分) -1のとき自動更新しない
content_refresh_interval=30
#�A�v���ُ�I������c���ē����A���[�g�\������(��)
#アプリ異常終了時会議室再入室アラート表示期限(分)
meeting_reenter_alert=1440
#�����菬�����{������(�b)�̃y�[�W���O�͑��M���Ȃ�
#これより小さい閲覧時間(秒)のページログは送信しない
min_page_log_second=3
#���j���[�\�����T�[�r�X�I�v�V�����ɏ]��
#メニュー表示をサービスオプションに従う
follow_service_option=true
#�p�X���[�h���s���̉񐔃`�F�b�N���s�����ۂ�
#パスワード失敗時の回数チェックを行うか否か
is_check_invalid_passward_limit=true
#���s�[�g�Đ��̃f�t�H���g�l
#リピート再生のデフォルト値
repeat_default=true
#Setting Info(�ݒ��ʂ�ABook�ɂ‚��Ă̐ݒ���)
version_name=1.2.362
release_date=2021/01/27
#Setting Info(設定画面のABookについての設定情報)
version_name=1.3.000
release_date=2021/04/27
copy_right=2016 AGENTEC Co.,Ltd. All rights reserved.
hope_page=http://www.agentec.jp
contact_email=abook-appsupport@agentec.jp
#Log Settings
log_level=0
log_level=2
default_log_name=abvje
#�G���[���|�[�g/Export���O���M���@ 1:acms 2:�������[���i�J���E�e�X�g���̂݁j 3:�Í����Y�t���[��
#エラーレポート/Exportログ送信方法 1:acms 2:平文メール（開発・テスト時のみ） 3:暗号化添付メール
error_report_flg=1
error_report_email=abook-appsupport@agentec.jp
#�A�v����p���O�ۑ����ԁi���j(0�̓��O�o�͂Ȃ�)
#アプリ専用ログ保存期間（日）(0はログ出力なし)
app_log_retention=7
hprof=false
......@@ -111,26 +107,26 @@ repository_fqdn=s.abook.bz
# abvFunctionOptions.xml
#Login
#0:�F�؂Ȃ�, 1:���O�C��ID�A�p�X���[�h, 2:�A�J�E���g������A���O�C��ID�A�p�X���[�h, 3:�T�C�gID�A�A�J�E���g������A���O�C��ID�A�p�X���[�h4:�T�C�gID�A�A�J�E���g������
#0:認証なし, 1:ログインID、パスワード, 2:アカウント文字列、ログインID、パスワード, 3:サイトID、アカウント文字列、ログインID、パスワード4:サイトID、アカウント文字列
login_mode=2
#login_mode��0�A1�̏ꍇ�̃A�J�E���g�p�X
#login_modeが0、1の場合のアカウントパス
account_path=agtcatalog
#GCM
push_message=1
#�蓮�X�V
#0:��\�� 1:�\�� 1.3.1
#手動更新
#0:非表示 1:表示 1.3.1
check_app_update=1
#���[�U�؂�ւ����S�ЃO���[�v�̃R���e���c���폜���Ȃ�
#0:�S�ẴR���e���c�폜 1:�S�Ђ̃R���e���c�폜���Ȃ� 1.5.3
#ユーザ切り替え時全社グループのコンテンツを削除しない
#0:全てのコンテンツ削除 1:全社のコンテンツ削除しない 1.5.3
not_delete_all_contents=0
BLJAR_NAME=ABVJE_BL.jar
#store�p�̏ꍇ�Aarmv7,x86�����r���h
#store�ł͂Ȃ��ꍇ�Aarmv7�̂݃r���h
#store用の場合、armv7,x86両方ビルド
#storeではない場合、armv7のみビルド
isStoreProduct=false
#1.2.302 Edition
......
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