diff --git a/app/src/main/java/com/example/Cat/activity/IndexActivity.java b/app/src/main/java/com/example/Cat/activity/IndexActivity.java index 14c8213..bf50f54 100644 --- a/app/src/main/java/com/example/Cat/activity/IndexActivity.java +++ b/app/src/main/java/com/example/Cat/activity/IndexActivity.java @@ -33,11 +33,12 @@ public class IndexActivity extends Activity implements View.OnClickListener { setContentView(R.layout.activity_index); init(); initIndexFragment(); - + //setData(); // Thread thread = new Thread(runnable); //thread.start(); } + /** * 组件初始化 */ diff --git a/app/src/main/java/com/example/Cat/activity/UserMessageActivity.java b/app/src/main/java/com/example/Cat/activity/UserMessageActivity.java index 0091d77..9de8f97 100644 --- a/app/src/main/java/com/example/Cat/activity/UserMessageActivity.java +++ b/app/src/main/java/com/example/Cat/activity/UserMessageActivity.java @@ -16,19 +16,23 @@ import java.util.List; public class UserMessageActivity extends AppCompatActivity implements View.OnClickListener { private TextView usernameText,sexText,addressText; - private String username; + public String username; List list ; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.user_msg); + Intent intent3=getIntent(); + if(intent3.hasExtra("username")){ + username = intent3.getStringExtra("username"); + } init(); setData(); } - private void setData() { - Intent intent = UserMessageActivity.this.getIntent(); - username = intent.getStringExtra("username"); + + + public void setData() { User_Database user=new User_Database(UserMessageActivity.this); SQLiteDatabase sqLiteDatabase=user.getReadableDatabase(); UserInfo info=user.queryByName(sqLiteDatabase,username); diff --git a/app/src/main/java/com/example/Cat/fragment/PearsonFragment.java b/app/src/main/java/com/example/Cat/fragment/PearsonFragment.java index 0455e14..db417a4 100644 --- a/app/src/main/java/com/example/Cat/fragment/PearsonFragment.java +++ b/app/src/main/java/com/example/Cat/fragment/PearsonFragment.java @@ -27,12 +27,13 @@ public class PearsonFragment extends Fragment implements View.OnClickListener { public LinearLayout userProductLine,usernameLine, userSexline, userCityLine, userPayLine, userSettingLine, userGeneralLine; public Button button; public String username; - IndexActivity indexActivity; + Bundle bundle; @Nullable @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { View view = LayoutInflater.from(getActivity()).inflate(R.layout.content_user, container, false); init(view); + return view; } @@ -73,7 +74,7 @@ public class PearsonFragment extends Fragment implements View.OnClickListener { * 组件赋值 */ private void setData() { - Bundle bundle = getArguments(); + bundle = getArguments(); usernameText.setText(String.format("用户名:%s", bundle.getString("username"))); } @@ -85,11 +86,12 @@ public class PearsonFragment extends Fragment implements View.OnClickListener { Intent intent2 = new Intent(getActivity(), GoodsActivity.class); startActivity(intent2); break; -// case R.id.user_setting: -// Intent intent3 = new Intent(getActivity(), UserMessageActivity.class); -// intent3.putExtra("username",username); -// startActivity(intent3); -// break; + case R.id.user_setting: + Intent intent3 = new Intent(getActivity(), UserMessageActivity.class); +// Bundle bundle = getArguments(); + intent3.putExtra("username",bundle.getString("username")); + startActivity(intent3); + break; case R.id.exit: Intent intent4 = new Intent(getActivity(), MainActivity.class); startActivity(intent4); diff --git a/app/src/main/res/layout/content_index.xml b/app/src/main/res/layout/content_index.xml index ed71695..c09c945 100644 --- a/app/src/main/res/layout/content_index.xml +++ b/app/src/main/res/layout/content_index.xml @@ -46,7 +46,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="5dp" - android:text="鱼玩具" + android:text="猫玩具" android:textColor="#696969" android:textSize="20sp" /> @@ -112,7 +112,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="5dp" - android:text="猫粮" + android:text="猫零食" android:textColor="#696969" android:textSize="20sp" /> @@ -164,7 +164,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="5dp" - android:text="猫粮盆" + android:text="猫砂" android:textColor="#696969" android:textSize="20sp" /> @@ -186,7 +186,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="5dp" - android:text="玩具钓具" + android:text="清洁用品" android:textColor="#696969" android:textSize="20sp" /> @@ -202,13 +202,13 @@ + android:src="@drawable/xmw" />