diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3a1625d..0e9f5bf 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -9,12 +9,7 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> - - + @@ -27,6 +22,7 @@ + \ No newline at end of file diff --git a/app/src/main/java/com/example/Cat/activity/activity/ContentFragment.java b/app/src/main/java/com/example/Cat/activity/activity/ContentFragment.java index c4da895..4c81ca7 100644 --- a/app/src/main/java/com/example/Cat/activity/activity/ContentFragment.java +++ b/app/src/main/java/com/example/Cat/activity/activity/ContentFragment.java @@ -8,6 +8,7 @@ import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.ImageView; import android.widget.TextView; import com.example.Cat.R; @@ -17,7 +18,7 @@ import com.example.Cat.activity.activity.MainActivity; public class ContentFragment extends Fragment { private View view; private TextView text1,text2; - + public ImageView imageView; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -27,12 +28,13 @@ public class ContentFragment extends Fragment { init(); } //获取activity中设置的文字 - setText(((MainActivity)getActivity()).getSettingText()[0]); + setText(((GoodsActivity)getActivity()).getSettingText()[0]); return view; } private void init() { text1=(TextView)view.findViewById(R.id.show_title); text2=(TextView)view.findViewById(R.id.show_content); + imageView=(ImageView) view.findViewById(R.id.icon11); } public void setText(String[] text) { Log.i("news",text[0]); diff --git a/app/src/main/java/com/example/Cat/activity/activity/GoodsActivity.java b/app/src/main/java/com/example/Cat/activity/activity/GoodsActivity.java index fc9ea61..55fb24b 100644 --- a/app/src/main/java/com/example/Cat/activity/activity/GoodsActivity.java +++ b/app/src/main/java/com/example/Cat/activity/activity/GoodsActivity.java @@ -1,18 +1,49 @@ package com.example.Cat.activity.activity; import androidx.appcompat.app.AppCompatActivity; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; import android.os.Bundle; import android.view.View; import com.example.Cat.R; -public class GoodsActivity extends AppCompatActivity { +public class GoodsActivity extends FragmentActivity { + private String tilte[]={"猫粮","猫窝","猫玩具","清洁用品"}; + private String settingText[][]={{"猫粮","猫猫牌猫粮,宠物的最爱"},{"猫窝","猫猫最爱的窝"},{"猫玩具","猫猫的玩具天堂"},{"清洁用品","猫猫今天也要爱干净鸭"}}; + public int[] setImage={R.drawable.maoliang,R.drawable.maowo,R.drawable.maowanju,R.drawable.qingjieyongpin}; + //获取标题数组的方法 + public String[] getTilte(){ + + return tilte; + } + //获取标题和内容 + public String[][] getSettingText(){ + + return settingText; + } + public int[] getSetImage(){ + return setImage; + } @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.production); + setContentView(R.layout.activity_main); + //创建Fragment + TitleFragment titleFragment=new TitleFragment(); + ContentFragment contentFragment=new ContentFragment(); + //获取事物 + FragmentManager fragmentManager = getSupportFragmentManager(); + FragmentTransaction transaction = fragmentManager.beginTransaction(); + //添加Fragment + transaction.replace(R.id.settitle,titleFragment); + transaction.replace(R.id.setcontent,contentFragment); + //提交事物 + transaction.commit(); } // @Override diff --git a/app/src/main/java/com/example/Cat/activity/activity/MainActivity.java b/app/src/main/java/com/example/Cat/activity/activity/MainActivity.java index 05f167b..68234fa 100644 --- a/app/src/main/java/com/example/Cat/activity/activity/MainActivity.java +++ b/app/src/main/java/com/example/Cat/activity/activity/MainActivity.java @@ -7,6 +7,7 @@ import android.os.Bundle; import android.view.View; import android.widget.Button; import android.widget.EditText; +import android.widget.ImageView; import com.example.Cat.R; @@ -14,18 +15,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe private Button registerButton, loginButton; private EditText usernameText, paswdEdit; - private String tilte[]={"标题一","标题二","标题三"}; - private String settingText[][]={{"标题一","标题一的内容"},{"标题二","标题二的内容"},{"标题三","标题三的内容"}}; - //获取标题数组的方法 - public String[] getTilte(){ - return tilte; - } - //获取标题和内容 - public String[][] getSettingText(){ - - return settingText; - } @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/app/src/main/java/com/example/Cat/activity/activity/TitleFragment.java b/app/src/main/java/com/example/Cat/activity/activity/TitleFragment.java index b21dbd7..73372bb 100644 --- a/app/src/main/java/com/example/Cat/activity/activity/TitleFragment.java +++ b/app/src/main/java/com/example/Cat/activity/activity/TitleFragment.java @@ -18,6 +18,8 @@ public class TitleFragment extends Fragment { private View view; private String[] title; private String[][] contents; + + private int[] images; private ListView listView; // private String settingText[][]={{"标题一","标题一的内容"},{"标题二","标题二的内容"},{"标题三","标题三的内容"}}; @@ -26,11 +28,12 @@ public class TitleFragment extends Fragment { Bundle savedInstanceState) { view=inflater.inflate(R.layout.title_layout,container,false); //获取Activty实例对象 - MainActivity activity=(MainActivity)getActivity(); + GoodsActivity activity=(GoodsActivity) getActivity(); //获取Activty中的标题 title=activity.getTilte(); //获取Activty中的标题和内容 contents=activity.getSettingText(); + images=activity.getSetImage(); if (view!=null){ init(); } @@ -39,10 +42,11 @@ public class TitleFragment extends Fragment { @Override public void onItemClick(AdapterView adapterView, View view, int i, long l) { //通过activity实例获取另一个Fragment对象 - com.example.Cat.activity.activity.ContentFragment content=(com.example.Cat.activity.activity.ContentFragment)((MainActivity)getActivity()) + com.example.Cat.activity.activity.ContentFragment content=(com.example.Cat.activity.activity.ContentFragment)((GoodsActivity)getActivity()) .getSupportFragmentManager().findFragmentById(R.id.setcontent); content.setText(contents[i]); - + content.imageView.findViewById(R.id.icon11); + content.imageView.setImageResource(images[i]); } }); return view; diff --git a/app/src/main/java/com/example/Cat/activity/activity/UserActivity.java b/app/src/main/java/com/example/Cat/activity/activity/UserActivity.java index 1d3f4d3..ed759c6 100644 --- a/app/src/main/java/com/example/Cat/activity/activity/UserActivity.java +++ b/app/src/main/java/com/example/Cat/activity/activity/UserActivity.java @@ -56,12 +56,9 @@ public class UserActivity extends Activity implements View.OnClickListener{ @Override public void onClick(View v) { switch (v.getId()) { - case R.id.exit: - Intent intent1 = new Intent(this, MainActivity.class); - startActivity(intent1); - break; + case R.id.user_product: - Intent intent2 = new Intent(this,TitleFragment.class); + Intent intent2 = new Intent(this,GoodsActivity.class); startActivity(intent2); break; } diff --git a/app/src/main/res/drawable/maoliang.png b/app/src/main/res/drawable/maoliang.png new file mode 100644 index 0000000..9b48010 Binary files /dev/null and b/app/src/main/res/drawable/maoliang.png differ diff --git a/app/src/main/res/drawable/maowanju.png b/app/src/main/res/drawable/maowanju.png new file mode 100644 index 0000000..77285c7 Binary files /dev/null and b/app/src/main/res/drawable/maowanju.png differ diff --git a/app/src/main/res/drawable/maowo.png b/app/src/main/res/drawable/maowo.png new file mode 100644 index 0000000..9c040b5 Binary files /dev/null and b/app/src/main/res/drawable/maowo.png differ diff --git a/app/src/main/res/drawable/qingjieyongpin.png b/app/src/main/res/drawable/qingjieyongpin.png new file mode 100644 index 0000000..e9eb596 Binary files /dev/null and b/app/src/main/res/drawable/qingjieyongpin.png differ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index be05fa2..c0024de 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,20 +1,28 @@ - + android:orientation="horizontal" + tools:context=".activity.activity.GoodsActivity"> - + + + - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/content_layout.xml b/app/src/main/res/layout/content_layout.xml index 74e8ab0..db72e19 100644 --- a/app/src/main/res/layout/content_layout.xml +++ b/app/src/main/res/layout/content_layout.xml @@ -9,15 +9,24 @@ + android:textSize="25sp" + android:text="显示商品名称" /> + android:textSize="20sp" + android:text="显示介绍内容" /> + \ No newline at end of file diff --git a/app/src/main/res/layout/goods_left.xml b/app/src/main/res/layout/goods_left.xml deleted file mode 100644 index 8c5fe46..0000000 --- a/app/src/main/res/layout/goods_left.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/goods_right.xml b/app/src/main/res/layout/goods_right.xml deleted file mode 100644 index 41d2ef1..0000000 --- a/app/src/main/res/layout/goods_right.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/production.xml b/app/src/main/res/layout/production.xml deleted file mode 100644 index 2663734..0000000 --- a/app/src/main/res/layout/production.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/title_item_layout.xml b/app/src/main/res/layout/title_item_layout.xml index fc00360..f4a084c 100644 --- a/app/src/main/res/layout/title_item_layout.xml +++ b/app/src/main/res/layout/title_item_layout.xml @@ -6,5 +6,7 @@ android:id="@+id/titles" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize ="16sp"/> + android:layout_gravity="center" + android:layout_marginTop="5dp" + android:textSize ="20sp"/> \ No newline at end of file diff --git a/app/src/main/res/layout/title_layout.xml b/app/src/main/res/layout/title_layout.xml index 97ea193..72cbdf2 100644 --- a/app/src/main/res/layout/title_layout.xml +++ b/app/src/main/res/layout/title_layout.xml @@ -9,7 +9,8 @@ + android:layout_height="wrap_content" + >