From 7eec96f54570c875fb8356f1fe283f6967b1b574 Mon Sep 17 00:00:00 2001
From: huan <3093416064@qq.com>
Date: Sun, 14 May 2023 11:50:50 +0800
Subject: [PATCH] last time content

---
 .idea/deploymentTargetDropDown.xml            |   2 +-
 app/src/main/AndroidManifest.xml              |   6 +-
 .../java/com/orangesale/cn/MainActivity.java  |   1 +
 .../orangesale/cn/activity/IndexActivity.java |  38 ++----
 .../orangesale/cn/fragment/IndexFragment.java |  11 +-
 app/src/main/res/drawable/qicheng.png         | Bin 5129 -> 0 bytes
 app/src/main/res/layout/activity_main.xml     |  18 ++-
 app/src/main/res/layout/content_index.xml     | 123 ++++++------------
 8 files changed, 78 insertions(+), 121 deletions(-)
 delete mode 100644 app/src/main/res/drawable/qicheng.png

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 518dda1..c52a676 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -12,6 +12,6 @@
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2023-04-18T06:15:51.253471Z" />
+    <timeTargetWasSelectedWithDropDown value="2023-05-14T03:17:23.857774700Z" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 23e6adc..eb64fc9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.orangesale.cn">
 
     <application
@@ -10,8 +11,9 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
-            android:name=".IndexActivity"
-            android:exported="false" />
+            android:name=".activity.IndexActivity"
+            android:exported="false"
+            tools:ignore="Instantiatable" />
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/com/orangesale/cn/MainActivity.java b/app/src/main/java/com/orangesale/cn/MainActivity.java
index 37c83e2..c56bf6e 100644
--- a/app/src/main/java/com/orangesale/cn/MainActivity.java
+++ b/app/src/main/java/com/orangesale/cn/MainActivity.java
@@ -71,6 +71,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         if (cursor.getCount() > 0) {
             return true;
         }
+        //服了，谁把我头像换了，肯定是Rosa，，，，
         return false;
     }
 }
