From f49ba9b91f549f55929bbd3f821bed41487ea29a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E9=9C=B2?= <2983604867@qq.com>
Date: Tue, 9 Nov 2021 17:11:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E2=80=9C=E8=B8=AA=E8=BF=B9?=
=?UTF-8?q?=E2=80=9D=E9=A1=B5=E9=9D=A2=EF=BC=8C"=E5=AE=9A=E4=BD=8D"?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../myapplication/activity/MainActivity.java | 4 +-
.../fragment/DeviseFragment.java | 15 ++++
.../src/main/res/layout/fragment_devise.xml | 79 +++++++++++++++----
.../src/main/res/layout/fragment_location.xml | 13 ++-
4 files changed, 90 insertions(+), 21 deletions(-)
diff --git a/code/MyApplication/app/src/main/java/com/example/myapplication/activity/MainActivity.java b/code/MyApplication/app/src/main/java/com/example/myapplication/activity/MainActivity.java
index 6becf7d..f979e17 100644
--- a/code/MyApplication/app/src/main/java/com/example/myapplication/activity/MainActivity.java
+++ b/code/MyApplication/app/src/main/java/com/example/myapplication/activity/MainActivity.java
@@ -69,10 +69,10 @@ public class MainActivity extends AppCompatActivity {
FragmentManager fm = getSupportFragmentManager();
Bundle bundle = new Bundle();
if(i==1){
- bundle.putString("jumpPage", "route");
+ bundle.putString("jumpPage", "trace");
mFragments.get(i).setArguments(bundle);
}else if(i==2){
- bundle.putString("jumpPage", "position");
+ bundle.putString("jumpPage", "location");
mFragments.get(i).setArguments(bundle);
}
FragmentTransaction trans = fm.beginTransaction();
diff --git a/code/MyApplication/app/src/main/java/com/example/myapplication/fragment/DeviseFragment.java b/code/MyApplication/app/src/main/java/com/example/myapplication/fragment/DeviseFragment.java
index ec447bb..bd62b6c 100644
--- a/code/MyApplication/app/src/main/java/com/example/myapplication/fragment/DeviseFragment.java
+++ b/code/MyApplication/app/src/main/java/com/example/myapplication/fragment/DeviseFragment.java
@@ -3,12 +3,14 @@ package com.example.myapplication.fragment;
import android.os.Bundle;
import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import com.example.myapplication.R;
import com.example.myapplication.databinding.FragmentDeviseBinding;
public class DeviseFragment extends Fragment {
@@ -36,6 +38,19 @@ public class DeviseFragment extends Fragment {
Bundle savedInstanceState) {
// Inflate the layout for this fragment
binding = FragmentDeviseBinding.inflate(inflater, container, false);
+ binding.cardView.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Log.i("devise", "onClick: 我点击了");
+ if (jumpPage.equals("location")) {
+ LocationFragment fragment = new LocationFragment();
+ getFragmentManager().beginTransaction().replace(R.id.frag_layout, fragment).commit();
+ } else if (jumpPage.equals("trace")) {
+ TraceFragment fragment = new TraceFragment();
+ getFragmentManager().beginTransaction().replace(R.id.frag_layout, fragment).commit();
+ }
+ }
+ });
return binding.getRoot();
}
}
\ No newline at end of file
diff --git a/code/MyApplication/app/src/main/res/layout/fragment_devise.xml b/code/MyApplication/app/src/main/res/layout/fragment_devise.xml
index 9ce7001..98bc2a0 100644
--- a/code/MyApplication/app/src/main/res/layout/fragment_devise.xml
+++ b/code/MyApplication/app/src/main/res/layout/fragment_devise.xml
@@ -15,22 +15,69 @@
android:padding="@dimen/spacing_16"
android:text="已授权设备" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/code/MyApplication/app/src/main/res/layout/fragment_location.xml b/code/MyApplication/app/src/main/res/layout/fragment_location.xml
index fc92cfb..84379ee 100644
--- a/code/MyApplication/app/src/main/res/layout/fragment_location.xml
+++ b/code/MyApplication/app/src/main/res/layout/fragment_location.xml
@@ -1,11 +1,12 @@
-
+ tools:context=".fragment.LocationFragment"
+ android:orientation="vertical">
+
-
\ No newline at end of file
+
\ No newline at end of file