Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
lib_base
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sikang
lib_base
Commits
45b1bc40
Commit
45b1bc40
authored
Nov 12, 2018
by
sikang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复Activity动画
parent
8072c988
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
59 deletions
+19
-59
src/main/java/tech/starwin/LibConfig.java
+4
-30
src/main/java/tech/starwin/base/BaseActivity.java
+0
-10
src/main/java/tech/starwin/mvp/ui/activity/RegionActivity.java
+0
-5
src/main/java/tech/starwin/utils/context_utils/ActivityJumper.java
+0
-3
src/main/res/values/styles.xml
+15
-11
No files found.
src/main/java/tech/starwin/LibConfig.java
View file @
45b1bc40
...
@@ -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);
// }
// });
}
}
}
}
...
...
src/main/java/tech/starwin/base/BaseActivity.java
View file @
45b1bc40
...
@@ -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();
// }
}
}
src/main/java/tech/starwin/mvp/ui/activity/RegionActivity.java
View file @
45b1bc40
...
@@ -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
)
{
...
...
src/main/java/tech/starwin/utils/context_utils/ActivityJumper.java
View file @
45b1bc40
...
@@ -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);
// }
}
}
/**
/**
...
...
src/main/res/values/styles.xml
View file @
45b1bc40
...
@@ -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>
<!--<!–<item name="android:windowEnterAnimation">@android:anim/slide_in_left</item>–>-->
<item
name=
"android:taskOpenExitAnimation"
>
@anim/slide_open_exit
</item>
<!--<!–<item name="android:windowExitAnimation">@android:anim/slide_out_right</item>–>-->
<item
name=
"android:activityOpenEnterAnimation"
>
@anim/slide_open_enter
</item>
<item
name=
"android:activityOpenExitAnimation"
>
@anim/slide_open_exit
</item>
<!--<!–<item name="android:windowEnterAnimation">@android:anim/fade_in</item>–>-->
<item
name=
"android:activityCloseEnterAnimation"
>
@anim/slide_close_enter
</item>
<!--<!–<item name="android:windowExitAnimation">@android:anim/fade_out</item>–>-->
<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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment