Merge remote-tracking branch 'origin/master'

common/src/main/java/com/yunbao/common/views/weight/NobleNoticeView.java

@@ -80,7 +80,7 @@ public class NobleNoticeView extends FrameLayout {
         rootView = LayoutInflater.from(mContext).inflate(R.layout.view_noble_notice, this, true);
         svagaBc = rootView.findViewById(R.id.svaga_bc);
         rootLayout = rootView.findViewById(R.id.root_layout);
-        gotoRoomView = rootView.findViewById(R.id.goto_room_view);
+        gotoRoomView = rootView.findViewById(R.id.got_room_view);
         contextLayout = rootView.findViewById(R.id.context_layout);
         scrollLayout = rootView.findViewById(R.id.scroll_layout);
         nobleIcon = rootView.findViewById(R.id.noble_icon);
@@ -111,7 +111,6 @@ public class NobleNoticeView extends FrameLayout {
             findViewById(R.id.anchor_nickname).setVisibility(GONE);
             openNoble.setText(mContext.getString(R.string.open_noble2));
         }else {
-            gotoRoomView.setVisibility(VISIBLE);
             findViewById(R.id.in).setVisibility(VISIBLE);
             findViewById(R.id.anchor_nickname).setVisibility(VISIBLE);
             openNoble.setText(mContext.getString(R.string.open_noble));
@@ -254,7 +253,7 @@ public class NobleNoticeView extends FrameLayout {
         @Override
         public void onStep(int frame, double v) {
             System.out.println("frame = " + frame);
-            if (frame == 10) {
+            if (frame == 20) {
                 setButtonPosition(roleType);
                 observable.observeOn(AndroidSchedulers.mainThread())
                         .subscribe(bitmap -> {
@@ -270,7 +269,7 @@ public class NobleNoticeView extends FrameLayout {
                         }).isDisposed();
 
             }
-            if (frame == 150) {
+            if (frame == 135) {
                 contextLayout.setVisibility(GONE);
                 gotoRoomView.setVisibility(GONE);
                 scrollLayout.clearAnimation();

common/src/main/res/anim/in_from_right.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="300"
+        android:fromXDelta="100%"
+        android:toXDelta="0%" />
+</set>

common/src/main/res/anim/in_from_right_abit.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="300"
+        android:fromXDelta="0"
+        android:toXDelta="-15%" />
+</set>

common/src/main/res/anim/out_from_right.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="3000"
+        android:fromXDelta="-15%"
+        android:toXDelta="0%" />
+</set>

common/src/main/res/anim/out_to_right.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="300"
+        android:fromXDelta="0%"
+        android:toXDelta="100%" />
+</set>

common/src/main/res/anim/out_to_right_abit.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="300"
+        android:fromXDelta="-15%"
+        android:toXDelta="0%" />
+</set>

common/src/main/res/layout/view_noble_notice.xml

@@ -12,7 +12,7 @@
 
 
     <TextView
-        android:id="@+id/goto_room_view"
+        android:id="@+id/got_room_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
@@ -33,7 +33,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="42dp"
         android:layout_marginEnd="10dp"
-        android:layout_toStartOf="@id/goto_room_view"
+        android:layout_toStartOf="@id/got_room_view"
         android:scrollbars="none">
 
         <RelativeLayout

common/src/main/res/values/style.xml

@@ -6,9 +6,9 @@
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="android:colorBackground">@color/background</item>
-        <item name="android:windowAnimationStyle">@style/Animation</item>
+        <item name="android:windowAnimationStyle">@style/AnimationActivity</item>
         <!-- Status bar color. -->
-        <item name="android:statusBarColor" >@color/colorPrimary</item>
+        <item name="android:statusBarColor">@color/colorPrimary</item>
     </style>
 
     <style name="dialog" parent="AppTheme">
@@ -35,6 +35,7 @@
         <!--显示区域以外是否使用黑色半透明背景-->
         <item name="android:backgroundDimEnabled">true</item>
     </style>
+
     <style name="dialog4" parent="AppTheme">
         <item name="android:windowFrame">@null</item>
         <item name="android:windowNoTitle">true</item>
@@ -44,6 +45,7 @@
         <!--显示区域以外是否使用黑色半透明背景-->
         <item name="android:backgroundDimEnabled">false</item>
     </style>
+
     <style name="dialog3" parent="AppTheme">
         <item name="android:windowFrame">@null</item>
         <item name="android:windowNoTitle">true</item>
@@ -69,10 +71,12 @@
         <item name="android:windowEnterAnimation">@anim/left_anim_enter</item>
         <item name="android:windowExitAnimation">@anim/left_anim_exit</item>
     </style>
+
     <style name="RightLeftToAnim" parent="android:Animation">
         <item name="android:windowEnterAnimation">@anim/right_anim_enter</item>
         <item name="android:windowExitAnimation">@anim/right_anim_exit</item>
     </style>
+
     <style name="groupLast" parent="AppTheme">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">1dp</item>
@@ -93,6 +97,7 @@
         <item name="android:paddingLeft">15dp</item>
         <item name="android:paddingRight">15dp</item>
     </style>
+
     <style name="Theme.PayssionTrans" parent="Theme.AppCompat.Light">
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
@@ -107,15 +112,22 @@
     <style name="Animation">
         <item name="android:activityOpenEnterAnimation">@null</item>
         <item name="android:activityOpenExitAnimation">@null</item>
-        <item name="android:activityCloseEnterAnimation">@null</item>
-        <item name="android:activityCloseExitAnimation">@null</item>
+        <item name="android:activityCloseEnterAnimation">@anim/out_from_right</item>
+        <item name="android:activityCloseExitAnimation">@anim/out_from_right</item>
         <item name="android:taskOpenEnterAnimation">@null</item>
         <item name="android:taskOpenExitAnimation">@null</item>
-        <item name="android:taskCloseEnterAnimation">@null</item>
-        <item name="android:taskCloseExitAnimation">@null</item>
+        <item name="android:taskCloseEnterAnimation">@anim/out_from_right</item>
+        <item name="android:taskCloseExitAnimation">@anim/out_from_right</item>
         <item name="android:taskToFrontEnterAnimation">@null</item>
         <item name="android:taskToFrontExitAnimation">@null</item>
-        <item name="android:taskToBackEnterAnimation">@null</item>
-        <item name="android:taskToBackExitAnimation">@null</item>
+        <item name="android:taskToBackEnterAnimation">@anim/out_from_right</item>
+        <item name="android:taskToBackExitAnimation">@anim/out_from_right</item>
+    </style>
+    <!-- 页面弹出（入场出场）动画 -->
+    <style name="AnimationActivity" parent="@android:style/Animation">
+        <item name="android:activityOpenEnterAnimation">@anim/in_from_right</item>
+        <item name="android:activityOpenExitAnimation">@anim/in_from_right_abit</item>
+        <item name="android:activityCloseEnterAnimation">@anim/out_to_right_abit</item>
+        <item name="android:activityCloseExitAnimation">@anim/out_to_right</item>
     </style>
 </resources>