yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '直播间提示优化'

Browse Source 
# Conflicts:
#	config.gradle
This commit is contained in:
Martin
2024-07-09 13:49:31 +08:00
parent 2cefd50ac3 769f527565
commit 94156e2984
95 changed files with 1315 additions and 673 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
main/src/main/AndroidManifest.xml
View File

@@ -62,8 +62,8 @@
android:screenOrientation="portrait" />
<activity
android:name=".activity.LanguageSettingActivity"
android:screenOrientation="portrait"
android:configChanges="locale|layoutDirection|keyboard" />
android:configChanges="locale|layoutDirection|keyboard"
android:screenOrientation="portrait" />
<activity
android:name=".activity.SearchActivity"
android:screenOrientation="portrait"
@@ -156,15 +156,25 @@
<activity
android:name=".activity.RedPacketUsersActivity"
android:screenOrientation="portrait" />
<activity android:name=".activity.UserAvatarSelectActivity"
<activity
android:name=".activity.UserAvatarSelectActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.BattlePassActivity"
android:screenOrientation="portrait" />
<activity android:name=".activity.BattlePassActivity" />
<activity android:name=".activity.MainHomeCommunityActivity"
<activity
android:name=".activity.MainHomeCommunityActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.FeedbackActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.FeedbackSuccessActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.FeedbackEditActivity"
android:screenOrientation="portrait" />
<activity android:name=".activity.FeedbackActivity" />
<activity android:name=".activity.FeedbackSuccessActivity" />
<activity android:name=".activity.FeedbackEditActivity" />
</application>
</manifest>

3
main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java
View File

@@ -15,12 +15,9 @@ import com.lxj.xpopup.XPopup;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.MobclickAgent;
import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.dialog.SkitCheckInWasSuccessfulPopup;
import com.yunbao.common.event.FloatWarOrderEvent;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.live.dialog.LiveBuyGuardDialog;
import com.yunbao.live.dialog.LiveGuardDialog;
import com.yunbao.live.dialog.LivePrankDialogFragment;
import com.yunbao.main.R;