Bladeren bron

兼容8.0

詹子聪 5 jaren geleden
bovenliggende
commit
5e71a41b26

+ 1 - 1
app/build.gradle

@@ -125,7 +125,7 @@ dependencies {
     // 右划销毁Activity,另外:sockeqwe/SwipeBack也可以参考
     //implementation 'com.aitangba:swipeback:1.0.3'
     //implementation 'com.hannesdorfmann:swipeback:1.0.4'
-    implementation 'com.jude:swipebackhelper:3.1.2'
+    //implementation 'com.jude:swipebackhelper:3.1.2'
     // 图片点击可以放大缩小
     implementation 'com.github.chrisbanes:PhotoView:1.2.6'
 }

+ 0 - 1
app/src/main/AndroidManifest.xml

@@ -102,7 +102,6 @@
 
         <activity
             android:name="com.miekir.eden.ui.home.goods.detail.MeizhiDetailActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/AppTheme.MeizhiDetail" />
 
         <activity

+ 3 - 4
app/src/main/java/com/miekir/eden/base/BaseBeiActivity.java

@@ -6,7 +6,6 @@ import android.view.View;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.Toolbar;
 
-import com.jude.swipbackhelper.SwipeBackHelper;
 import com.miekir.eden.R;
 import com.miekir.mvp.view.BaseMVPActivity;
 
@@ -28,7 +27,7 @@ public abstract class BaseBeiActivity extends BaseMVPActivity {
     protected void onPostCreate(@Nullable Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);
         if (canSwipeBack()) {
-            SwipeBackHelper.onPostCreate(this);
+            //SwipeBackHelper.onPostCreate(this);
         }
     }
 
@@ -36,7 +35,7 @@ public abstract class BaseBeiActivity extends BaseMVPActivity {
     protected void onDestroy() {
         super.onDestroy();
         if (canSwipeBack()) {
-            SwipeBackHelper.onDestroy(this);
+            //SwipeBackHelper.onDestroy(this);
         }
     }
 
@@ -44,7 +43,7 @@ public abstract class BaseBeiActivity extends BaseMVPActivity {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if (canSwipeBack()) {
-            SwipeBackHelper.onCreate(this);
+            //SwipeBackHelper.onCreate(this);
         }
 
         // 状态栏深色模式,改变状态栏文字颜色(白底黑字)

+ 6 - 6
app/src/main/res/values/styles.xml

@@ -66,11 +66,6 @@
         <item name="android:statusBarColor">@color/colorPrimary</item>
         <!--加了下面这句会导致状态栏文字颜色变黑色-->
         <!--<item name="android:windowLightStatusBar" tools:targetApi="23">true</item>-->
-
-        <!--滑动退出activity背景透明,不设滑动关闭时背景就是黑的-->
-        <item name="android:windowIsTranslucent">true</item>
-        <!--Activity右滑进出的动画,觉得这个不好看随便换成自己的-->
-        <item name="android:windowAnimationStyle">@style/SlideRightAnimation</item>
     </style>
 
 
@@ -99,7 +94,12 @@
         <!--<item name="android:textSize">16sp</item>-->
 
         <item name="android:windowIsTranslucent">true</item>
-        <!--用下面这个属性代替windowIsTranslucent,否则在8.0上配合portrait属性会导致闪退-->
+        <!--用下面这个属性代替windowIsTranslucent,否则在8.0上配合portrait属性会导致闪退
+        如果一个 targetSdkVersion>26的Android App
+        运行在Android 8.0(含) 以上的设备上时
+        如果启动的Activity为透明Activity时,screenOrientation 需为默认状态,
+        这种情况下,透明Activity使用的是栈中,上一层可见Activity的orientation设定-->
         <!--<item name="android:windowDisablePreview">true</item>-->
+
     </style>
 </resources>