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
6e0f3482
Commit
6e0f3482
authored
Apr 02, 2021
by
Kim Peace
Browse files
Options
Browse Files
Download
Plain Diff
Merge commit '
37ce0f52
' into features/abcomm_sp5
# Conflicts: # gradle.properties
parents
e8258333
37ce0f52
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
41 additions
and
32 deletions
+41
-32
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/DBConnector.java
+1
-1
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/DatabaseVersions.java
+3
-0
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/TaskDao.java
+1
-2
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/TPushMessage.java
+6
-1
ABVJE_Launcher_Android/assets/chat
+1
-1
gradle.properties
+29
-27
No files found.
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/DBConnector.java
View file @
6e0f3482
...
...
@@ -19,7 +19,7 @@ import jp.agentec.abook.abv.bl.common.db.SQLiteDatabase;
public
class
DBConnector
{
private
static
volatile
DBConnector
dbConnector
=
null
;
public
static
final
String
DatabaseName
=
"ABVJE"
;
public
static
final
int
DatabaseVersion
=
DatabaseVersions
.
Ver1_2_36
0
;
public
static
final
int
DatabaseVersion
=
DatabaseVersions
.
Ver1_2_36
2
;
protected
SQLiteDatabase
db
=
null
;
...
...
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/DatabaseVersions.java
View file @
6e0f3482
...
...
@@ -8,5 +8,8 @@ public class DatabaseVersions {
public
static
final
int
Ver1_2_3
=
22
;
//連続作業機能追加
public
static
final
int
Ver1_2_360
=
23
;
//チャット機能追加(1.2.360障害対応。)
public
static
final
int
Ver1_2_362
=
24
;
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/TaskDao.java
View file @
6e0f3482
...
...
@@ -158,7 +158,7 @@ public class TaskDao extends AbstractDao {
}
/**
* 作業削除
* 作業削除
(連続作業でない場合)
* @param taskKey
*/
public
void
deleteTaskData
(
String
taskKey
)
{
...
...
@@ -167,7 +167,6 @@ public class TaskDao extends AbstractDao {
delete
(
"t_task_report"
,
"task_key=?"
,
keyValues
);
delete
(
"t_task_report_items"
,
"task_key=?"
,
keyValues
);
delete
(
"t_task_report_send"
,
"task_key=?"
,
keyValues
);
delete
(
"t_task_report_approval"
,
"task_key=?"
,
keyValues
);
}
/**
* 作業削除(連続作業用)
...
...
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/TPushMessage.java
View file @
6e0f3482
...
...
@@ -40,7 +40,12 @@ public class TPushMessage extends SQLiteTableScript {
@Override
public
List
<
String
>
getUpgradeScript
(
int
oldVersion
,
int
newVersion
)
{
return
null
;
List
<
String
>
ddl
=
new
ArrayList
<
String
>();
if
(
oldVersion
<
DatabaseVersions
.
Ver1_2_362
)
{
ddl
.
add
(
"ALTER TABLE t_push_message ADD COLUMN room_id BIGINT "
);
ddl
.
add
(
"ALTER TABLE t_push_message ADD COLUMN room_name VARCHAR(128) "
);
}
return
ddl
;
}
@Override
...
...
chat
@
d3ad4728
Subproject commit
86aeab7cc35f7886982389776a8450a4c5e82d2a
Subproject commit
d3ad472816b928beca1345573ec32d9ab18c58ce
gradle.properties
View file @
6e0f3482
...
...
@@ -42,11 +42,13 @@ app_versioncode=1
#download_server_address=http://10.0.2.2:8081/acms
acms_address
=
https://chatdev2.agentec.jp/acms
download_server_address
=
https://chatdev2.agentec.jp/acms
#acms_address=https://check.abookcloud.com/acms
#download_server_address=https://check.abookcloud.com/acms
#syncview server
websocket_server_http_url
=
https://chatdev2.agentec.jp/v1
websocket_server_ws_url
=
wss://chatdev2.agentec.jp/v1
#WebSocket debug
出力
#WebSocket debug
�o��
websocket_debug
=
false
#Payment Settings
...
...
@@ -56,40 +58,40 @@ google_public_key3=LShEIudH7Q7jLZERczfa0PknZCC5I3G0bTNa/EndTMLIR6/W3DLHToDk5L5Nk
#Application Settings
app_name
=
ABook Check
#true:
スリープ禁止, false:スリープ許可
#true:
�X���[�v�֎~, false:�X���[�v����
keep_screen
=
false
scheme_url
=
jp.agentec.abook.check
#true:
自動バージョン確認を行わない false:CMSへ自動バージョン確認を行う
#true:
�����o�[�W�����m�F���s��Ȃ� false�FCMS�֎����o�[�W�����m�F���s��
store_version
=
false
product_code
=
1
#
コンテンツリソースをcacheフォルダに展開するかしないか
#
�R���e���c���\�[�X��cache�t�H���_�ɓW�J���邩���Ȃ���
use_cache
=
true
#
コンテンツリソースをcacheフォルダに展開する数
#
�R���e���c���\�[�X��cache�t�H���_�ɓW�J���鐔
cache_size
=
0
#
コンテンツのHead暗号化するかしないか
#
�R���e���c��Head�Í������邩���Ȃ���
content_protected
=
true
#use_cache
と同様にPDFサムネイルimageをファイル化するかしないか
#use_cache
�Ɠ��l��PDF�T���l�C��image���t�@�C�������邩���Ȃ���
pdf_thumbnail_output
=
true
#use_cache
と同様にPDFページimageをファイル化するかしないか
#use_cache
�Ɠ��l��PDF�y�[�Wimage���t�@�C�������邩���Ȃ���
pdf_image_output
=
true
#
自動新着更新間隔(分) -1のとき自動更新しない
#
�����V���X�V�Ԋu(��) -1�̂Ƃ������X�V���Ȃ�
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.36
0
release_date
=
202
0/09/09
#Setting Info(
�ݒ��ʂ�ABook�ɂ��Ă̐ݒ���)
version_name
=
1.2.36
2
release_date
=
202
1/01/27
copy_right
=
2016 AGENTEC Co.,Ltd. All rights reserved.
hope_page
=
http://www.agentec.jp
contact_email
=
abook-appsupport@agentec.jp
...
...
@@ -97,10 +99,10 @@ contact_email=abook-appsupport@agentec.jp
#Log Settings
log_level
=
0
default_log_name
=
abvje
#
エラーレポート/Exportログ送信方法 1:acms 2:平文メール(開発・テスト時のみ) 3:暗号化添付メール
#
�G���[���|�[�g/Export���O���M���@ 1:acms 2:�������[���i�J���E�e�X�g���̂݁j 3:�Í����Y�t���[��
error_report_flg
=
1
error_report_email
=
abook-appsupport@agentec.jp
#
アプリ専用ログ保存期間(日)(0はログ出力なし
)
#
�A�v����p���O�ۑ����ԁi���j(0�̓��O�o�͂Ȃ�)
app_log_retention
=
7
hprof
=
false
...
...
@@ -109,26 +111,26 @@ repository_fqdn=s.abook.bz
# abvFunctionOptions.xml
#Login
#0:
認証なし, 1:ログインID、パスワード, 2:アカウント文字列、ログインID、パスワード, 3:サイトID、アカウント文字列、ログインID、パスワード4:サイトID、アカウント文字列
#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������
login_mode
=
2
#login_mode
が0、1の場合のアカウントパス
#login_mode
��0�A1�̏ꍇ�̃A�J�E���g�p�X
account_path
=
agtcatalog
#GCM
push_message
=
1
#
手動更新
#0:
非表示 1:表示
1.3.1
#
�蓮�X�V
#0:
��\�� 1:�\��
1.3.1
check_app_update
=
1
#
ユーザ切り替え時全社グループのコンテンツを削除しない
#0:
全てのコンテンツ削除 1:全社のコンテンツ削除しない
1.5.3
#
���[�U��ւ����S�ЃO���[�v�̃R���e���c���폜���Ȃ�
#0:
�S�ẴR���e���c�폜 1:�S�Ђ̃R���e���c�폜���Ȃ� 1
.5.3
not_delete_all_contents
=
0
BLJAR_NAME
=
ABVJE_BL.jar
#store
用の場合、armv7,x86両方ビルド
#store
ではない場合、armv7のみビルド
#store
�p�̏ꍇ�Aarmv7,x86�����r���h
#store
�ł͂Ȃ��ꍇ�Aarmv7�̂݃r���h
isStoreProduct
=
false
#1.2.302 Edition
...
...
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