From 21e38bfe17d3077d7ab0e05ee065f59547536692 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 03 十二月 2024 10:33:19 +0800
Subject: [PATCH] 1.添加当前巡检状态的功能。 2.修复工单界面刷新已完成列表导致未完成列表数据被清除的bug
---
app/src/main/java/com/dayu/pipirrapp/activity/MainActivity.java | 124 ++++++++++++++++++++++++++++++++---------
1 files changed, 97 insertions(+), 27 deletions(-)
diff --git a/app/src/main/java/com/dayu/pipirrapp/activity/MainActivity.java b/app/src/main/java/com/dayu/pipirrapp/activity/MainActivity.java
index 52163b4..2976fb0 100644
--- a/app/src/main/java/com/dayu/pipirrapp/activity/MainActivity.java
+++ b/app/src/main/java/com/dayu/pipirrapp/activity/MainActivity.java
@@ -3,64 +3,75 @@
import android.os.Bundle;
import android.view.KeyEvent;
import android.view.LayoutInflater;
-import android.view.MotionEvent;
-import android.view.View;
import android.widget.Toast;
import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
import androidx.fragment.app.Fragment;
+import com.dayu.pipirrapp.MyApplication;
+import com.dayu.pipirrapp.R;
import com.dayu.pipirrapp.adapter.TabAdapter;
+import com.dayu.pipirrapp.bean.db.TagBean;
+import com.dayu.pipirrapp.dao.DaoSingleton;
import com.dayu.pipirrapp.databinding.ActivityMainBinding;
-import com.dayu.pipirrapp.fragment.BaseFragment;
-import com.dayu.pipirrapp.fragment.MainFragment;
+import com.dayu.pipirrapp.fragment.OrderFragment;
import com.dayu.pipirrapp.fragment.MapFragment;
import com.dayu.pipirrapp.fragment.MyFragment;
+import com.dayu.pipirrapp.net.MqttManager;
import java.util.ArrayList;
import java.util.List;
-
/**
- *
+ * 棣栭〉
*/
-public class MainActivity extends BaseActivity {
- ActivityMainBinding binding;
- List<Fragment> mFragment = new ArrayList<>();
+public class MainActivity extends AppCompatActivity {
+ private ActivityMainBinding binding;
+ private List<Fragment> fragments = new ArrayList<>();
+ private long mExitTime;
+ MqttManager mqttManager;
+ private enum Tab {
+ ORDER, MAP, MY
+ }
@Override
protected void onCreate(Bundle savedInstanceState) {
-
super.onCreate(savedInstanceState);
binding = ActivityMainBinding.inflate(LayoutInflater.from(this));
- MapFragment mapFragment = new MapFragment();
setContentView(binding.getRoot());
- mFragment.add(mapFragment);
- mFragment.add(new MainFragment());
- mFragment.add(new MyFragment());
+
+ setupFragments();
+ initView();
initTab();
+
+ TagBean tagBean = DaoSingleton.getInstance(this).tagDao().findFirst();
+ MyApplication.myApplication.myTag = tagBean.getTag();
+ mqttManager = new MqttManager(this);
+ mqttManager.connect();
}
- private void getPermission(){
-
+ private void setupFragments() {
+ fragments.add(new OrderFragment());
+ fragments.add(new MapFragment());
+ fragments.add(new MyFragment());
}
-
+ private void initView() {
+ binding.orderLL.setOnClickListener(v -> changeBottomState(Tab.ORDER));
+ binding.mapLL.setOnClickListener(v -> changeBottomState(Tab.MAP));
+ binding.myLL.setOnClickListener(v -> changeBottomState(Tab.MY));
+ }
private void initTab() {
- TabAdapter adapter = new TabAdapter(getSupportFragmentManager(), mFragment);
+ TabAdapter adapter = new TabAdapter(getSupportFragmentManager(), fragments);
binding.viewPager.setAdapter(adapter);
binding.viewPager.setPagingEnabled(false);
- //璁剧疆缂撳瓨view 鐨勪釜鏁�
- binding.viewPager.setOffscreenPageLimit(3);
- // 灏� ViewPager 涓� TabLayout 鍏宠仈
- binding.tabLayout.setupWithViewPager(binding.viewPager);
+ binding.viewPager.setOffscreenPageLimit(fragments.size());
+ binding.viewPager.setCurrentItem(1); // 榛樿鏄剧ず鍦板浘椤�
}
- long mExitTime;
-
- //鐐瑰嚮涓ゆ閫�鍑虹▼搴� 鏈夋椂闂撮棿闅� 闂撮殧鍐呯偣鍑诲垯閫�鍑虹▼搴� 鍚﹀垯 鍒欐彁绀�
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_BACK) {
@@ -68,11 +79,70 @@
Toast.makeText(MainActivity.this, "鍐嶆寜涓�娆￠��鍑虹▼搴�", Toast.LENGTH_SHORT).show();
mExitTime = System.currentTimeMillis();
} else {
- MainActivity.this.finish();
+ finish();
}
return true;
}
return super.onKeyDown(keyCode, event);
}
-}
\ No newline at end of file
+ @Override
+ protected void onDestroy() {
+ super.onDestroy();
+ //鍏抽棴MQ
+ mqttManager.disconnect();
+ }
+
+ /**
+ * 淇敼搴曢儴鐘舵��
+ */
+ private void changeBottomState(Tab tab) {
+ resetTabState();
+ switch (tab) {
+ case ORDER:
+ updateTabUI(0, R.drawable.bottom_order_white, R.color.white);
+ break;
+ case MAP:
+ updateTabUI(1, R.drawable.bottom_map_white, R.color.white);
+ break;
+ case MY:
+ updateTabUI(2, R.drawable.bottom_my_white, R.color.white);
+ break;
+ }
+ }
+
+ /**
+ * 鏇存柊鏌愪釜 Tab 鐨� UI 鐘舵��
+ */
+ private void updateTabUI(int position, int iconResId, int textColorResId) {
+ binding.viewPager.setCurrentItem(position);
+ switch (position) {
+ case 0:
+ binding.orderImg.setImageDrawable(ContextCompat.getDrawable(this, iconResId));
+ binding.orderText.setTextColor(ContextCompat.getColor(this, textColorResId));
+ break;
+ case 1:
+ binding.mapImg.setImageDrawable(ContextCompat.getDrawable(this, iconResId));
+ binding.mapText.setTextColor(ContextCompat.getColor(this, textColorResId));
+ break;
+ case 2:
+ binding.myImg.setImageDrawable(ContextCompat.getDrawable(this, iconResId));
+ binding.myText.setTextColor(ContextCompat.getColor(this, textColorResId));
+ break;
+ }
+ }
+
+ /**
+ * 閲嶇疆鎵�鏈� Tab 鐨勯粯璁ょ姸鎬�
+ */
+ private void resetTabState() {
+ binding.orderImg.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.bottom_order_black));
+ binding.orderText.setTextColor(ContextCompat.getColor(this, R.color.black));
+
+ binding.mapImg.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.bottom_map_black));
+ binding.mapText.setTextColor(ContextCompat.getColor(this, R.color.black));
+
+ binding.myImg.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.bottom_my_black));
+ binding.myText.setTextColor(ContextCompat.getColor(this, R.color.black));
+ }
+}
--
Gitblit v1.8.0