diff --git a/app/src/main/java/com/orangesale/cn/activity/IndexActivity.java b/app/src/main/java/com/orangesale/cn/activity/IndexActivity.java
index 3ca7453..e41c706 100644
--- a/app/src/main/java/com/orangesale/cn/activity/IndexActivity.java
+++ b/app/src/main/java/com/orangesale/cn/activity/IndexActivity.java
@@ -25,19 +25,10 @@ public class IndexActivity extends Activity implements View.OnClickListener {
     private IndexFragment indexFragment;
     private PersonFragment personFragment;
 
-    private LinearLayout indexLine;
-    private LinearLayout productLine;
-    private LinearLayout shoppingLine;
-    private LinearLayout personLine;
+    private LinearLayout indexLine, productLine, shoppingCartLine, personLine;
 
     Intent timeServiceIntent;
 
-    public IndexActivity(LinearLayout productLine, LinearLayout shoppingLine, LinearLayout personLine) {
-        this.productLine = productLine;
-        this.shoppingLine = shoppingLine;
-        this.personLine = personLine;
-    }
-
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -48,19 +39,18 @@ public class IndexActivity extends Activity implements View.OnClickListener {
         Thread thread = new Thread(runnable);
         thread.start();
     }
-
     private void init() {
         indexLine = findViewById(R.id.content_index);
         indexLine.setOnClickListener(this);
 
-        indexLine = findViewById(R.id.content_product);
+        productLine = findViewById(R.id.content_product);
         productLine.setOnClickListener(this);
 
-        indexLine = findViewById(R.id.content_cart);
-        shoppingLine.setOnClickListener(this);
+        shoppingCartLine = findViewById(R.id.content_cart);
+        shoppingCartLine.setOnClickListener(this);
 
-        indexLine = findViewById(R.id.content_person);
-        productLine.setOnClickListener(this);
+        personLine = findViewById(R.id.content_person);
+        personLine.setOnClickListener(this);
     }
 
     @Override
@@ -88,7 +78,7 @@ public class IndexActivity extends Activity implements View.OnClickListener {
     }
 
     private void initpersonFragment() {
-        android.app.FragmentTransaction transaction = getFragmentManager().beginTransaction();
+        FragmentTransaction transaction = getFragmentManager().beginTransaction();
 
         if (personFragment == null) {
             Intent intent = IndexActivity.this.getIntent();
@@ -110,7 +100,7 @@ public class IndexActivity extends Activity implements View.OnClickListener {
     }
 
     private void initproductFragment() {
-        android.app.FragmentTransaction transaction = getFragmentManager().beginTransaction();
+        FragmentTransaction transaction = getFragmentManager().beginTransaction();
         if (productFragment == null) {
             productFragment = new ProductFragment();
         }
@@ -119,16 +109,12 @@ public class IndexActivity extends Activity implements View.OnClickListener {
     }
 
     private void initIndexFragment() {
-        androidx.fragment.app.FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+        FragmentTransaction transaction = getFragmentManager().beginTransaction();
         if (indexFragment == null) {
             indexFragment = new IndexFragment();
         }
-            transaction.replace(R.id.main_content,indexFragment);
-            transaction.commit();
-    }
-
-    private FragmentManager getSupportFragmentManager() {
-        return null;
+        transaction.replace(R.id.main_content,indexFragment);
+        transaction.commit();
     }
 
     Runnable runnable = () -> {
@@ -145,3 +131,5 @@ public class IndexActivity extends Activity implements View.OnClickListener {
 
 
 
+
+
diff --git a/app/src/main/java/com/orangesale/cn/fragment/IndexFragment.java b/app/src/main/java/com/orangesale/cn/fragment/IndexFragment.java
index 7fbaa82..806a07b 100644
--- a/app/src/main/java/com/orangesale/cn/fragment/IndexFragment.java
+++ b/app/src/main/java/com/orangesale/cn/fragment/IndexFragment.java
@@ -1,5 +1,7 @@
 package com.orangesale.cn.fragment;
 
+
+import android.app.Fragment;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -7,20 +9,17 @@ import android.view.ViewGroup;
 import android.widget.GridView;
 import android.widget.LinearLayout;
 import android.widget.SearchView;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-
 import com.orangesale.cn.R;
 import com.orangesale.cn.entity.Product;
 import com.orangesale.cn.adapter.ProductAdapter;
-
-
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
+
+
 public class IndexFragment extends Fragment implements View.OnClickListener {
 
     private GridView gridView;
@@ -47,6 +46,7 @@ public class IndexFragment extends Fragment implements View.OnClickListener {
         qichengLine.setOnClickListener(this);
         bingtangchengLine = view.findViewById(R.id.bingtangcheng);
         bingtangchengLine.setOnClickListener(this);
+
         gridView = view.findViewById(R.id.index_famous_gridview);
         initData();
         productAdapter = new ProductAdapter(getActivity(), productList);
@@ -56,7 +56,6 @@ public class IndexFragment extends Fragment implements View.OnClickListener {
     @Override
     public void onClick(View v) {
 
-
     }
 
     private void initData() {
diff --git a/app/src/main/res/drawable/qicheng.png b/app/src/main/res/drawable/qicheng.png
deleted file mode 100644
index 0f74ad10bebbf9818571f7af8d8fe2962d9d4d61..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5129
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

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index e9f1f4a..569be02 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/activity_main"
     android:layout_width="match_parent"
@@ -10,14 +9,21 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="5">
-        <include layout = "@layout/content_user"/>
-    </LinearLayout>-->
+        android:layout_height="30dp">
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:text="欢迎来到橙子乐园"
+            android:textColor="#95C958"
+            android:textSize="20dp"/>
+        <!--        <include layout="@layout/content_user" />-->
+    </LinearLayout>
+
     <FrameLayout
         android:id="@+id/main_content"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
+        android:layout_height="match_parent"
         android:layout_weight="1"/>
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/content_index.xml b/app/src/main/res/layout/content_index.xml
index b900746..c979ca1 100644
--- a/app/src/main/res/layout/content_index.xml
+++ b/app/src/main/res/layout/content_index.xml
@@ -6,95 +6,56 @@
     android:layout_height="match_parent">
 
     <SearchView
-        android:id="@+id/searchView"
-        android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_width="match_parent"
         android:background="@drawable/index_menu"
-        android:focusable="true"
+        android:queryHint="请输入搜索内容"
         android:iconifiedByDefault="false"
-        android:queryHint="请输入搜索内容" />
+        android:focusable="false"
+        android:id="@+id/searchView"/>
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="1dp"
-        android:layout_marginTop="20dp"
-        android:layout_marginRight="1dp"
-        android:background="@drawable/index_menu"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:orientation="horizontal">
-
-            <LinearLayout
-                android:id="@+id/chucheng"
-                android:layout_width="0dp"
-                android:layout_height="150dp"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:orientation="vertical">
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="100dp"
-                    android:src="@drawable/chucheng"/>
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:text="褚橙"
-                    android:textColor="#696969"
-                    android:textSize="20sp" />
-            </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/bingtangcheng"
-                android:layout_width="0dp"
-                android:layout_height="150dp"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:orientation="vertical">
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="100dp"
-                    android:src="@drawable/bingtangcheng" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:text="冰糖橙"
-                    android:textColor="#696969"
-                    android:textSize="20sp" />
-            </LinearLayout>
+    <LinearLayout android:layout_height="wrap_content" android:layout_width="match_parent" android:background="@drawable/index_menu" android:orientation="vertical" android:layout_marginRight="1dp" android:layout_marginTop="20dp" android:layout_marginLeft="1dp">
+
+
+        <LinearLayout android:layout_height="wrap_content" android:layout_width="match_parent" android:orientation="horizontal" android:layout_marginTop="5dp">
+
+
+            <LinearLayout android:layout_height="150dp" android:layout_width="0dp" android:orientation="vertical" android:id="@+id/chucheng" android:gravity="center" android:layout_weight="1">
+
+                <ImageView android:layout_height="100dp" android:layout_width="wrap_content" android:src="@drawable/chucheng"/>
+
+                <TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_marginTop="5dp" android:textSize="20sp" android:textColor="#696969" android:text="褚橙"/>
 
-            <LinearLayout
-                android:id="@+id/qicheng"
-                android:layout_width="0dp"
-                android:layout_height="150dp"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:orientation="vertical">
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="100dp"
-                    android:src="@drawable/qicheng" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:text="脐橙"
-                    android:textColor="#696969"
-                    android:textSize="20sp" />
             </LinearLayout>
 
+
+            -<LinearLayout
+            android:layout_height="150dp"
+            android:layout_width="0dp"
+            android:orientation="vertical"
+            android:id="@+id/bingtangcheng"
+            android:gravity="center"
+            android:layout_weight="1">
+
+            <ImageView
+                android:layout_height="100dp"
+                android:layout_width="wrap_content"
+                android:src="@drawable/bingtangcheng"/>
+
+            <TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_marginTop="5dp" android:textSize="20sp" android:textColor="#696969" android:text="冰糖橙"/>
+
+        </LinearLayout>
+
+
+            -<LinearLayout android:layout_height="150dp" android:layout_width="0dp" android:orientation="vertical" android:id="@+id/qicheng" android:gravity="center" android:layout_weight="1">
+
+            <ImageView android:layout_height="100dp" android:layout_width="wrap_content" android:src="@drawable/qicheng"/>
+
+            <TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_marginTop="5dp" android:textSize="20sp" android:textColor="#696969" android:text="脐橙"/>
+
+        </LinearLayout>
+
         </LinearLayout>
 
     </LinearLayout>