implement auto sync 1->7

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/view/ABVBatchSyncView.java

@@ -82,6 +82,9 @@ public class ABVBatchSyncView extends ProgressDialog {
             // Activity破棄フラグがtrue、またはスタックが存在しなければ、全て完了と見做す
             closeProgressDialog();
             Logger.d(TAG, "---batchSync is end");
+            if (mOperationListActivity != null && mOperationListActivity.isAutoSyncing) {
+                mOperationListActivity.autoSyncOperationDone(true);
+            }
             return;
         }
         // ベース資料のダウンロードチェック
@@ -97,6 +100,9 @@ public class ABVBatchSyncView extends ProgressDialog {
                 // error
                 showBatchSyncErrorAlert(peekOperationDto, mOperationListActivity.getString(R.string.msg_batch_sync_content_download_fail));
             }
+            if (mOperationListActivity != null && mOperationListActivity.isAutoSyncing) {
+                mOperationListActivity.autoSyncOperationDone(false);
+            }
             return;
         }
         // 同期処理

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java

@@ -206,6 +206,9 @@ public class OperationListActivity extends OperationActivity {
     // 作業種別のサービスオプション値を保持用フラグ
     private boolean mOperationGroupMasterServiceOperationFlg;
 
+    public boolean isAutoSyncing;
+    public Long autoSyncOpenOperationId = null;
+
     public Long mQrCodeOperationId = null;
     // ビューの作成
     private class ReloadHandler implements Runnable {
@@ -478,6 +481,37 @@ public class OperationListActivity extends OperationActivity {
                         // ビューを作り直す
                         setOperationListView();
                     }
+                    if (isAutoSync()) {
+                        if (isAutoSyncing) {
+                            if (result) {
+                                // content update success
+                                List<OperationDto> needSyncOperationList = new ArrayList<>();
+                                if (autoSyncOpenOperationId != null) {
+                                    OperationDto operationDto = mOperationLogic.getOperation(autoSyncOpenOperationId);
+                                    if (operationDto.needSyncFlg) {
+                                        needSyncOperationList.add(operationDto);
+                                    }
+                                } else {
+                                    for (OperationDto operationDto : mOperationDao.getAllOperation()) {
+                                        if (operationDto.needSyncFlg) {
+                                            needSyncOperationList.add(operationDto);
+                                        }
+                                    }
+                                }
+                                needSyncOperationList.addAll(mOperationDao.getAllOperation());
+                                if (needSyncOperationList.size() > 0) {
+                                    categoryBatchSync(needSyncOperationList);
+                                } else {
+                                    // donot need sync
+                                    autoSyncOperationDone(true);
+                                }
+                            } else {
+                                // content update fail
+                                autoSyncOperationDone(false);
+                            }
+                        }
+                        return;
+                    }
                     //「I/O 帳票使用」がYESのみ、新着更新処理完了後、一括同期処理を開始する。
                     if (ABVDataCache.getInstance().serviceOption.isUnableIOReport()) {
                         if (mAutoBatchSyncFlg) {
@@ -509,6 +543,9 @@ public class OperationListActivity extends OperationActivity {
         refreshOperationList();
         // 作業指示・報告からプロジェクト一覧へ戻った時の同期処理
         if (ABVEnvironment.getInstance().networkAdapter.isNetworkConnected()) {
+            if (isAutoSync()) {
+                autoSyncOperation();
+            } else {
                 final long operationId = getUserPref(AppDefType.UserPrefKey.SYNC_TARGET_OPERATION_ID, -1L);
                 if (operationId != -1) {
                     final OperationDto operationDto = mOperationLogic.getOperation(operationId);
@@ -570,7 +607,7 @@ public class OperationListActivity extends OperationActivity {
                     dataRefresh(true);
                 }
             }
-
+        }
         putUserPref(AppDefType.UserPrefKey.SYNC_TARGET_OPERATION_ID, -1L);
         activityResultFlg = false;
 
@@ -1855,6 +1892,10 @@ public class OperationListActivity extends OperationActivity {
                 refreshView.getLoadingLayoutProxy().setLastUpdatedLabel(lastUpdateTimeLabel);
             }
         }
+        if (needAutoSync()) {
+            autoSyncOperation();
+            return;
+        }
         CommonExecutor.execute(new Runnable() {
             @Override
             public void run() {
@@ -1892,7 +1933,10 @@ public class OperationListActivity extends OperationActivity {
                 refreshView.getLoadingLayoutProxy().setLastUpdatedLabel(lastUpdateTimeLabel);
             }
         }
-
+        if (needAutoSync()) {
+            autoSyncOperation();
+            return;
+        }
         CommonExecutor.execute(new Runnable() {
             @Override
             public void run() {
@@ -2393,4 +2437,42 @@ public class OperationListActivity extends OperationActivity {
             Logger.w(TAG,"Camera Permission  false");
         }
     }
+
+    private boolean isAutoSync() {
+        return PreferenceUtil.get(getApplicationContext(), AppDefType.UserPrefKey.OPERATION_AUTO_SYNC, false);
+    }
+    public boolean needAutoSync() {
+        return (isAutoSync() && ABVEnvironment.getInstance().networkAdapter.isNetworkConnected());
+    }
+
+    public void autoSyncOperation() {
+        if (isAutoSyncing) {
+            return;
+        }
+        isAutoSyncing = true;
+        showProgressView(PatternStringUtil.patternToString(getApplicationContext(),
+                R.string.synchronizing,
+                getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)));
+        CommonExecutor.execute(new Runnable() {
+            @Override
+            public void run() {
+                dataRefresh(true);
+                if (!contentRefresher.isRefreshing()) {
+                    autoSyncOperationDone(false);
+                }
+            }
+        });
+    }
+
+    public void autoSyncOperationDone(boolean isSuccess) {
+        isAutoSyncing = false;
+        closeProgressPopup();
+        if (isSuccess) {
+            if (autoSyncOpenOperationId != null) {
+                OperationDto operationDto = mOperationLogic.getOperation(autoSyncOpenOperationId);
+                openReportView(operationDto);
+            }
+        }
+        autoSyncOpenOperationId = null;
+    }
 }

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/OperationListHelper.java

@@ -148,18 +148,7 @@ public abstract class OperationListHelper {
         adapter.setAdapterListener(new AbstractOperationAdapter.AbstractOperationListAdapterListener() {
             @Override
             public void openReport(OperationDto operationDto) {
-                if (operationDto.contentId != null && operationDto.contentId != 0) {
-                    // 作業画面
-                    mAppActivity.openReportView(operationDto);
-                } else {
-                    if (operationDto.operationType == PANO) {
-                        // パノラマ登録画面
-                        mAppActivity.showPanoEntryDialog(operationDto);
-                    } else {
-                        // 何もしない
-                        Logger.e("not open target");
-                    }
-                }
+                onClickReport(operationDto);
             }
 
             @Override
@@ -211,18 +200,7 @@ public abstract class OperationListHelper {
         adapter.setAdapterListener(new AbstractOperationAdapter.AbstractOperationListAdapterListener() {
             @Override
             public void openReport(OperationDto operationDto) {
-                if (operationDto.contentId != null && operationDto.contentId != 0) {
-                    // 作業画面
-                    mAppActivity.openReportView(operationDto);
-                } else {
-                    if (operationDto.operationType == PANO) {
-                        // パノラマ登録画面
-                        mAppActivity.showPanoEntryDialog(operationDto);
-                    } else {
-                        // 何もしない
-                        Logger.e("not open target");
-                    }
-                }
+                onClickReport(operationDto);
             }
 
             @Override
@@ -285,4 +263,24 @@ public abstract class OperationListHelper {
      */
     abstract protected List<OperationDto> findOperationList() throws Exception;
 
+    public void onClickReport(OperationDto operationDto) {
+        if (mAppActivity.needAutoSync()) {
+            mAppActivity.autoSyncOpenOperationId = operationDto.operationId;
+            mAppActivity.autoSyncOperation();
+            return;
+        }
+        if (operationDto.contentId != null && operationDto.contentId != 0) {
+            // 作業画面
+            mAppActivity.openReportView(operationDto);
+        } else {
+            if (operationDto.operationType == PANO) {
+                // パノラマ登録画面
+                mAppActivity.showPanoEntryDialog(operationDto);
+            } else {
+                // 何もしない
+                Logger.e("not open target");
+            }
+        }
+    }
+
 }