Merge branch 'feature/contract/sato/1.0.300_51433_show_help' into 'contract/sato/1.0.300_dev'

ヘルプ表示の変更 See merge request !261

Merge branch 'feature/contract/sato/1.0.300_51433_show_help' into 'contract/sato/1.0.300_dev'
ヘルプ表示の変更 See merge request !261
660516f0 · Yujin Seo · b2b48d1c · 8ee9b599 · 660516f0 · 660516f0
Commit 660516f0 authored Jan 27, 2023 by Yujin Seo
7 changed files
--- a/ABVJE_BL/src/jp/agentec/abook/abv/bl/common/Constant.java
+++ b/ABVJE_BL/src/jp/agentec/abook/abv/bl/common/Constant.java
@@ -112,6 +112,7 @@ public class Constant {
 		int CommonContent = 15;
 		int RoutineTaskOperation = 16;
        int RoutineTaskOperationReport = 17;
+        int OperationDashboard = 13;
 	}
 	public interface XWalkWebViewDisplayStatus {

--- a/ABVJE_Res_Default_Android/res/values-ja/strings.xml
+++ b/ABVJE_Res_Default_Android/res/values-ja/strings.xml
@@ -398,7 +398,7 @@
    <string name="msg_help_pano_edit_add">撮影した360度パノラマ画像を@Formサーバに保存します。</string>
    <string name="msg_help_pano_edit_server_add">"@Formサーバへ保存した360度パノラマ画像（シーン）を追加します。レーダーマップの追加も行えます。</string>
    <string name="msg_help_pano_edit_server_save">シーン等を追加したら保存します。「一時保存」は端末内に一時的に保存、「保存」は@Formサーバへ変更情報が送信されます。</string>
-    <string name="msg_help_list_main">作業コードラベルの色は橙色が未完、青色が完了を表します。報告に進む場合は対象報告の枠内をタップしてください。</string>
+    <string name="msg_help_list_main">作業コードラベルの色は橙色が未実施、青色が作業中、緑色が作業完了を表します。報告に進む場合は対象報告の枠内をタップしてください</string>
    <string name="msg_help_director_report_search">検索ボックスに報告名を入力して、ボタンを押すと検索できます。</string>
    <string name="msg_help_director_add">新たに作業指示を追加します。</string>
    <string name="msg_help_director_edit">すでに登録してある指示内容を修正します。</string>
@@ -430,6 +430,10 @@
    <string name="msg_help_report_task_director_main">指示者が登録した内容が表示されます。</string>
    <string name="msg_help_report_task_director_input">作業報告画面を表示します。</string>
+    <string name="msg_help_report_locked">他のユーザが編集中の報告に表示されます。ボタンを押すとロックを解除できます。</string>
+    <string name="msg_help_report_send_back">承認プロセスで差し戻された報告に表示されます。</string>
+    <string name="msg_help_dashboard">ステータス別の報告件数を一括で確認できる画面です。各種ステータスをタップすると、対象の報告が一覧に表示されます。承認プロセスに入った報告は表示されません。報告に進む場合は対象の報告をタップしてください。</string>
    <string name="title_permission_dialog">アプリケーション権限</string>
    <string name="msg_permission_dialog_storage_update">アプリをバージョンアップする為、外部ストレージ利用権限が必要です。\nアプリ設定画面へ遷移します。</string>
    <string name="msg_permission_dialog_location">位置情報利用権限が必要です。\nアプリ設定画面へ遷移します。</string>
@@ -467,7 +471,6 @@
    <string name="recent_update_date">最後更新日付：%1$s</string>
    <string name="label_operation_report_type">種類</string>
-    <string name="label_operation_report_type_routineTask">点検</string>
    <string name="date_label_routineTask">作業期間</string>
    <string name="msg_no_report_data">作業データがありません。</string>
    <string name="msg_permission_dialog_mic">マイク利用権限が必要です。\nアプリ設定画面へ遷移します。</string>
@@ -668,7 +671,6 @@
    <string name="recent_update_date_1">最後更新日付(1)：%1$s</string>
    <string name="label_operation_report_type_1">種類(1)</string>
-    <string name="label_operation_report_type_routineTask_1">点検(1)</string>
    <string name="date_label_routineTask_1">作業期間(1)</string>
    <string name="msg_no_report_data_1">作業データがありません。(1)</string>
    <string name="msg_permission_dialog_mic_1">マイク利用権限が必要です。\nアプリ設定画面へ遷移します。(1)</string>
@@ -844,7 +846,6 @@
    <string name="recent_update_date_2">最後更新日付(2)：%1$s</string>
    <string name="label_operation_report_type_2">種類(2)</string>
-    <string name="label_operation_report_type_routineTask_2">点検(2)</string>
    <string name="date_label_routineTask_2">作業期間(2)</string>
    <string name="msg_no_report_data_2">作業データがありません。(2)</string>
    <string name="msg_permission_dialog_mic_2">マイク利用権限が必要です。\nアプリ設定画面へ遷移します。(2)</string>
@@ -1020,7 +1021,6 @@
    <string name="recent_update_date_3">最後更新日付(3)：%1$s</string>
    <string name="label_operation_report_type_3">種類(3)</string>
-    <string name="label_operation_report_type_routineTask_3">点検(3)</string>
    <string name="date_label_routineTask_3">作業期間(3)</string>
    <string name="msg_no_report_data_3">作業データがありません。(3)</string>
    <string name="msg_permission_dialog_mic_3">マイク利用権限が必要です。\nアプリ設定画面へ遷移します。(3)</string>
@@ -1196,7 +1196,6 @@
    <string name="recent_update_date_4">最後更新日付(4)：%1$s</string>
    <string name="label_operation_report_type_4">種類(4)</string>
-    <string name="label_operation_report_type_routineTask_4">点検(4)</string>
    <string name="date_label_routineTask_4">作業期間(4)</string>
    <string name="msg_no_report_data_4">作業データがありません。(4)</string>
    <string name="msg_permission_dialog_mic_4">マイク利用権限が必要です。\nアプリ設定画面へ遷移します。(4)</string>
@@ -1372,7 +1371,6 @@
    <string name="recent_update_date_5">最後更新日付(5)：%1$s</string>
    <string name="label_operation_report_type_5">種類(5)</string>
-    <string name="label_operation_report_type_routineTask_5">点検(5)</string>
    <string name="date_label_routineTask_5">作業期間(5)</string>
    <string name="msg_no_report_data_5">作業データがありません。(5)</string>
    <string name="msg_permission_dialog_mic_5">マイク利用権限が必要です。\nアプリ設定画面へ遷移します。(5)</string>

--- a/ABVJE_Res_Default_Android/res/values-ko/strings.xml
+++ b/ABVJE_Res_Default_Android/res/values-ko/strings.xml
@@ -45,7 +45,6 @@
    <string name="open">열기</string>
    <string name="close">닫기</string>
    <string name="change_password_ok">패스워드를 변경했습니다.</string>
-    <string name="content_text">자료본문</string>
    <string name="logout">로그아웃</string>
    <string name="logout_summary">어플리케이션에서 로그아웃합니다.</string>
    <string name="setting">설정</string>
@@ -399,7 +398,7 @@
    <string name="msg_help_pano_edit_add">촬영한 360도 파노라마 화면을 @Form 서버에 저장합니다.</string>
    <string name="msg_help_pano_edit_server_add">"@Form 서버에 저장된 360도 파노라마 화면(장면)을 추가합니다. 레이더 맵의 추가도 가능합니다.</string>
    <string name="msg_help_pano_edit_server_save">장면 등이 추가되면 저장합니다. [임시저장]은 단말에 일시적으로 저장되며, [저장]은 @Form 서버에 변경된 정보를 전송합니다.</string>
-    <string name="msg_help_list_main">작업 코드의 배경색은 작업 상황을 표시하며, 주황색이 미완료, 파란색이 완료를 나타냅니다. 작업을 보고 하기 위해서는 대상 작업 보고 표시 영역을 탭 해 주세요.</string>
+    <string name="msg_help_list_main">작업 코드 라벨의 색상은 주황색이 실행되지 않고 파란색이 작업 중이고 녹색이 작업 완료를 나타냅니다. 작업을 보고 하기 위해서는 대상 작업 보고 표시 영역을 탭 해 주세요.</string>
    <string name="msg_help_director_report_search">검색창에 보고명을 입력한 후 검색 버튼을 누르면 검색이 됩니다.</string>
    <string name="msg_help_director_add">새로운 작업지시를 추가합니다.</string>
    <string name="msg_help_director_edit">이미 등록돼있는 지시내용을 수정합니다.</string>
@@ -468,8 +467,11 @@
    <string name="msg_help_task_end_go">마지막 페이지로 넘어갑니다.</string>
    <string name="recent_update_date">마지막 업데이트 날짜：%1$s</string>
+    <string name="msg_help_report_locked">This indicates that the target report is being edited by another user. You can unlock by tapping.</string>
+    <string name="msg_help_report_send_back">This indicates that the target report was rejected in the approval process.</string>
+    <string name="msg_help_dashboard">In dashboard, you can check the number of reports for each status all at once. Target reports are listed by tapping each status. Reports in the approval process aren\'t be displayed. Please tap the target report to proceed to report.</string>
    <string name="label_operation_report_type">종류</string>
-    <string name="label_operation_report_type_routineTask">점검</string>
    <string name="date_label_routineTask">작업기간</string>
    <string name="msg_no_report_data">작업 데이터가 없습니다.</string>
    <string name="msg_permission_dialog_mic">마이크 이용권한이 필요합니다. \n앱설정화면으로 이동합니다.</string>
@@ -672,7 +674,6 @@
    <string name="recent_update_date_1">마지막 업데이트 날짜(1)：%1$s</string>
    <string name="label_operation_report_type_1">종류(1)</string>
-    <string name="label_operation_report_type_routineTask_1">점검(1)</string>
    <string name="date_label_routineTask_1">작업기간(1)</string>
    <string name="msg_no_report_data_1">작업 데이터가 없습니다.(1)</string>
    <string name="msg_permission_dialog_mic_1">마이크 이용권한이 필요합니다. \n앱설정화면으로 이동합니다.(1)</string>
@@ -849,7 +850,6 @@
    <string name="recent_update_date_2">마지막 업데이트 날짜(2)：%1$s</string>
    <string name="label_operation_report_type_2">종류(2)</string>
-    <string name="label_operation_report_type_routineTask_2">점검(2)</string>
    <string name="date_label_routineTask_2">작업기간(2)</string>
    <string name="msg_no_report_data_2">작업 데이터가 없습니다.(2)</string>
    <string name="msg_permission_dialog_mic_2">마이크 이용권한이 필요합니다. \n앱설정화면으로 이동합니다.(2)</string>
@@ -1026,7 +1026,6 @@
    <string name="recent_update_date_3">마지막 업데이트 날짜(3)：%1$s</string>
    <string name="label_operation_report_type_3">종류(3)</string>
-    <string name="label_operation_report_type_routineTask_3">점검(3)</string>
    <string name="date_label_routineTask_3">작업기간(3)</string>
    <string name="msg_no_report_data_3">작업 데이터가 없습니다.(3)</string>
    <string name="msg_permission_dialog_mic_3">마이크 이용권한이 필요합니다. \n앱설정화면으로 이동합니다.(3)</string>
@@ -1203,7 +1202,6 @@
    <string name="recent_update_date_4">마지막 업데이트 날짜(4)：%1$s</string>
    <string name="label_operation_report_type_4">종류(4)</string>
-    <string name="label_operation_report_type_routineTask_4">점검(4)</string>
    <string name="date_label_routineTask_4">작업기간(4)</string>
    <string name="msg_no_report_data_4">작업 데이터가 없습니다.(4)</string>
    <string name="msg_permission_dialog_mic_4">마이크 이용권한이 필요합니다. \n앱설정화면으로 이동합니다.(4)</string>
@@ -1380,7 +1378,6 @@
    <string name="recent_update_date_5">마지막 업데이트 날짜(5)：%1$s</string>
    <string name="label_operation_report_type_5">종류(5)</string>
-    <string name="label_operation_report_type_routineTask_5">점검(5)</string>
    <string name="date_label_routineTask_5">작업기간(5)</string>
    <string name="msg_no_report_data_5">작업 데이터가 없습니다.(5)</string>
    <string name="msg_permission_dialog_mic_5">마이크 이용권한이 필요합니다. \n앱설정화면으로 이동합니다.(5)</string>

--- a/ABVJE_Res_Default_Android/res/values/strings.xml
+++ b/ABVJE_Res_Default_Android/res/values/strings.xml
@@ -404,7 +404,7 @@
    <string name="msg_help_pano_edit_add">you save the captured 360 degree panorama image on the @Form server.</string>
    <string name="msg_help_pano_edit_server_add">You add a 360 degree panorama image (scene) saved on the @Form server. You can also add a radar map.</string>
    <string name="msg_help_pano_edit_server_save">Save it after adding scenes etc. [Temporary save] is temporarily saved in the terminal, [Save] is sent the change information to the @Form server.</string>
-    <string name="msg_help_list_main">The color of the work code label is orange and not complete. Please tap inside the target report frame to proceed to the report.</string>
+    <string name="msg_help_list_main">The color of the work code label is orange for unexecuted, blue for work in progress, and green for completed work. Please tap inside the target report frame to proceed to the report.</string>
    <string name="msg_help_director_report_search">Enter the report name in the search box and press the button to search.</string>
    <string name="msg_help_director_add">You will add a new work instruction.</string>
    <string name="msg_help_director_edit">Correct the instruction contents already registered.</string>
@@ -524,6 +524,11 @@
    <string name="msg_help_360_move">Press this button to move the work code label.</string>
    <string name="msg_help_360_touch">If you press this button, you will be able to touch the work code button, so you can report the work.</string>
    <!-- 1.0.1 Resource Pattern 1 -->
+    <string name="msg_help_report_locked">This indicates that the target report is being edited by another user. You can unlock by tapping.</string>
+    <string name="msg_help_report_send_back">This indicates that the target report was rejected in the approval process.</string>
+    <string name="msg_help_dashboard">In dashboard, you can check the number of reports for each status all at once. Target reports are listed by tapping each status. Reports in the approval process aren\'t be displayed. Please tap the target report to proceed to detail.</string>
    <!-- 1.9.0.0-->
    <string name="meetingroom_setting_1">Meeting room setting(1)</string>
    <string name="marking_share_setting_1">Marking sharing setting(1)</string>

--- a/ABVJE_UI_Android/res/drawable/ic_sendback.xml
+++ b/ABVJE_UI_Android/res/drawable/ic_sendback.xml
+<vector android:height="60dp" android:viewportHeight="180"
+    android:viewportWidth="180" android:width="60dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M19,174c-7.2,0 -13,-5.8 -13,-13V19c0,-7.2 5.8,-13 13,-13h142c7.2,0 13,5.8 13,13v142c0,7.2 -5.8,13 -13,13H19z"/>
+    <path android:fillColor="#333333" android:pathData="M161,8c6,0 11,4.9 11,11v142c0,6 -4.9,11 -11,11H19c-6,0 -11,-4.9 -11,-11V19C8,13 13,8 19,8H161M161,4H19C10.8,4 4,10.8 4,19v142c0,8.2 6.8,15 15,15h142c8.2,0 15,-6.8 15,-15V19C176,10.8 169.2,4 161,4L161,4z"/>
+    <path android:fillColor="#E81733" android:pathData="M46,72.1v66.3c0,1.6 1.2,3.2 3.2,3.2h14.3c1.6,0 3.2,-1.2 3.2,-3.2V71.7c0,-10.7 7.9,-19.5 18.3,-20.7c5.6,-0.4 11.1,1.2 15.5,5.2c4,4 6.8,9.1 6.8,14.7v32.2H90.1c-1.2,0 -2.4,1.2 -2.4,2.4c0,0.4 0,0.8 0.4,1.2l26.6,42.1c0.4,0.8 1.2,1.2 2,1.2s1.6,-0.4 2,-1.2l27,-42.1c0.4,-0.4 0.4,-0.8 0.4,-1.2c0,-1.2 -1.2,-2.4 -2.4,-2.4H127V70.9c0,-11.1 -4.4,-21.5 -12.3,-29.4C106.8,34 96.1,29.6 84.9,30C63.5,31.6 46,49.9 46,72.1z"/>
+</vector>
--- a/ABVJE_UI_Android/res/drawable/ic_unlock.xml
+++ b/ABVJE_UI_Android/res/drawable/ic_unlock.xml
+<vector android:height="60dp" android:viewportHeight="180"
+    android:viewportWidth="180" android:width="60dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M19,174c-7.2,0 -13,-5.8 -13,-13V19c0,-7.2 5.8,-13 13,-13h142c7.2,0 13,5.8 13,13v142c0,7.2 -5.8,13 -13,13H19z"/>
+    <path android:fillColor="#333333" android:pathData="M161,8c6,0 11,4.9 11,11v142c0,6 -4.9,11 -11,11H19c-6,0 -11,-4.9 -11,-11V19C8,13 13,8 19,8H161M161,4H19C10.8,4 4,10.8 4,19v142c0,8.2 6.8,15 15,15h142c8.2,0 15,-6.8 15,-15V19C176,10.8 169.2,4 161,4L161,4z"/>
+    <path android:fillColor="#333333" android:pathData="M90,30c-16.4,0 -30,13.6 -30,30v18h-6c-6.8,0 -12,5.2 -12,12v48c0,6.8 5.2,12 12,12h72c6.8,0 12,-5.2 12,-12V90c0,-6.8 -5.2,-12 -12,-12h-6V60C120,43.6 106.4,30 90,30zM72,60c0,-10 8,-18 18,-18s18,8 18,18v18H72V60zM96,124.4V138H84v-13.6c-5.6,-3.2 -7.6,-10.4 -4.4,-16.4c1.6,-2.8 4.4,-5.2 8,-5.6c6.4,-1.6 12.8,2.8 14.4,9.2c0,0.8 0.4,1.6 0.4,2.4C102,118.4 99.6,122.4 96,124.4z"/>
+</vector>
--- a/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/HelpActivity.java
+++ b/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/HelpActivity.java
@@ -19,7 +19,6 @@ import jp.agentec.abook.abv.ui.common.appinfo.AppDefType;
 import jp.agentec.abook.abv.ui.common.util.PatternStringUtil;
 import jp.agentec.abook.abv.ui.home.adapter.HelpAdapter;
-import static jp.agentec.abook.abv.cl.util.PreferenceUtil.getUserPref;
 /**
 * Created by kim jinsung on 2018/09/19.
@@ -29,7 +28,7 @@ public class HelpActivity extends ABVUIActivity {
    private String mMainDescription;
    private static final String TAG = "HelpActivity";
    private List<HelpDisplayInfoDto> mHelpDisplayInfoList;
-    private ListView mHelpListView;
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        Logger.i(TAG, "onCreate");
@@ -38,11 +37,11 @@ public class HelpActivity extends ABVUIActivity {
        setContentView(R.layout.ac_help_dialog);
        int helpViewType = getIntent().getIntExtra(ABookKeys.HELP_VIEW_TYPE, 0);
-        mHelpDisplayInfoList = new ArrayList<HelpDisplayInfoDto>();
+        mHelpDisplayInfoList = new ArrayList<>();
        setDisplayData(helpViewType);
-        TextView mainDescriptionTextView = (TextView) findViewById(R.id.tv_help_detail);
+        TextView mainDescriptionTextView = findViewById(R.id.tv_help_detail);
-        View lineView = (View) findViewById(R.id.v_line);
+        View lineView = findViewById(R.id.v_line);
        if (mMainDescription == null) {
            mainDescriptionTextView.setVisibility(View.GONE);
@@ -53,7 +52,7 @@ public class HelpActivity extends ABVUIActivity {
            mainDescriptionTextView.setText(mMainDescription);
        }
-        mHelpListView = (ListView) findViewById(R.id.lv_help);
+        ListView mHelpListView = findViewById(R.id.lv_help);
        mHelpListView.setAdapter(new HelpAdapter(this, mHelpDisplayInfoList));
        mHelpListView.invalidate();
        mHelpListView.setClickable(false);
@@ -231,6 +230,12 @@ public class HelpActivity extends ABVUIActivity {
                mHelpDisplayInfoList.add(settingHelpDisplayInfo(PatternStringUtil.patternToString(getApplicationContext(),
                        R.string.msg_help_list_report_add,
                        getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)), R.drawable.ic_help_list_report_add));
+                mHelpDisplayInfoList.add(settingHelpDisplayInfo(PatternStringUtil.patternToString(getApplicationContext(),
+                        R.string.msg_help_report_locked,
+                        getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)), R.drawable.ic_unlock));
+                mHelpDisplayInfoList.add(settingHelpDisplayInfo(PatternStringUtil.patternToString(getApplicationContext(),
+                        R.string.msg_help_report_send_back,
+                        getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)), R.drawable.ic_sendback));
                break;
            case Constant.HelpViewType.RoutineTaskOperation:
                // リソースパターンの適用
@@ -243,6 +248,17 @@ public class HelpActivity extends ABVUIActivity {
                mHelpDisplayInfoList.add(settingHelpDisplayInfo(PatternStringUtil.patternToString(getApplicationContext(),
                        R.string.msg_help_routineTask_list_refresh,
                        getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)), R.drawable.ic_help_direct_list_refresh));
+                mHelpDisplayInfoList.add(settingHelpDisplayInfo(PatternStringUtil.patternToString(getApplicationContext(),
+                        R.string.msg_help_report_locked,
+                        getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)), R.drawable.ic_unlock));
+                mHelpDisplayInfoList.add(settingHelpDisplayInfo(PatternStringUtil.patternToString(getApplicationContext(),
+                        R.string.msg_help_report_send_back,
+                        getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)), R.drawable.ic_sendback));
+                break;
+            case Constant.HelpViewType.OperationDashboard:
+                mMainDescription = PatternStringUtil.patternToString(getApplicationContext(),
+                        R.string.msg_help_dashboard,
+                        getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0));
                break;
        }
        if (!(helpViewTye == Constant.HelpViewType.OperationListDirector || helpViewTye == Constant.HelpViewType.OperationListReporter || helpViewTye == Constant.HelpViewType.OperationDetail)) {