Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
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
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • abook_android
  • abook_check
  • Merge Requests
  • !294

Merged
Opened Feb 24, 2023 by Kazuyuki Hida@hida-k 
  • Report abuse
Report abuse

ヘルプ画面の変更と不具合修正

ヘルプ画面の文言、凡例の修正。 一時保存を未実施扱いに修正。

Edited Feb 24, 2023 by Kazuyuki Hida
  • Discussion 4
  • Commits 2
  • Changes 10
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Kazuyuki Hida
    @hida-k started a discussion on the diff Feb 24, 2023
    Resolved by Yujin Seo Feb 24, 2023
    ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ABookCheckWebViewHelper.java
    400 400 localSavedFlg,
    401 401 null,
    402 402 null,
    403 1
    403 0
    404 404 );
    • Kazuyuki Hida @hida-k commented Feb 24, 2023
      Developer

      「作業中」から「未実施」扱いに変更

      Edited Feb 24, 2023
      「作業中」から「未実施」扱いに変更
    Please register or sign in to reply
  • Kazuyuki Hida
    @hida-k started a discussion on the diff Feb 24, 2023
    Resolved by Yujin Seo Feb 24, 2023
    ABVJE_Res_Default_Android/res/drawable/ic_report_status_blue.xml 0 → 100644
    6 <path
    7 android:pathData="M2,62h176v56h-176z"
    8 android:fillColor="#0080C6"/>
    9 <path
    10 android:pathData="M44,90c0,-3.9 0.4,-7 1.2,-9.4c0.8,-2.4 2,-4.2 3.6,-5.5c1.6,-1.3 3.6,-1.9 6,-1.9c1.8,0 3.3,0.4 4.6,1.1c1.3,0.7 2.4,1.7 3.3,3.1c0.9,1.3 1.5,3 2,4.9c0.5,1.9 0.7,4.5 0.7,7.8c0,3.9 -0.4,7 -1.2,9.4c-0.8,2.4 -2,4.2 -3.6,5.5c-1.6,1.3 -3.6,1.9 -6,1.9c-3.2,0 -5.7,-1.1 -7.5,-3.4C45.1,100.7 44,96.2 44,90zM48.2,90c0,5.4 0.6,9 1.9,10.8c1.3,1.8 2.8,2.7 4.7,2.7c1.9,0 3.4,-0.9 4.7,-2.7c1.3,-1.8 1.9,-5.4 1.9,-10.8c0,-5.4 -0.6,-9 -1.9,-10.8c-1.3,-1.8 -2.8,-2.7 -4.7,-2.7c-1.9,0 -3.3,0.8 -4.4,2.4C48.9,80.9 48.2,84.6 48.2,90z"
    11 android:fillColor="#FFFFFF"/>
    12 <path
    13 android:pathData="M69.6,90c0,-3.9 0.4,-7 1.2,-9.4c0.8,-2.4 2,-4.2 3.6,-5.5c1.6,-1.3 3.6,-1.9 6,-1.9c1.8,0 3.3,0.4 4.6,1.1c1.3,0.7 2.4,1.7 3.3,3.1c0.9,1.3 1.5,3 2,4.9c0.5,1.9 0.7,4.5 0.7,7.8c0,3.9 -0.4,7 -1.2,9.4c-0.8,2.4 -2,4.2 -3.6,5.5c-1.6,1.3 -3.6,1.9 -6,1.9c-3.2,0 -5.7,-1.1 -7.5,-3.4C70.7,100.7 69.6,96.2 69.6,90zM73.7,90c0,5.4 0.6,9 1.9,10.8c1.3,1.8 2.8,2.7 4.7,2.7c1.9,0 3.4,-0.9 4.7,-2.7c1.3,-1.8 1.9,-5.4 1.9,-10.8c0,-5.4 -0.6,-9 -1.9,-10.8c-1.3,-1.8 -2.8,-2.7 -4.7,-2.7c-1.9,0 -3.3,0.8 -4.4,2.4C74.4,80.9 73.7,84.6 73.7,90z"
    14 android:fillColor="#FFFFFF"/>
    15 <path
    16 android:pathData="M95.2,90c0,-3.9 0.4,-7 1.2,-9.4c0.8,-2.4 2,-4.2 3.6,-5.5c1.6,-1.3 3.6,-1.9 6,-1.9c1.8,0 3.3,0.4 4.6,1.1c1.3,0.7 2.4,1.7 3.3,3.1c0.9,1.3 1.5,3 2,4.9c0.5,1.9 0.7,4.5 0.7,7.8c0,3.9 -0.4,7 -1.2,9.4c-0.8,2.4 -2,4.2 -3.6,5.5c-1.6,1.3 -3.6,1.9 -6,1.9c-3.2,0 -5.7,-1.1 -7.5,-3.4C96.3,100.7 95.2,96.2 95.2,90zM99.3,90c0,5.4 0.6,9 1.9,10.8c1.3,1.8 2.8,2.7 4.7,2.7c1.9,0 3.4,-0.9 4.7,-2.7c1.3,-1.8 1.9,-5.4 1.9,-10.8c0,-5.4 -0.6,-9 -1.9,-10.8c-1.3,-1.8 -2.8,-2.7 -4.7,-2.7c-1.9,0 -3.3,0.8 -4.4,2.4C100,80.9 99.3,84.6 99.3,90z"
    17 android:fillColor="#FFFFFF"/>
    18 <path
    19 android:pathData="M136,106.3h-4V80.5c-1,0.9 -2.2,1.9 -3.8,2.8c-1.6,0.9 -3,1.6 -4.3,2.1v-3.9c2.3,-1.1 4.2,-2.4 5.9,-3.9c1.7,-1.5 2.9,-3 3.6,-4.4h2.6V106.3z"
    20 android:fillColor="#FFFFFF"/>
    21 </vector>
    • Kazuyuki Hida @hida-k commented Feb 24, 2023
      Developer

      凡例で使うアイコン

      Edited Feb 24, 2023
      凡例で使うアイコン
    Please register or sign in to reply
  • Kazuyuki Hida
    @hida-k started a discussion on the diff Feb 24, 2023
    Resolved by Yujin Seo Feb 24, 2023
    ABVJE_Res_Default_Android/res/values-ja/strings.xml
    398 398 <string name="msg_help_pano_edit_add">撮影した360度パノラマ画像を@Formサーバに保存します。</string>
    399 399 <string name="msg_help_pano_edit_server_add">"@Formサーバへ保存した360度パノラマ画像(シーン)を追加します。レーダーマップの追加も行えます。</string>
    400 400 <string name="msg_help_pano_edit_server_save">シーン等を追加したら保存します。「一時保存」は端末内に一時的に保存、「保存」は@Formサーバへ変更情報が送信されます。</string>
    401 <string name="msg_help_list_main">作業コードラベルの色は橙色が未実施、青色が作業中、緑色が作業完了を表します。報告に進む場合は対象報告の枠内をタップしてください</string>
    401 <string name="msg_help_list_main">報告に進む場合は対象報告の枠内をタップしてください</string>
    • Kazuyuki Hida @hida-k commented Feb 24, 2023
      Developer

      文言変更

      Edited Feb 24, 2023
      文言変更
    Please register or sign in to reply
  • Kazuyuki Hida
    @hida-k started a discussion on the diff Feb 24, 2023
    Resolved by Yujin Seo Feb 24, 2023
    ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/HelpActivity.java
    229 229 getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)), R.drawable.ic_help_direct_list_search));
    230 230 mHelpDisplayInfoList.add(settingHelpDisplayInfo(PatternStringUtil.patternToString(getApplicationContext(),
    231 R.string.msg_help_list_report_add,
    232 getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)), R.drawable.ic_help_list_report_add));
    231 R.string.msg_help_routine_task_unfinished_status,
    232 getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)), R.drawable.ic_report_status_red));
    233 mHelpDisplayInfoList.add(settingHelpDisplayInfo(PatternStringUtil.patternToString(getApplicationContext(),
    234 R.string.msg_help_routine_task_working_status,
    235 getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)), R.drawable.ic_report_status_blue));
    236 mHelpDisplayInfoList.add(settingHelpDisplayInfo(PatternStringUtil.patternToString(getApplicationContext(),
    237 R.string.msg_help_routine_task_completed_status,
    238 getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)), R.drawable.ic_report_status_green));
    239 mHelpDisplayInfoList.add(settingHelpDisplayInfo(PatternStringUtil.patternToString(getApplicationContext(),
    240 R.string.msg_help_report_locked,
    241 getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)), R.drawable.ic_unlock));
    242
    • Kazuyuki Hida @hida-k commented Feb 24, 2023
      Developer

      凡例を追加

      Edited Feb 24, 2023
      凡例を追加
    Please register or sign in to reply
  • Kazuyuki Hida @hida-k

    assigned to @seo

    Feb 24, 2023

    assigned to @seo

    assigned to @seo
    Toggle commit list
  • Kazuyuki Hida @hida-k

    unmarked as a Work In Progress

    Feb 24, 2023

    unmarked as a Work In Progress

    unmarked as a **Work In Progress**
    Toggle commit list
  • Yujin Seo @seo

    resolved all discussions

    Feb 24, 2023

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Yujin Seo @seo

    merged

    Feb 24, 2023

    merged

    merged
    Toggle commit list
  • Yujin Seo @seo

    mentioned in commit 980f4d72

    Feb 24, 2023

    mentioned in commit 980f4d72

    mentioned in commit 980f4d7281134234084049657abc4961703b1d75
    Toggle commit list
  • Write
  • Preview
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 sign in to comment
Yujin Seo
Assignee
Yujin Seo @seo
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: abook_android/abook_check!294
×

Revert this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.