Commit 4d42778f by Lee Munkyeong

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

ローディング表示修正

See merge request !212
parents 29a1c890 1e2c86f9
......@@ -170,8 +170,10 @@ public class OperationListActivity extends ABVUIActivity {
private Long mSelectedOperationId;
private Integer mScanType;
private Handler mHandler;
public static final int TIME_OUT = 1001;
public static final int TIME_OUT_LIMIT = 3600000;
@Override
protected void onCreate(Bundle savedInstanceState) {
......@@ -216,6 +218,16 @@ public class OperationListActivity extends ABVUIActivity {
// サービスオプション(作業種別使用)をセット
mOperationGroupMasterServiceOperationFlg = ABVDataCache.getInstance().serviceOption.isOperationGroupMaster();
mHandler = new Handler() {
@Override
public void handleMessage(Message msg) {
if (msg.what == TIME_OUT) {
closeProgressPopup();
}
}
};
if (!StringUtil.isNullOrEmpty(getIntent().getStringExtra(AppDefType.PushMessageKey.operationId))) {
final long operationId = Long.parseLong(getIntent().getStringExtra(AppDefType.PushMessageKey.operationId));
String message = getIntent().getStringExtra(AppDefType.PushMessageKey.message);
......@@ -355,7 +367,8 @@ public class OperationListActivity extends ABVUIActivity {
handler.post(new Runnable() {
@Override
public void run() {
showProgressView(getString(R.string.msg_common_processing));
showProgressBar(getString(R.string.msg_common_processing));
showProgressBar(getString(R.string.msg_common_processing));
}
});
......@@ -588,13 +601,13 @@ public class OperationListActivity extends ABVUIActivity {
final long operationId = getUserPref(AppDefType.UserPrefKey.SYNC_TARGET_OPERATION_ID, -1L);
if (operationId == -1) {
handler.post(new Runnable() {
@Override
public void run() {
showProgressView(getString(R.string.msg_common_processing));
}
});
if (firstFlg) {
handler.post(new Runnable() {
@Override
public void run() {
showProgressBar(getString(R.string.msg_common_processing));
}
});
final Callback progressCallback = new Callback() {
@Override
public Object callback(Object ret) {
......@@ -1361,7 +1374,7 @@ public class OperationListActivity extends ABVUIActivity {
//screenRefresh();
//10秒(コンテンツ作成し、公開までの時間)に新着更新させる。
showProgressView(getString(R.string.msg_common_processing));
showProgressBar(getString(R.string.msg_common_processing));
handler.postDelayed(new Runnable() {
@Override
public void run() {
......@@ -2057,4 +2070,9 @@ public class OperationListActivity extends ABVUIActivity {
}
});
}
public void showProgressBar(String msg) {
showProgressView(msg);
mHandler.sendEmptyMessageDelayed(TIME_OUT, TIME_OUT_LIMIT);
}
}
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