2024-5-12 代码备份

启动页导航调整
首页个人信息排版调整
创客页面UI调整、开发完成
商品列表itemview开发完成
我的页面UI调整完成
首页365专区接口调试完成

app/src/main/java/com/yihucha/hbyhc/config/HttpUrl.java

@@ -8,8 +8,10 @@ public class HttpUrl {
     public static boolean IS_RELEASE = false;
     //生成·
     public static String BASE_URL_RELEASE = "https://app.bjtdba.com/";
+//    public static String BASE_URL_RELEASE = "https://api.hebeiyhc.com";
     //测试
     public static String BASE_URL_DEBUG="https://test.bjtdba.com/";
+//    public static String BASE_URL_DEBUG="https://test.hebeiyhc.com";
     //预生产
 //    public static String BASE_URL_DEBUG = "https://pre.bjtdba.com/";
     public static String CHANNEL_NAME = "友盟";

app/src/main/java/com/yihucha/hbyhc/presentation/MainActivity.java

@@ -72,7 +72,7 @@ public class MainActivity extends BaseActivity implements View.OnClickListener {
     private MineFragment mineFragment;
     private ShoppingFragment shoppingFragment;
 //    private NearbyFragment nearbyFragment;
-    private AnnuityFragment nearbyFragment;
+    private NearbyFragment nearbyFragment;
     private BigWarehouseFragment bigWarehouseFragment;
 
     private ActivityMainBinding binding;
@@ -575,7 +575,7 @@ public class MainActivity extends BaseActivity implements View.OnClickListener {
         FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
         //判断Fragment是否为空
         if (nearbyFragment == null) {
-            nearbyFragment = new AnnuityFragment();
+            nearbyFragment = new NearbyFragment();
             //添加Fragmet1到事务中
             transaction.add(R.id.content_layout, nearbyFragment);
         }

app/src/main/res/layout/activity_main.xml

@@ -54,6 +54,7 @@
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:gravity="center"
+            android:visibility="gone"
             android:orientation="vertical">
 
             <ImageView
@@ -92,7 +93,7 @@
                 android:layout_height="wrap_content"
                 android:textColor="@color/gray_999999"
                 android:gravity="center"
-                android:text="养老金"
+                android:text="创客"
                 android:textSize="10sp" />
         </LinearLayout>
 

app/src/main/res/layout/fragment_home.xml

@@ -8,8 +8,6 @@
     android:orientation="vertical"
     tools:context="com.yihucha.hbyhc.presentation.home.HomeFragment">
 
-
-
     <com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout
         android:id="@+id/refreshLayout"
         android:layout_width="match_parent"
@@ -37,8 +35,7 @@
                 <com.youth.banner.Banner
                     android:id="@+id/banner_home"
                     android:layout_width="match_parent"
-                    android:layout_height="240dp"
-                    />
+                    android:layout_height="240dp" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -295,6 +292,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="22dp"
+                    android:visibility="gone"
                     android:orientation="horizontal">
 
                     <LinearLayout

app/src/main/res/layout/fragment_mine.xml

@@ -106,31 +106,28 @@
                     android:paddingTop="13dp"
                     android:paddingBottom="13dp"
                     app:layout_constraintTop_toBottomOf="@+id/layout_member">
-
                     <TextView
-                        android:id="@+id/tv_mine_yj"
+                        android:id="@+id/tv_mine_ylj"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:drawableTop="@mipmap/icon_mine_yj"
+                        android:drawableTop="@mipmap/icon_mine_ylj"
                         android:drawablePadding="8dp"
                         android:gravity="center"
-                        android:text="我的佣金"
+                        android:text="我的养老金"
                         android:textColor="@color/black_333333"
                         android:textSize="12sp" />
-
                     <TextView
-                        android:id="@+id/tv_mine_ljf"
+                        android:id="@+id/tv_mine_yj"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:drawableTop="@mipmap/icon_mine_hjf"
+                        android:drawableTop="@mipmap/icon_mine_yj"
                         android:drawablePadding="8dp"
                         android:gravity="center"
-                        android:text="我的红积分"
+                        android:text="我的佣金"
                         android:textColor="@color/black_333333"
                         android:textSize="12sp" />
-
                     <TextView
                         android:id="@+id/tv_mine_td"
                         android:layout_width="wrap_content"
@@ -142,13 +139,23 @@
                         android:text="我的团队"
                         android:textColor="@color/black_333333"
                         android:textSize="12sp" />
-
+                    <TextView
+                        android:id="@+id/tv_mine_ljf"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:drawableTop="@mipmap/icon_mine_jf"
+                        android:drawablePadding="8dp"
+                        android:gravity="center"
+                        android:text="积分"
+                        android:textColor="@color/black_333333"
+                        android:textSize="12sp" />
                     <TextView
                         android:id="@+id/tv_mine_yq"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:drawableTop="@mipmap/icon_mine_yq"
+                        android:drawableTop="@mipmap/icon_mine_yq_new"
                         android:drawablePadding="8dp"
                         android:gravity="center"
                         android:text="分享邀请"