diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c9dcc4c..e221cd5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -30,7 +30,7 @@ - + diff --git a/app/src/main/java/com/example/myapplication/activity/ManagementActivity.java b/app/src/main/java/com/example/myapplication/activity/FragmentManagement.java similarity index 96% rename from app/src/main/java/com/example/myapplication/activity/ManagementActivity.java rename to app/src/main/java/com/example/myapplication/activity/FragmentManagement.java index 5a3a56c..e7404e5 100644 --- a/app/src/main/java/com/example/myapplication/activity/ManagementActivity.java +++ b/app/src/main/java/com/example/myapplication/activity/FragmentManagement.java @@ -8,11 +8,13 @@ import com.example.myapplication.R; import com.example.myapplication.base.BaseActivity; import com.example.myapplication.fragment.CapacityEvaluationFragment; import com.example.myapplication.fragment.CapacityEvaluationFragment2; +import com.example.myapplication.fragment.CapacityMeasurementFragment; import com.example.myapplication.fragment.EventPrefectureFragment; import com.example.myapplication.fragment.FindFragment; import com.example.myapplication.fragment.ForgetPawFragment; import com.example.myapplication.fragment.MineFragment; import com.example.myapplication.fragment.RecordFragment; +import com.example.myapplication.fragment.TaskExWebFragment; import com.example.myapplication.fragment.TaskExplainFragment; import com.example.myapplication.fragment.TaskExplainFragment2; import com.example.myapplication.fragment.TaskPrefectureFragment; @@ -50,12 +52,6 @@ public class FragmentManagement extends BaseActivity { - - - - - - @Override protected int getLayout() { return R.layout.management_fragment; @@ -103,9 +99,6 @@ public class FragmentManagement extends BaseActivity { if (capacityMeasurementFragment != null)//发现-能力测评item点击跳转web的fragment -14 fragmentTransaction.hide(capacityMeasurementFragment); - - - } public void selectorFragment(int i) { @@ -227,8 +220,6 @@ public class FragmentManagement extends BaseActivity { fragmentTransaction.show(capacityMeasurementFragment); } break; - - } fragmentTransaction.commit(); } @@ -270,10 +261,17 @@ public class FragmentManagement extends BaseActivity { case 11: capacityEvaluationFragment.onActivityResult(requestCode, resultCode, data); break; - case 12: + case 12: capacityEvaluationFragment2.onActivityResult(requestCode, resultCode, data); break; + case 13: + taskExWebFragment.onActivityResult(requestCode, resultCode, data); + break; + case 14: + capacityMeasurementFragment.onActivityResult(requestCode, resultCode, data); + break; + } } diff --git a/app/src/main/java/com/example/myapplication/activity/LoginActivity.java b/app/src/main/java/com/example/myapplication/activity/LoginActivity.java index 52d692e..5da6a38 100644 --- a/app/src/main/java/com/example/myapplication/activity/LoginActivity.java +++ b/app/src/main/java/com/example/myapplication/activity/LoginActivity.java @@ -46,12 +46,12 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener public void onClick(View v) { switch (v.getId()) { case R.id.tv_register: - Intent register = new Intent(this, ManagementActivity.class); + Intent register = new Intent(this, FragmentManagement.class); register.putExtra("tag", 5); startActivity(register); break; case R.id.tv_forget_paw: - Intent forgetPaw = new Intent(this, ManagementActivity.class); + Intent forgetPaw = new Intent(this, FragmentManagement.class); forgetPaw.putExtra("tag", 6); startActivity(forgetPaw); break; diff --git a/app/src/main/java/com/example/myapplication/base/BaseFragment.java b/app/src/main/java/com/example/myapplication/base/BaseFragment.java index aa71384..8caed70 100644 --- a/app/src/main/java/com/example/myapplication/base/BaseFragment.java +++ b/app/src/main/java/com/example/myapplication/base/BaseFragment.java @@ -20,7 +20,7 @@ import com.example.myapplication.R; public abstract class BaseFragment extends Fragment { private AlertDialog alertDialog; - public View mView; + @Nullable diff --git a/app/src/main/java/com/example/myapplication/fragment/CapacityEvaluationFragment.java b/app/src/main/java/com/example/myapplication/fragment/CapacityEvaluationFragment.java index fb54e2d..1fb3a1c 100644 --- a/app/src/main/java/com/example/myapplication/fragment/CapacityEvaluationFragment.java +++ b/app/src/main/java/com/example/myapplication/fragment/CapacityEvaluationFragment.java @@ -10,9 +10,9 @@ import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.LinearLayoutManager; import com.example.myapplication.R; +import com.example.myapplication.activity.FragmentManagement; import com.example.myapplication.adapter.CapacityEvaluationAdapter; import com.example.myapplication.adapter.CapacityEvaluationAdapter; -import com.example.myapplication.activity.ManagementActivity; import com.example.myapplication.base.BaseFragment; import com.example.myapplication.bean.CapacityMeasureBean; import com.example.myapplication.bean.TaskExplainInfo; @@ -73,10 +73,9 @@ public class CapacityEvaluationFragment extends BaseFragment implements View.OnC capacityEvaluationAdapter.setOnCapacityClick(new CapacityEvaluationAdapter.OnCapacityClick() { @Override public void onClick(int id) { - Intent itemIntent = new Intent(getActivity(), FragmentManagement.class); - itemIntent.putExtra("tag", 12); - startActivity(itemIntent); - //Toast.makeText(getContext(), "哈哈，成功了"+id, Toast.LENGTH_SHORT).show(); + Intent capacityEvaWeb = new Intent(getActivity(), FragmentManagement.class); + capacityEvaWeb.putExtra("tag",14); + startActivity(capacityEvaWeb); } }); @@ -103,7 +102,6 @@ public class CapacityEvaluationFragment extends BaseFragment implements View.OnC dismissLoadingDialog(); capacityEvaluationAdapter.setCapacityList(response.getBody().getData()); Log.d("TAG", "onSuccess: " + response.getMsg() + "sssssssssssss"); - Toast.makeText(getActivity(), response.getMsg() + "", Toast.LENGTH_SHORT).show(); } @Override diff --git a/app/src/main/java/com/example/myapplication/fragment/CapacityEvaluationFragment2.java b/app/src/main/java/com/example/myapplication/fragment/CapacityEvaluationFragment2.java index 9abc223..f0f0e15 100644 --- a/app/src/main/java/com/example/myapplication/fragment/CapacityEvaluationFragment2.java +++ b/app/src/main/java/com/example/myapplication/fragment/CapacityEvaluationFragment2.java @@ -69,9 +69,6 @@ public class CapacityEvaluationFragment2 extends BaseFragment implements View.On capacityItemAdapter.setSetOnClick(new CapacityItemAdapter.setOnClick() { @Override public void onClick(int position) { - final Intent capacityEvaWeb = new Intent(getActivity(), FragmentManagement.class); - capacityEvaWeb.putExtra("tag",14); - startActivity(capacityEvaWeb); } }); @@ -97,7 +94,6 @@ public class CapacityEvaluationFragment2 extends BaseFragment implements View.On dismissLoadingDialog(); capacityItemAdapter.setCapItemList(response.getBody().getData()); Log.d("TAG", "onSuccess: " + response.getMsg() + "sssssssssssss"); - //Toast.makeText(getActivity(), response.getMsg() + "", Toast.LENGTH_SHORT).show(); } @Override diff --git a/app/src/main/java/com/example/myapplication/fragment/CapacityMeasurementFragment.java b/app/src/main/java/com/example/myapplication/fragment/CapacityMeasurementFragment.java index 7a894ef..9a44aa4 100644 --- a/app/src/main/java/com/example/myapplication/fragment/CapacityMeasurementFragment.java +++ b/app/src/main/java/com/example/myapplication/fragment/CapacityMeasurementFragment.java @@ -2,9 +2,11 @@ package com.example.myapplication.fragment; import android.util.Log; import android.view.View; +import android.widget.Button; import android.widget.ImageView; import android.widget.Toast; +import androidx.appcompat.app.AppCompatActivity; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -18,6 +20,9 @@ import com.example.myapplication.bean.MeasureBean; import com.example.myapplication.http.Callback; import com.example.myapplication.http.HttpInterface; import com.example.myapplication.http.OkGoBuilder; +import com.kongzue.dialog.interfaces.OnDialogButtonClickListener; +import com.kongzue.dialog.util.BaseDialog; +import com.kongzue.dialog.v3.MessageDialog; import org.json.JSONObject; @@ -32,6 +37,7 @@ public class CapacityMeasurementFragment extends BaseFragment implements View.On private RecyclerView capacityMeasurementRel; private CapacityMeasureAdapter capacityMeasureAdapter; private ArrayList bolbean; + private Button btn; @Override protected int getLayout() { @@ -47,6 +53,8 @@ public class CapacityMeasurementFragment extends BaseFragment implements View.On capacityMeasurementRel.setLayoutManager(new LinearLayoutManager(getActivity())); capacityMeasureAdapter = new CapacityMeasureAdapter(getActivity()); capacityMeasurementRel.setAdapter(capacityMeasureAdapter); + btn = findViewById(R.id.btn); + btn.setOnClickListener(this::onClick); } @@ -107,6 +115,15 @@ public class CapacityMeasurementFragment extends BaseFragment implements View.On case R.id.iv_measurement_finish: getActivity().finish(); break; + case R.id.btn: + MessageDialog.show((AppCompatActivity) getActivity(),"提示","通过","确定","取消").setOkButton(new OnDialogButtonClickListener() { + @Override + public boolean onClick(BaseDialog baseDialog, View v) { + // Toast.makeText(getContext(), "点击了确定", Toast.LENGTH_SHORT).show(); + return false; + } + }); + break; } } } \ No newline at end of file diff --git a/app/src/main/java/com/example/myapplication/fragment/FindFragment.java b/app/src/main/java/com/example/myapplication/fragment/FindFragment.java index 4d4c61d..c4f5c02 100644 --- a/app/src/main/java/com/example/myapplication/fragment/FindFragment.java +++ b/app/src/main/java/com/example/myapplication/fragment/FindFragment.java @@ -6,7 +6,7 @@ import android.widget.LinearLayout; import com.example.myapplication.R; -import com.example.myapplication.activity.ManagementActivity; +import com.example.myapplication.activity.FragmentManagement; import com.example.myapplication.base.BaseFragment; @@ -49,22 +49,22 @@ public class FindFragment extends BaseFragment implements View.OnClickListener{ public void onClick(View v) { switch (v.getId()) { case R.id.linear_task_prefecture: - Intent prefectureIntent = new Intent(getActivity(), ManagementActivity.class); + Intent prefectureIntent = new Intent(getActivity(), FragmentManagement.class); prefectureIntent.putExtra("tag", 7); startActivity(prefectureIntent); break; case R.id.linear_task_explain: - Intent explainIntent = new Intent(getActivity(), ManagementActivity.class); + Intent explainIntent = new Intent(getActivity(), FragmentManagement.class); explainIntent.putExtra("tag", 8); startActivity(explainIntent); break; case R.id.linear_event_prefecture: - Intent eventIntent = new Intent(getActivity(), ManagementActivity.class); + Intent eventIntent = new Intent(getActivity(), FragmentManagement.class); eventIntent.putExtra("tag",9); startActivity(eventIntent); break; case R.id.linear_end: - Intent endIntent = new Intent(getActivity(), ManagementActivity.class); + Intent endIntent = new Intent(getActivity(), FragmentManagement.class); endIntent.putExtra("tag", 11); startActivity(endIntent); break; diff --git a/app/src/main/java/com/example/myapplication/fragment/ForgetPawFragment.java b/app/src/main/java/com/example/myapplication/fragment/ForgetPawFragment.java index 5b7ae16..fca57b7 100644 --- a/app/src/main/java/com/example/myapplication/fragment/ForgetPawFragment.java +++ b/app/src/main/java/com/example/myapplication/fragment/ForgetPawFragment.java @@ -30,14 +30,14 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe @Override protected void initView() { super.initView(); - ivFinish = mView.findViewById(R.id.iv_finish); - title = mView.findViewById(R.id.title); - etForgetPawPhone = mView.findViewById(R.id.et_forgetPaw_phone); - etForgetPawNote = mView.findViewById(R.id.et_forgetPaw_note); - etForgetPawPaw = mView.findViewById(R.id.et_forgetPaw_paw); - etForgetPawConfirmPaw = mView.findViewById(R.id.et_forgetPaw_confirm_paw); - forgetPawGetNote = mView.findViewById(R.id.forgetPaw_get_note); - tvForgetPaw = mView.findViewById(R.id.tv_forgetPaw); + ivFinish = findViewById(R.id.iv_finish); + title = findViewById(R.id.title); + etForgetPawPhone = findViewById(R.id.et_forgetPaw_phone); + etForgetPawNote = findViewById(R.id.et_forgetPaw_note); + etForgetPawPaw = findViewById(R.id.et_forgetPaw_paw); + etForgetPawConfirmPaw = findViewById(R.id.et_forgetPaw_confirm_paw); + forgetPawGetNote = findViewById(R.id.forgetPaw_get_note); + tvForgetPaw = findViewById(R.id.tv_forgetPaw); ivFinish.setOnClickListener(this::onClick); forgetPawGetNote.setOnClickListener(this::onClick); diff --git a/app/src/main/java/com/example/myapplication/fragment/TaskExplainFragment2.java b/app/src/main/java/com/example/myapplication/fragment/TaskExplainFragment2.java index 1e92870..21bedc8 100644 --- a/app/src/main/java/com/example/myapplication/fragment/TaskExplainFragment2.java +++ b/app/src/main/java/com/example/myapplication/fragment/TaskExplainFragment2.java @@ -12,6 +12,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; import com.example.myapplication.R; import com.example.myapplication.activity.FragmentManagement; +import com.example.myapplication.activity.WebActivity; import com.example.myapplication.adapter.TaskExplainAdapter2; import com.example.myapplication.base.BaseFragment; import com.example.myapplication.bean.TaskExplainInfo; diff --git a/app/src/main/res/layout/fragment_capacity_eva_web.xml b/app/src/main/res/layout/fragment_capacity_eva_web.xml index b2a28eb..7351bfa 100644 --- a/app/src/main/res/layout/fragment_capacity_eva_web.xml +++ b/app/src/main/res/layout/fragment_capacity_eva_web.xml @@ -39,10 +39,11 @@