首页布局更改

.idea/misc.xml

@@ -69,7 +69,7 @@
       </profile-state>
     </entry>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

app/src/main/java/com/orangesale/cn/MainActivity.java

@@ -17,6 +17,8 @@ import com.orangesale.cn.activity.RegisterActivity;
 import com.orangesale.cn.activity.UserActivity;
 import com.orangesale.cn.fragment.IndexFragment;
 
+
+
 public class MainActivity extends AppCompatActivity implements View.OnClickListener {
     private Button registerButton, loginButton;
     private EditText usernameText, paswdEdit;

app/src/main/java/com/orangesale/cn/activity/IndexActivity.java

@@ -6,6 +6,7 @@ import android.os.Bundle;
 import android.app.FragmentTransaction;
 import android.widget.LinearLayout;
 import androidx.annotation.Nullable;
+import androidx.fragment.app.FragmentManager;
 
 import com.orangesale.cn.R;
 import android.view.View;
@@ -31,6 +32,11 @@ public class IndexActivity extends Activity implements View.OnClickListener {
 
     Intent timeServiceIntent;
 
+    public IndexActivity(LinearLayout productLine, LinearLayout shoppingLine, LinearLayout personLine) {
+        this.productLine = productLine;
+        this.shoppingLine = shoppingLine;
+        this.personLine = personLine;
+    }
 
 
     @Override
@@ -53,7 +59,7 @@ public class IndexActivity extends Activity implements View.OnClickListener {
         indexLine = findViewById(R.id.content_cart);
         shoppingLine.setOnClickListener(this);
 
-        indexLine = findViewById(R.id.content_pearson);
+        indexLine = findViewById(R.id.content_person);
         productLine.setOnClickListener(this);
     }
 
@@ -113,13 +119,18 @@ public class IndexActivity extends Activity implements View.OnClickListener {
     }
 
     private void initIndexFragment() {
-        FragmentTransaction transaction = getFragmentManager().beginTransaction();
+        androidx.fragment.app.FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
         if (indexFragment == null) {
             indexFragment = new IndexFragment();
         }
             transaction.replace(R.id.main_content,indexFragment);
             transaction.commit();
     }
+
+    private FragmentManager getSupportFragmentManager() {
+        return null;
+    }
+
     Runnable runnable = () -> {
         timeServiceIntent = new Intent(IndexActivity.this, TimeService.class);
         startService(timeServiceIntent);

app/src/main/java/com/orangesale/cn/fragment/IndexFragment.java

@@ -38,7 +38,7 @@ public class IndexFragment extends Fragment implements View.OnClickListener {
     }
 
     private void init(View view) {
-        searchView = view.findViewById(R.id.searchview);
+        searchView = view.findViewById(R.id.searchView);
         searchView.setOnClickListener(this);
 
         chuchengLine= view.findViewById(R.id.chucheng);

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

@@ -6,11 +6,11 @@
     android:layout_height="match_parent">
 
     <SearchView
-        android:id="@+id/searchview"
+        android:id="@+id/searchView"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:background="@drawable/index_menu"
-        android:focusable="false"
+        android:focusable="true"
         android:iconifiedByDefault="false"
         android:queryHint="请输入搜索内容" />
 
@@ -32,14 +32,14 @@
             <LinearLayout
                 android:id="@+id/chucheng"
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_height="150dp"
                 android:layout_weight="1"
                 android:gravity="center"
                 android:orientation="vertical">
 
                 <ImageView
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_height="100dp"
                     android:src="@drawable/chucheng"/>
 
                 <TextView
@@ -48,20 +48,20 @@
                     android:layout_marginTop="5dp"
                     android:text="褚橙"
                     android:textColor="#696969"
-                    android:textSize="20sp"/>
+                    android:textSize="20sp" />
             </LinearLayout>
 
             <LinearLayout
                 android:id="@+id/bingtangcheng"
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_height="150dp"
                 android:layout_weight="1"
                 android:gravity="center"
                 android:orientation="vertical">
 
                 <ImageView
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_height="100dp"
                     android:src="@drawable/bingtangcheng" />
 
                 <TextView
@@ -76,14 +76,14 @@
             <LinearLayout
                 android:id="@+id/qicheng"
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_height="150dp"
                 android:layout_weight="1"
                 android:gravity="center"
                 android:orientation="vertical">
 
                 <ImageView
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_height="100dp"
                     android:src="@drawable/qicheng" />
 
                 <TextView
@@ -95,28 +95,8 @@
                     android:textSize="20sp" />
             </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/shuiguo"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:orientation="vertical">
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/shuiguo" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:text="tangerine"
-                    android:textColor="#696969"
-                    android:textSize="20sp" />
-            </LinearLayout>
         </LinearLayout>
+
     </LinearLayout>
 
     <include layout="@layout/index_hot"/>

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

@@ -19,10 +19,10 @@
             android:layout_height="50dp"
             android:layout_marginLeft="5dp"
             android:layout_weight="1"
-            android:drawableLeft="@drawable/orange1"
+            android:drawableLeft="@drawable/shuiguo"
             android:drawablePadding="8dp"
             android:gravity="center_vertical"
-            android:text="popular"
+            android:text="热门商品"
             android:textColor="#000"
             android:textSize="18sp" />