YUSHENG/yusheng-android
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'master/dev-lxj-beta' into dev-lxj-beta

Browse Source
This commit is contained in:
梁小江
2025-11-12 11:44:39 +08:00
parent 8080e476a5 ee06345de7
commit 4a59bcd797
382 changed files with 12604 additions and 2585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modulemain/src/main/java/com/xscm/modulemain/activity/MainActivity.java
View File

@@ -378,7 +378,7 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
selectShow(2);
} else if (id == R.id.rl_me) {
mBinding.llBottomBar.setBackgroundResource(com.xscm.moduleutil.R.drawable.home_bbar_yuan);
mBinding.llBottomBar.setBackgroundResource(com.xscm.moduleutil.R.drawable.home_bbar_xz);
selectShow(3);
//C0101我的界面
@@ -895,6 +895,7 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
public void activitiesPermissionSuccess(ActivitiesPermission activitiesPermission) {
List<PermissionPicBean> list;
if (activitiesPermission != null) {
mBinding.dvr.setVisibility(View.VISIBLE);
list = new ArrayList<>();
if (activitiesPermission.getFirst_charge_permission() == 1) {
PermissionPicBean bean = new PermissionPicBean();
@@ -945,6 +946,8 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
}
}
});
}else {
mBinding.dvr.setVisibility(View.GONE);
}
}

65
modulemain/src/main/res/layout/activity_main.xml
View File

@@ -220,36 +220,45 @@
android:src="@mipmap/icon_guanbi"/>
</com.xscm.moduleutil.widget.DropView>
<!-- <ImageView-->
<!-- android:id="@+id/iv_shouchl"-->
<!-- android:layout_width="@dimen/dp_57"-->
<!-- android:layout_height="@dimen/dp_57"-->
<!-- android:layout_alignParentBottom="true"-->
<!-- android:layout_alignParentEnd="true"-->
<!-- android:layout_marginEnd="@dimen/dp_20"-->
<!-- android:layout_marginBottom="@dimen/dp_100"-->
<!-- android:src="@mipmap/shouchl"/>-->
<!-- <ImageView-->
<!-- android:id="@+id/iv_shouchl"-->
<!-- android:layout_width="@dimen/dp_57"-->
<!-- android:layout_height="@dimen/dp_57"-->
<!-- android:layout_alignParentBottom="true"-->
<!-- android:layout_alignParentEnd="true"-->
<!-- android:layout_marginEnd="@dimen/dp_20"-->
<!-- android:layout_marginBottom="@dimen/dp_100"-->
<!-- android:src="@mipmap/shouchl"/>-->
<com.stx.xhb.xbanner.XBanner
android:id="@+id/banner"
android:layout_width="@dimen/dp_75"
android:layout_height="@dimen/dp_85"
android:scaleType="fitCenter"
app:AutoPlayTime="3000"
android:layout_alignParentBottom="true"
<com.xscm.moduleutil.widget.DropHomeView
android:id="@+id/dvr"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:layout_alignParentEnd="true"
app:pageChangeDuration="3000"
app:pointContainerPosition="BOTTOM"
app:pointNormal="@mipmap/room_ic_banner_point_normal"
app:pointSelect="@mipmap/room_ic_banner_point_select"
app:pointTopBottomPadding="@dimen/dp_2"
android:layout_marginEnd="@dimen/dp_20"
android:layout_marginBottom="@dimen/dp_100"
app:pointsPosition="CENTER"
app:pointsVisibility="true"
android:clickable="true"
android:focusable="true"
/>
android:orientation="horizontal"
android:visibility="gone"
tools:visibility="visible">
<com.stx.xhb.xbanner.XBanner
android:id="@+id/banner"
android:layout_width="@dimen/dp_75"
android:layout_height="@dimen/dp_85"
android:scaleType="fitCenter"
app:AutoPlayTime="3000"
app:pageChangeDuration="3000"
app:pointContainerPosition="BOTTOM"
app:pointNormal="@mipmap/room_ic_banner_point_normal"
app:pointSelect="@mipmap/room_ic_banner_point_select"
app:pointTopBottomPadding="@dimen/dp_2"
android:layout_marginEnd="@dimen/dp_20"
app:pointsPosition="CENTER"
app:pointsVisibility="true"
android:clickable="true"
android:focusable="true"
/>
</com.xscm.moduleutil.widget.DropHomeView>
<app.dinus.com.loadingdrawable.LoadingView
android:id="@+id/cool_wait_view"