1.登陆修改
@@ -360,7 +360,7 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
|
|||||||
.setLogBtnBackgroundPath("theme_bg")
|
.setLogBtnBackgroundPath("theme_bg")
|
||||||
//切换到其他方式
|
//切换到其他方式
|
||||||
.setSwitchAccText("其他登录方式")
|
.setSwitchAccText("其他登录方式")
|
||||||
.setSwitchAccTextColor(Color.parseColor("#333333"))
|
.setSwitchAccTextColor(Color.parseColor("#FC7285"))
|
||||||
.setSwitchAccTextSize(12)
|
.setSwitchAccTextSize(12)
|
||||||
.setSwitchOffsetY(390)
|
.setSwitchOffsetY(390)
|
||||||
//协议栏
|
//协议栏
|
||||||
|
|||||||
@@ -161,7 +161,7 @@
|
|||||||
android:layout_marginRight="@dimen/dp_13"
|
android:layout_marginRight="@dimen/dp_13"
|
||||||
android:gravity="right"
|
android:gravity="right"
|
||||||
android:text="@string/login_send_code"
|
android:text="@string/login_send_code"
|
||||||
android:textColor="#5F3EAB"
|
android:textColor="#FF8ACC"
|
||||||
android:textSize="@dimen/sp_16"
|
android:textSize="@dimen/sp_16"
|
||||||
tools:visibility="visible" />
|
tools:visibility="visible" />
|
||||||
|
|
||||||
@@ -295,7 +295,8 @@
|
|||||||
android:text="@string/login_btn_qt"
|
android:text="@string/login_btn_qt"
|
||||||
android:textColor="@color/color_666666"
|
android:textColor="@color/color_666666"
|
||||||
android:textSize="@dimen/sp_12"
|
android:textSize="@dimen/sp_12"
|
||||||
tools:visibility="visible" />
|
android:visibility="invisible"
|
||||||
|
tools:visibility="invisible" />
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/ll_other_login"
|
android:id="@+id/ll_other_login"
|
||||||
@@ -305,8 +306,8 @@
|
|||||||
android:gravity="center_horizontal"
|
android:gravity="center_horizontal"
|
||||||
android:layout_marginBottom="@dimen/dp_55"
|
android:layout_marginBottom="@dimen/dp_55"
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
android:visibility="visible"
|
android:visibility="invisible"
|
||||||
tools:visibility="visible">
|
tools:visibility="invisible">
|
||||||
|
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
|
|||||||
8
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,8 +1,6 @@
|
|||||||
#Wed May 07 09:31:48 CST 2025
|
#Mon Sep 22 21:05:11 CST 2025
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
#distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-8.7-all.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/distsl.
|
||||||
#distributionUrl=file:///D:/Greadle/gradle-8.10.2-all.zip
|
|
||||||
distributionUrl=file:///D:/Gradle/gradle-8.10.2-bin.zip
|
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 856 B After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 652 B After Width: | Height: | Size: 1.3 KiB |
@@ -2,7 +2,7 @@
|
|||||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:shape="rectangle">
|
android:shape="rectangle">
|
||||||
|
|
||||||
<solid android:color="#ff6c49e4 " />
|
<solid android:color="#FC7285 " />
|
||||||
<corners
|
<corners
|
||||||
android:bottomLeftRadius="22dp"
|
android:bottomLeftRadius="22dp"
|
||||||
android:bottomRightRadius="22dp"
|
android:bottomRightRadius="22dp"
|
||||||
|
|||||||
@@ -294,6 +294,7 @@
|
|||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
|
android:visibility="gone"
|
||||||
android:id="@+id/zs"
|
android:id="@+id/zs"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 2.3 MiB |
|
Before Width: | Height: | Size: 7.8 KiB After Width: | Height: | Size: 24 KiB |
@@ -294,7 +294,7 @@
|
|||||||
|
|
||||||
|
|
||||||
<!-- 主题色 -->
|
<!-- 主题色 -->
|
||||||
<color name="colorPrimary">#6C49E4</color>
|
<color name="colorPrimary">#FC7285</color>
|
||||||
|
|
||||||
<!-- 辅助色 -->
|
<!-- 辅助色 -->
|
||||||
<color name="colorSecondary1">#F0EEF7</color>
|
<color name="colorSecondary1">#F0EEF7</color>
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ public class CircleFragment extends BaseMvpFragment<CirclePresenter, FragmentCir
|
|||||||
protected void initData () {
|
protected void initData () {
|
||||||
list=new ArrayList<>();
|
list=new ArrayList<>();
|
||||||
list.add(new MyBagBean("发现", "1"));
|
list.add(new MyBagBean("发现", "1"));
|
||||||
list.add(new MyBagBean("扩列", "2"));
|
// list.add(new MyBagBean("扩列", "2"));
|
||||||
|
|
||||||
mBinding.viewPager.setAdapter(new MyFragmentPagerAdapter(getChildFragmentManager(), list));
|
mBinding.viewPager.setAdapter(new MyFragmentPagerAdapter(getChildFragmentManager(), list));
|
||||||
mBinding.tabLayout.setViewPager(mBinding.viewPager);
|
mBinding.tabLayout.setViewPager(mBinding.viewPager);
|
||||||
|
|||||||
@@ -15,9 +15,12 @@ import androidx.fragment.app.FragmentPagerAdapter;
|
|||||||
*/
|
*/
|
||||||
public class SectionsPagerAdapter extends FragmentPagerAdapter {
|
public class SectionsPagerAdapter extends FragmentPagerAdapter {
|
||||||
|
|
||||||
@StringRes
|
// @StringRes
|
||||||
|
// private static final int[] TAB_TITLES = new int[]{com.xscm.moduleutil.R.string.room_rank, com.xscm.moduleutil.R.string.wealth_rank,
|
||||||
|
// com.xscm.moduleutil.R.string.charm_rank, com.xscm.moduleutil.R.string.true_love_rank};
|
||||||
|
//// com.xscm.moduleutil.R.string.guild_rank, @StringRes
|
||||||
private static final int[] TAB_TITLES = new int[]{com.xscm.moduleutil.R.string.room_rank, com.xscm.moduleutil.R.string.wealth_rank,
|
private static final int[] TAB_TITLES = new int[]{com.xscm.moduleutil.R.string.room_rank, com.xscm.moduleutil.R.string.wealth_rank,
|
||||||
com.xscm.moduleutil.R.string.charm_rank, com.xscm.moduleutil.R.string.true_love_rank};
|
com.xscm.moduleutil.R.string.charm_rank};
|
||||||
// com.xscm.moduleutil.R.string.guild_rank,
|
// com.xscm.moduleutil.R.string.guild_rank,
|
||||||
private final Context mContext;
|
private final Context mContext;
|
||||||
|
|
||||||
|
|||||||