diff --git a/.idea/misc.xml b/.idea/misc.xml index 37612a4..1442212 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -69,7 +69,7 @@ - + diff --git a/app/src/main/java/com/orangesale/cn/MainActivity.java b/app/src/main/java/com/orangesale/cn/MainActivity.java index b59a029..37c83e2 100644 --- a/app/src/main/java/com/orangesale/cn/MainActivity.java +++ b/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; 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 4c16938..3ca7453 100644 --- a/app/src/main/java/com/orangesale/cn/activity/IndexActivity.java +++ b/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); 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 3c621b0..7fbaa82 100644 --- a/app/src/main/java/com/orangesale/cn/fragment/IndexFragment.java +++ b/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); diff --git a/app/src/main/res/drawable/qicheng.png b/app/src/main/res/drawable/qicheng.png new file mode 100644 index 0000000..0f74ad1 Binary files /dev/null and b/app/src/main/res/drawable/qicheng.png differ diff --git a/app/src/main/res/layout/content_index.xml b/app/src/main/res/layout/content_index.xml index 4646185..b900746 100644 --- a/app/src/main/res/layout/content_index.xml +++ b/app/src/main/res/layout/content_index.xml @@ -6,11 +6,11 @@ android:layout_height="match_parent"> @@ -32,14 +32,14 @@ + android:textSize="20sp" /> - - - - - - + diff --git a/app/src/main/res/layout/index_hot.xml b/app/src/main/res/layout/index_hot.xml index c340aeb..6efb111 100644 --- a/app/src/main/res/layout/index_hot.xml +++ b/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" />