Commit 45b1bc40 by sikang

修复Activity动画

parent 8072c988
...@@ -2,6 +2,7 @@ package tech.starwin; ...@@ -2,6 +2,7 @@ package tech.starwin;
import android.app.Application; import android.app.Application;
import android.content.Context; import android.content.Context;
import android.text.TextUtils;
import android.view.View; import android.view.View;
import com.google.firebase.remoteconfig.FirebaseRemoteConfig; import com.google.firebase.remoteconfig.FirebaseRemoteConfig;
...@@ -85,10 +86,6 @@ public class LibConfig { ...@@ -85,10 +86,6 @@ public class LibConfig {
if (application != null) { if (application != null) {
CONTEXT = application; CONTEXT = application;
// if (!TextUtils.isEmpty(LANGUAGE)) {
// loadAppLanguage(application, LANGUAGE);
// }
//上传工具 //上传工具
UploadManager.init(CONTEXT); UploadManager.init(CONTEXT);
...@@ -108,7 +105,9 @@ public class LibConfig { ...@@ -108,7 +105,9 @@ public class LibConfig {
Gateway.init(PreferencesManager.get().getGatewayInfo()); Gateway.init(PreferencesManager.get().getGatewayInfo());
//init Bugly //init Bugly
CrashReport.initCrashReport(getApplicationContext(), BUGLY_APP_ID, DEBUG); if (!TextUtils.isEmpty(BUGLY_APP_ID)) {
CrashReport.initCrashReport(getApplicationContext(), BUGLY_APP_ID, DEBUG);
}
//init zendesk //init zendesk
Zendesk.INSTANCE.init(application, ZENDESK_URL, ZENDESK_APP_ID, ZENDESK_OAUTH_CLIENT_ID); Zendesk.INSTANCE.init(application, ZENDESK_URL, ZENDESK_APP_ID, ZENDESK_OAUTH_CLIENT_ID);
...@@ -121,31 +120,6 @@ public class LibConfig { ...@@ -121,31 +120,6 @@ public class LibConfig {
OctopusManager.getInstance().setTitleColorResId(R.color.white); OctopusManager.getInstance().setTitleColorResId(R.color.white);
OctopusManager.getInstance().setShowWarnDialog(true); OctopusManager.getInstance().setShowWarnDialog(true);
OctopusManager.getInstance().setStatusBarBg(MAIN_COLOR); OctopusManager.getInstance().setStatusBarBg(MAIN_COLOR);
// FirebaseDynamicLinks.getInstance()
// .getDynamicLink(getIntent())
// .addOnSuccessListener(this, new OnSuccessListener<PendingDynamicLinkData>() {
// @Override
// public void onSuccess(PendingDynamicLinkData pendingDynamicLinkData) {
// // Get deep link from result (may be null if no link is found)
// Uri deepLink = null;
// if (pendingDynamicLinkData != null) {
// deepLink = pendingDynamicLinkData.getLink();
// }
//
// // Handle the deep link. For example, open the linked
// // content, or apply promotional credit to the user's
// // account.
// // ...
//
// // ...
// }
// })
// .addOnFailureListener(this, new OnFailureListener() {
// @Override
// public void onFailure(@NonNull Exception e) {
// Log.w(TAG, "getDynamicLink:onFailure", e);
// }
// });
} }
} }
......
...@@ -329,14 +329,4 @@ public abstract class BaseActivity extends AppCompatActivity implements IView { ...@@ -329,14 +329,4 @@ public abstract class BaseActivity extends AppCompatActivity implements IView {
} }
} }
public void pendingTransition() {
overridePendingTransition(R.anim.slide_close_enter, R.anim.slide_close_exit);
}
// @Override
// public void finish() {
// super.finish();
// pendingTransition();
// }
} }
...@@ -40,11 +40,6 @@ public class RegionActivity extends BaseActivity { ...@@ -40,11 +40,6 @@ public class RegionActivity extends BaseActivity {
new EasyActivityResult(activity).startForResult(intent, requestCode, listener); new EasyActivityResult(activity).startForResult(intent, requestCode, listener);
} }
@Override
public void overridePendingTransition(int enterAnim, int exitAnim) {
//取消动画,使用系统默认动画
// super.overridePendingTransition(enterAnim, exitAnim);
}
@Override @Override
public void onHttpSuccess(String action, Object result) { public void onHttpSuccess(String action, Object result) {
......
...@@ -36,9 +36,6 @@ public class ActivityJumper { ...@@ -36,9 +36,6 @@ public class ActivityJumper {
return; return;
} }
context.startActivity(intent); context.startActivity(intent);
// if (context instanceof Activity) {
// ((Activity) context).overridePendingTransition(R.anim.slide_open_enter, R.anim.slide_open_exit);
// }
} }
/** /**
......
...@@ -7,16 +7,20 @@ ...@@ -7,16 +7,20 @@
<item name="colorAccent">@color/colorAccent</item> <item name="colorAccent">@color/colorAccent</item>
</style> </style>
<!--<style name="noAnimation">--> <style name="default_animation" parent="@android:style/Animation.Translucent">
<!--<item name="android:windowEnterAnimation">@null</item>--> <item name="android:windowEnterAnimation">@anim/slide_open_enter</item>
<!--<item name="android:windowExitAnimation">@null</item>--> <item name="android:windowExitAnimation">@anim/slide_close_exit</item>
<item name="android:taskOpenEnterAnimation">@anim/slide_open_enter</item>
<!--&lt;!&ndash;<item name="android:windowEnterAnimation">@android:anim/slide_in_left</item>&ndash;&gt;--> <item name="android:taskOpenExitAnimation">@anim/slide_open_exit</item>
<!--&lt;!&ndash;<item name="android:windowExitAnimation">@android:anim/slide_out_right</item>&ndash;&gt;--> <item name="android:activityOpenEnterAnimation">@anim/slide_open_enter</item>
<item name="android:activityOpenExitAnimation">@anim/slide_open_exit</item>
<!--&lt;!&ndash;<item name="android:windowEnterAnimation">@android:anim/fade_in</item>&ndash;&gt;--> <item name="android:activityCloseEnterAnimation">@anim/slide_close_enter</item>
<!--&lt;!&ndash;<item name="android:windowExitAnimation">@android:anim/fade_out</item>&ndash;&gt;--> <item name="android:activityCloseExitAnimation">@anim/slide_close_exit</item>
<!--</style>--> <item name="android:taskCloseEnterAnimation">@anim/slide_close_enter</item>
<item name="android:taskCloseExitAnimation">@anim/slide_close_exit</item>
<item name="android:taskToBackEnterAnimation">@anim/slide_close_enter</item>
<item name="android:taskToBackExitAnimation">@anim/slide_close_exit</item>
</style>
<style name="style_bg_transparent_dialog" parent="Base.Theme.AppCompat.Light.Dialog"> <style name="style_bg_transparent_dialog" parent="Base.Theme.AppCompat.Light.Dialog">
<item name="android:windowBackground">@android:color/transparent</item> <item name="android:windowBackground">@android:color/transparent</item>
...@@ -24,7 +28,7 @@ ...@@ -24,7 +28,7 @@
</style> </style>
<style name="QMTheme" parent="QMUI.Compat.NoActionBar"> <style name="QMTheme" parent="QMUI.Compat.NoActionBar">
<!--<item name="android:windowAnimationStyle">@style/noAnimation</item>--> <item name="android:windowAnimationStyle">@style/default_animation</item>
<item name="android:windowIsTranslucent">true</item> <item name="android:windowIsTranslucent">true</item>
<!-- toolbar(actionbar)颜色 --> <!-- toolbar(actionbar)颜色 -->
<item name="colorPrimary">@color/main_color</item> <item name="colorPrimary">@color/main_color</item>
......
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