Merge branch 'features/1.4.100_develop' into 'features/1.4.100'

ローディング表示修正

See merge request !210

check @ 9b54d9b5

-Subproject commit bb40d8b5ff5efc1bccdf7cfe9858a036ee33c940
+Subproject commit 9b54d9b5075f06e33975777cd1d47751bfeddc92

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

@@ -591,11 +591,37 @@ public class OperationListActivity extends ABVUIActivity {
             handler.post(new Runnable() {
             handler.post(new Runnable() {
                 @Override
                 @Override
                 public void run() {
                 public void run() {
-                    showProgressPopup();
+                    showProgressView(getString(R.string.msg_common_processing));
                 }
                 }
             });
             });
             if (firstFlg) {
             if (firstFlg) {
-                dataRefresh(true);
+                final Callback progressCallback = new Callback() {
+                    @Override
+                    public Object callback(Object ret) {
+                        final int progress = (int)ret;
+                        runOnUiThread(new Runnable() {
+                            @Override
+                            public void run() {
+                                if ((progressDialogHorizontal.getProgress() + progress) < 100) {
+                                    progressDialogHorizontal.setProgress(progressDialogHorizontal.getProgress() + progress);
+                                } else {
+                                    progressDialogHorizontal.setProgress(100);
+                                }
+                            }
+                        });
+                        return null;
+                    }
+                };
+                try {
+                    dataRefresh(true, progressCallback);
+                } catch (Exception e) {
+                    handler.post(new Runnable() {
+                        @Override
+                        public void run() {
+                            closeProgressPopup();
+                        }
+                    });
+                }
                 firstFlg = false;
                 firstFlg = false;
             }
             }
             runOnUiThread(new Runnable() {
             runOnUiThread(new Runnable() {
@@ -1344,7 +1370,33 @@ public class OperationListActivity extends ABVUIActivity {
                     if (progress >= 100) {
                     if (progress >= 100) {
                         closeProgressPopup();
                         closeProgressPopup();
                         //新着更新
                         //新着更新
-                        dataRefresh(true);
+                        final Callback progressCallback = new Callback() {
+                            @Override
+                            public Object callback(Object ret) {
+                                final int progress = (int)ret;
+                                runOnUiThread(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        if ((progressDialogHorizontal.getProgress() + progress) < 100) {
+                                            progressDialogHorizontal.setProgress(progressDialogHorizontal.getProgress() + progress);
+                                        } else {
+                                            progressDialogHorizontal.setProgress(100);
+                                        }
+                                    }
+                                });
+                                return null;
+                            }
+                        };
+                        try {
+                            dataRefresh(true, progressCallback);
+                        } catch (Exception e) {
+                            handler.post(new Runnable() {
+                                @Override
+                                public void run() {
+                                    closeProgressPopup();
+                                }
+                            });
+                        }
                     } else {
                     } else {
                         handler.postDelayed(this, 1000);
                         handler.postDelayed(this, 1000);
                     }
                     }