From d0b75280dd337a98de011e70d8f6d99bd2c5a726 Mon Sep 17 00:00:00 2001 From: ghtMare <2467889729@qq.com> Date: Sun, 2 Apr 2023 19:39:05 +0800 Subject: [PATCH] commit --- app/src/main/AndroidManifest.xml | 8 +--- .../activity/activity/ContentFragment.java | 6 ++- .../Cat/activity/activity/GoodsActivity.java | 35 +++++++++++++++++- .../Cat/activity/activity/MainActivity.java | 12 +----- .../Cat/activity/activity/TitleFragment.java | 10 +++-- .../Cat/activity/activity/UserActivity.java | 7 +--- app/src/main/res/drawable/maoliang.png | Bin 0 -> 6660 bytes app/src/main/res/drawable/maowanju.png | Bin 0 -> 5188 bytes app/src/main/res/drawable/maowo.png | Bin 0 -> 6470 bytes app/src/main/res/drawable/qingjieyongpin.png | Bin 0 -> 5268 bytes app/src/main/res/layout/activity_main.xml | 34 ++++++++++------- app/src/main/res/layout/content_layout.xml | 19 +++++++--- app/src/main/res/layout/goods_left.xml | 10 ----- app/src/main/res/layout/goods_right.xml | 6 --- app/src/main/res/layout/production.xml | 26 ------------- app/src/main/res/layout/title_item_layout.xml | 4 +- app/src/main/res/layout/title_layout.xml | 3 +- 17 files changed, 89 insertions(+), 91 deletions(-) create mode 100644 app/src/main/res/drawable/maoliang.png create mode 100644 app/src/main/res/drawable/maowanju.png create mode 100644 app/src/main/res/drawable/maowo.png create mode 100644 app/src/main/res/drawable/qingjieyongpin.png delete mode 100644 app/src/main/res/layout/goods_left.xml delete mode 100644 app/src/main/res/layout/goods_right.xml delete mode 100644 app/src/main/res/layout/production.xml 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 0000000000000000000000000000000000000000..9b480103bcecc692f9d2ab700aee62a67f3930f5 GIT binary patch literal 6660 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 M3L5eiP^-}Y0ZeS-vj6}9 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/maowanju.png b/app/src/main/res/drawable/maowanju.png new file mode 100644 index 0000000000000000000000000000000000000000..77285c7c43cfa90dd24a41d8481d66cd93c613f1 GIT binary patch literal 5188 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 a@Bab8B0~@2#QIqP0000 - + 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" + >