Commit 18ddb3c2 authored by shiyl's avatar shiyl

fix 线上错误 id: 4930077104140

线上8.0手机“只有全屏不透明的activity可以设置orientation”问题
parent 085c95ea
...@@ -72,12 +72,6 @@ ...@@ -72,12 +72,6 @@
<style name="YDSubwayCommonTheme" parent="Theme.AppCompat.Light.NoActionBar"> <style name="YDSubwayCommonTheme" parent="Theme.AppCompat.Light.NoActionBar">
<item name="android:windowAnimationStyle">@style/AnimationActivity</item> <item name="android:windowAnimationStyle">@style/AnimationActivity</item>
<!-- <item name="android:windowIsTranslucent">true</item>-->
<!-- <item name="android:windowDisablePreview">true</item>-->
<!-- <item name="android:windowContentOverlay">@null</item>-->
<!-- <item name="android:windowEnterAnimation">@anim/slide_right_in</item>-->
<!-- <item name="android:windowExitAnimation">@anim/slide_right_out</item>-->
<!-- <item name="android:icon">@android:color/transparent</item>-->
</style> </style>
<style name="subway_theme_day" parent="YDSubwayCommonTheme"> <style name="subway_theme_day" parent="YDSubwayCommonTheme">
......
...@@ -3,78 +3,35 @@ ...@@ -3,78 +3,35 @@
package="com.yidian.shenghuoquan.bmanagercenter"> package="com.yidian.shenghuoquan.bmanagercenter">
<application> <application>
<activity <activity android:name="com.yidian.shenghuoquan.bmanagercenter.ui.auth.LifeAccountEnterpriseAuthCompleteActivity" />
android:name="com.yidian.shenghuoquan.bmanagercenter.ui.auth.LifeAccountEnterpriseAuthCompleteActivity" <activity android:name="com.yidian.shenghuoquan.bmanagercenter.ui.auth.LifeAccountPersonalAuthCompleteActivity" />
android:theme="@style/Transparent" /> <activity android:name="com.yidian.shenghuoquan.bmanagercenter.ui.auth.LifeAccountCreateCompleteActivity" />
<activity <activity android:name="com.yidian.shenghuoquan.bmanagercenter.ui.store.StoreManagementActivity" />
android:name="com.yidian.shenghuoquan.bmanagercenter.ui.auth.LifeAccountPersonalAuthCompleteActivity" <activity android:name="com.yidian.shenghuoquan.bmanagercenter.ui.store.EditStoreActivity" />
android:theme="@style/Transparent" /> <activity android:name="com.yidian.shenghuoquan.bmanagercenter.ui.store.SelectAddressActivity" />
<activity <activity android:name="com.yidian.shenghuoquan.bmanagercenter.ui.store.SearchAddActivity" />
android:name="com.yidian.shenghuoquan.bmanagercenter.ui.auth.LifeAccountCreateCompleteActivity" <activity android:name="com.yidian.shenghuoquan.bmanagercenter.ui.auth.LifeAccountIdentityActivity" />
android:theme="@style/Transparent" /> <activity android:name="com.yidian.shenghuoquan.bmanagercenter.ui.auth.LifeAccountAuthActivity" />
<activity
android:name="com.yidian.shenghuoquan.bmanagercenter.ui.store.StoreManagementActivity"
android:theme="@style/Transparent" />
<activity
android:name="com.yidian.shenghuoquan.bmanagercenter.ui.store.EditStoreActivity"
android:theme="@style/Transparent" />
<activity
android:name="com.yidian.shenghuoquan.bmanagercenter.ui.store.SelectAddressActivity"
android:theme="@style/Transparent" />
<activity
android:name="com.yidian.shenghuoquan.bmanagercenter.ui.store.SearchAddActivity"
android:theme="@style/Transparent" />
<activity
android:name="com.yidian.shenghuoquan.bmanagercenter.ui.auth.LifeAccountIdentityActivity"
android:theme="@style/Transparent" />
<activity
android:name="com.yidian.shenghuoquan.bmanagercenter.ui.auth.LifeAccountAuthActivity"
android:theme="@style/Transparent" />
<activity <activity
android:name="com.yidian.shenghuoquan.bmanagercenter.ui.auth.LifeAccountCreateActivity" android:name="com.yidian.shenghuoquan.bmanagercenter.ui.auth.LifeAccountCreateActivity"
android:theme="@style/Transparent"
android:windowSoftInputMode="stateHidden|adjustResize" /> android:windowSoftInputMode="stateHidden|adjustResize" />
<activity <activity android:name="com.yidian.shenghuoquan.bmanagercenter.ui.auth.LifeAccountPersonalAuthActivity" />
android:name="com.yidian.shenghuoquan.bmanagercenter.ui.auth.LifeAccountPersonalAuthActivity" <activity android:name="com.yidian.shenghuoquan.bmanagercenter.ui.auth.LifeAccountEnterpriseAuthActivity" />
android:theme="@style/Transparent" />
<activity
android:name="com.yidian.shenghuoquan.bmanagercenter.ui.auth.LifeAccountEnterpriseAuthActivity"
android:theme="@style/Transparent" />
<activity <activity
android:name="com.yidian.shenghuoquan.bmanagercenter.personnel.ui.MyStaffActivity" android:name="com.yidian.shenghuoquan.bmanagercenter.personnel.ui.MyStaffActivity"
android:launchMode="singleTask" android:launchMode="singleTask" />
android:theme="@style/Transparent" /> <activity android:name="com.yidian.shenghuoquan.bmanagercenter.personnel.ui.ManagerInfoActivity" />
<activity <activity android:name="com.yidian.shenghuoquan.bmanagercenter.personnel.ui.ManagerChangeActivity" />
android:name="com.yidian.shenghuoquan.bmanagercenter.personnel.ui.ManagerInfoActivity" <activity android:name="com.yidian.shenghuoquan.bmanagercenter.personnel.ui.StaffInfoActivity" />
android:theme="@style/Transparent" /> <activity android:name="com.yidian.shenghuoquan.bmanagercenter.personnel.ui.StaffManageActivity" />
<activity <activity android:name="com.yidian.shenghuoquan.bmanagercenter.personnel.ui.AddStaffActivity" />
android:name="com.yidian.shenghuoquan.bmanagercenter.personnel.ui.ManagerChangeActivity" <activity android:name="com.yidian.shenghuoquan.bmanagercenter.ui.center.MerchantCenterActivity" />
android:theme="@style/Transparent" /> <activity android:name="com.yidian.shenghuoquan.bmanagercenter.ui.center.MerchantInfoActivity" />
<activity
android:name="com.yidian.shenghuoquan.bmanagercenter.personnel.ui.StaffInfoActivity"
android:theme="@style/Transparent" />
<activity
android:name="com.yidian.shenghuoquan.bmanagercenter.personnel.ui.StaffManageActivity"
android:theme="@style/Transparent" />
<activity
android:name="com.yidian.shenghuoquan.bmanagercenter.personnel.ui.AddStaffActivity"
android:theme="@style/Transparent" />
<activity
android:name="com.yidian.shenghuoquan.bmanagercenter.ui.center.MerchantCenterActivity"
android:theme="@style/Transparent" />
<activity
android:name="com.yidian.shenghuoquan.bmanagercenter.ui.center.MerchantInfoActivity"
android:theme="@style/Transparent" />
<activity <activity
android:name="com.yidian.shenghuoquan.bmanagercenter.ui.center.LifeAccountModifyNameActivity" android:name="com.yidian.shenghuoquan.bmanagercenter.ui.center.LifeAccountModifyNameActivity"
android:theme="@style/Transparent"
android:windowSoftInputMode="stateVisible" /> android:windowSoftInputMode="stateVisible" />
<activity <activity android:name="com.yidian.shenghuoquan.bmanagercenter.ui.center.MerchantAuthInfoActivity" />
android:name="com.yidian.shenghuoquan.bmanagercenter.ui.center.MerchantAuthInfoActivity" <activity android:name="com.yidian.shenghuoquan.bmanagercenter.ui.auth.ChooseCareerActivity" />
android:theme="@style/Transparent" />
<activity
android:name="com.yidian.shenghuoquan.bmanagercenter.ui.auth.ChooseCareerActivity"
android:theme="@style/Transparent" />
<activity android:name="com.yidian.shenghuoquan.bmanagercenter.wallet.ui.MyWalletActivity" /> <activity android:name="com.yidian.shenghuoquan.bmanagercenter.wallet.ui.MyWalletActivity" />
<activity android:name="com.yidian.shenghuoquan.bmanagercenter.wallet.ui.VerifyIdentityActivity" /> <activity android:name="com.yidian.shenghuoquan.bmanagercenter.wallet.ui.VerifyIdentityActivity" />
<activity android:name="com.yidian.shenghuoquan.bmanagercenter.wallet.ui.WeChatAuthActivity" /> <activity android:name="com.yidian.shenghuoquan.bmanagercenter.wallet.ui.WeChatAuthActivity" />
......
<resources> <resources>
<style name="Transparent" parent="android:Theme.Light">
<item name="android:windowIsTranslucent">true</item>
</style>
<style name="merchant_center_bottom_hint_dialog" parent="android:style/Theme.Dialog"> <style name="merchant_center_bottom_hint_dialog" parent="android:style/Theme.Dialog">
<item name="android:windowBackground">@android:color/transparent</item> <item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowNoTitle">true</item> <item name="android:windowNoTitle">true</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