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
  • !208

Merged
Opened Aug 30, 2021 by onuma@onuma 2 of 2 tasks completed2/2 tasks
  • Report abuse
Report abuse

問題点No.56,57,58,80,81,82,83,84 アプリの画面遷移を修正した。

LGTMの場合、チェックをしてください。

  • @kim-p
  • @kim_j
Edited Aug 30, 2021 by Kim Peace
  • Discussion 8
  • Commits 3
  • Changes 13
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Kim Peace
    @kim-p started a discussion on an old version of the diff Aug 30, 2021
    Last updated by onuma Aug 30, 2021
    ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVAuthenticatedActivity.java
    163 166
    164 167 // 遷移元のアクティビティ名
    165 168 // PushMessage受信時に直接ChatRoomへ行かずに、ひとつまえのActivityに戻る為に使用する。
    166 public String baseActivityName;
    169 public String fromActivityName;
    • Kim Peace @kim-p commented Aug 30, 2021
      Master

      [nits] baseActivityNameの方がいいと思います。

      [nits] `baseActivityName`の方がいいと思います。
    • onuma @onuma

      changed this line in version 2 of the diff

      Aug 30, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/208/diffs?diff_id=7043&start_sha=32ca247fa5d147889fe22b9c7f3c9b72fdcbba48#e59744bb2eed89bb0481731e7fd3e60b44c4c163_169_169)
      Toggle commit list
    Please register or sign in to reply
  • Kim Peace
    @kim-p started a discussion on an old version of the diff Aug 30, 2021
    Last updated by onuma Aug 30, 2021
    ABVJE_UI_Android/src/jp/agentec/abook/abv/cl/push/ABVFcmListenerService.java
    227 226 if (StringUtil.isNullOrWhiteSpace(message.get(AppDefType.PushMessageKey.message))) {
    228 227 return intent;
    229 228 }
    230 String tempMsg = message.get(AppDefType.PushMessageKey.message);
    231 Log.d(TAG,"tempMsg : "+ tempMsg);
    232
    233 if (Objects.requireNonNull(tempMsg).indexOf(AppDefType.ChatPushMessageKey.pushSendLoginId) <= 0) {
    229 String messageBosy = message.get(AppDefType.PushMessageKey.message);
    • Kim Peace @kim-p commented Aug 30, 2021
      Master

      [nits] messageBosy -> messageBody

      [nits] `messageBosy` -> `messageBody`
    • onuma @onuma commented Aug 30, 2021
      Master

      修正します。

      修正します。
    • onuma @onuma

      changed this line in version 2 of the diff

      Aug 30, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/208/diffs?diff_id=7043&start_sha=32ca247fa5d147889fe22b9c7f3c9b72fdcbba48#35c43bdcbed56fa047ba60c2069e60fffdcbf6c4_229_228)
      Toggle commit list
    Please register or sign in to reply
  • Kim Peace
    @kim-p started a discussion on an old version of the diff Aug 30, 2021
    Last updated by onuma Aug 30, 2021
    ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebViewActivity.java
    191 191 }
    192 192 boolean isSIDValid = false;
    193 193 try {
    194 isSIDValid = AcmsClient.getInstance(ABVEnvironment.getInstance().networkAdapter).checkSid(chatData.sid);
    194 isSIDValid = AcmsClient.getInstance(chatData.shopName,ABVEnvironment.getInstance().networkAdapter).checkSid(chatData.sid);
    • Kim Peace @kim-p commented Aug 30, 2021
      Master

      [nits] ,の後はスペースを開けてください。

      [nits] `,`の後はスペースを開けてください。
    • onuma @onuma

      changed this line in version 2 of the diff

      Aug 30, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/208/diffs?diff_id=7043&start_sha=32ca247fa5d147889fe22b9c7f3c9b72fdcbba48#fe0b9dc37e3328752dbfa30f48f2116c6b0cb620_194_194)
      Toggle commit list
    Please register or sign in to reply
  • Kim Peace
    @kim-p started a discussion on an old version of the diff Aug 30, 2021
    Last updated by onuma Aug 30, 2021
    ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/view/AudioPlayView.java
    401 401 public void stop() {
    402 402 if (mMediaPlayer != null) {
    403 403 mVisualizer.release();
    404 if (mMediaPlayer.isPlaying()){
    • Kim Peace @kim-p commented Aug 30, 2021
      Master

      indentの確認をお願いします。

      indentの確認をお願いします。
    • onuma @onuma

      changed this line in version 2 of the diff

      Aug 30, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/208/diffs?diff_id=7043&start_sha=32ca247fa5d147889fe22b9c7f3c9b72fdcbba48#8d3dcf9e168f3b23472a5dcd115232ea9d188fb1_404_396)
      Toggle commit list
    Please register or sign in to reply
  • Kim Peace
    @kim-p started a discussion on an old version of the diff Aug 30, 2021
    Last updated by onuma Aug 30, 2021
    ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVAuthenticatedActivity.java
    868 871 // chat
    869 872 LinearLayout ll_menuItem_chat = (LinearLayout)mCommunicationMenuDialog.findViewById(R.id.ll_item_chat);
    870 873 if (ABVDataCache.getInstance().serviceOption.isChat()) {
    874 final Activity baseActivity = this;
    871 875 ll_menuItem_chat.setOnClickListener(new View.OnClickListener() {
    872 876 @Override
    873 877 public void onClick(View view) {
    874 ActivityHandlingHelper.getInstance().startChatWebViewActivity();
    878 // 戻り先
    879 String nextActivity;
    • Kim Peace @kim-p commented Aug 30, 2021
      Master

      nextActivity -> targetActivity

      `nextActivity` -> targetActivity
    • Kim Peace @kim-p commented Aug 30, 2021
      Master

      変数の型がActivityではないので、Stringを付けた方がいいと思います。 nextActivity -> nextActivityName

      Edited Aug 30, 2021 by Kim Peace
      変数の型がActivityではないので、Stringを付けた方がいいと思います。 `nextActivity` -> `nextActivityName`
    • onuma @onuma commented Aug 30, 2021
      Master

      targetActivityName に修正しました。

      targetActivityName に修正しました。
    • onuma @onuma

      changed this line in version 2 of the diff

      Aug 30, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/208/diffs?diff_id=7043&start_sha=32ca247fa5d147889fe22b9c7f3c9b72fdcbba48#e59744bb2eed89bb0481731e7fd3e60b44c4c163_879_879)
      Toggle commit list
    Please register or sign in to reply
  • Kim Jinsung @kim_j

    marked the task @kim_j as completed

    Aug 30, 2021

    marked the task @kim_j as completed

    marked the task **@kim_j** as completed
    Toggle commit list
  • onuma @onuma

    added 1 commit

    • 463e989b - 変数名を変更。

    Compare with previous version

    Aug 30, 2021

    added 1 commit

    • 463e989b - 変数名を変更。

    Compare with previous version

    added 1 commit * 463e989b - 変数名を変更。 [Compare with previous version](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/208/diffs?diff_id=7043&start_sha=32ca247fa5d147889fe22b9c7f3c9b72fdcbba48)
    Toggle commit list
  • Kim Peace @kim-p

    marked the task @kim-p as completed

    Aug 30, 2021

    marked the task @kim-p as completed

    marked the task **@kim-p** as completed
    Toggle commit list
  • Kim Peace @kim-p

    assigned to @onuma

    Aug 30, 2021

    assigned to @onuma

    assigned to @onuma
    Toggle commit list
  • onuma @onuma

    merged

    Aug 30, 2021

    merged

    merged
    Toggle commit list
  • onuma @onuma

    mentioned in commit fd82f189

    Aug 30, 2021

    mentioned in commit fd82f189

    mentioned in commit fd82f189347f8c7441c69329cf3d091a101faf2a
    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
onuma
Assignee
onuma @onuma
Assign to
None
Milestone
None
Assign milestone
Time tracking
3
3 participants
Reference: abook_android/abook_check!208
×

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.