yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
wangcongtao
2020-09-10 10:17:26 +08:00
parent a4cd94d06b 69c9f83a1c
commit 5e4551404c
18 changed files with 91 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
View File

@@ -473,19 +473,17 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
return;
}
// 1.1.5的需求，上报即成功，去掉此处动画
// if (descriptor == StatusDescriptor.UPLOADING) {
// if (isTrue) {
// mUploading.setVisibility(View.VISIBLE);
// mUpload.setVisibility(View.GONE);
// mUploadButtonAnimatorController.doFrameAnimOnUploadButton();
// } else {
// mUploadButtonAnimatorController.stopAnimation();
// mUploading.setVisibility(View.GONE);
// mUpload.setVisibility(View.VISIBLE);
// }
// } else
if (descriptor == StatusDescriptor.DISPLAY_OVERVIEW) {
if (descriptor == StatusDescriptor.UPLOADING&&DebugConfig.isLauncher()) {
if (isTrue) {
mUploading.setVisibility(View.VISIBLE);
mUpload.setVisibility(View.GONE);
mUploadButtonAnimatorController.doFrameAnimOnUploadButton();
} else {
mUploadButtonAnimatorController.stopAnimation();
mUploading.setVisibility(View.GONE);
mUpload.setVisibility(View.VISIBLE);
}
} else if (descriptor == StatusDescriptor.DISPLAY_OVERVIEW) {
if (!mMogoNavi.isNaviing()) {
return;
}