Commit 645e49d5 by Kazuyuki Hida

Merge branch 'feature/contract/sato/1.0.300_52153_disconnected_alert' into…

Merge branch 'feature/contract/sato/1.0.300_52153_disconnected_alert' into feature/contract/sato/1.0.300_52170_unlock
parents a026403b 4eca91e9
...@@ -1121,12 +1121,8 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity { ...@@ -1121,12 +1121,8 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
// アンロック // アンロック
UnlockReportLogic.Result r = UnlockReportLogic.newInstance().unlock(taskKey, taskReportId, startDate); UnlockReportLogic.Result r = UnlockReportLogic.newInstance().unlock(taskKey, taskReportId, startDate);
// JSコールバック // JSコールバック
if (r.getMessage().length() > 0) { // アンロックの失敗は無視
// アンロックの失敗は無視 afterABookCheckApi(mCmd, mTaskKey, 0, "", "{'reportStatus':0}");
afterABookCheckApi(mCmd, mTaskKey, 0, "", "{'reportStatus':0}");
} else {
afterABookCheckApi(mCmd, mTaskKey, r.getResult(), r.getMessage(), r.getExtParam().json());
}
} }
} }
......
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