From 4f7f99c6ea914bcd38de78bd8371be566026b905 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 26 二月 2025 15:54:14 +0800
Subject: [PATCH] -为按钮和列表项添加波纹效果，以获得更好的视觉反馈 -改进MapFragment中的底部布局动画 -在MapFragment中添加设备状态和RTU地址显示 -更新BaseListResult以支持泛型类型 -为设备数据添加IntakeListResult和IntakeResult -通过数据库支持增强标记位置更新功能 -添加电话拨号意图以分隔标记详细信息 -通过过期检查改进磁贴缓存 -添加问题报告的确认对话框 -更新登录活动以限制用户名长度 -为波纹效果和UI元素添加新颜色 -重构XML布局以使用新的波纹图 -改进MapFragment中的错误处理和用户反馈
---
app/src/main/java/com/dayu/pipirrapp/activity/MainActivity.java | 268 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 243 insertions(+), 25 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..641aecb 100644
--- a/app/src/main/java/com/dayu/pipirrapp/activity/MainActivity.java
+++ b/app/src/main/java/com/dayu/pipirrapp/activity/MainActivity.java
@@ -1,66 +1,153 @@
package com.dayu.pipirrapp.activity;
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Build;
import android.os.Bundle;
+import android.os.VibrationEffect;
+import android.os.Vibrator;
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.app.NotificationCompat;
+import androidx.core.content.ContextCompat;
import androidx.fragment.app.Fragment;
+import androidx.lifecycle.Observer;
+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.bean.net.OrderDetailResult;
+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.MapFragment;
import com.dayu.pipirrapp.fragment.MyFragment;
+import com.dayu.pipirrapp.fragment.OrderFragment;
+import com.dayu.pipirrapp.net.MqttManager;
+import com.dayu.pipirrapp.tool.InspectionUtils;
+import com.dayu.pipirrapp.utils.CommonKeyName;
+import com.dayu.pipirrapp.utils.MyLog;
+import com.dayu.pipirrapp.utils.NetUtils;
+import com.jeremyliao.liveeventbus.LiveEventBus;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
-
+import java.util.Map;
/**
- *
+ * 棣栭〉
*/
-public class MainActivity extends BaseActivity {
- ActivityMainBinding binding;
- List<Fragment> mFragment = new ArrayList<>();
+public class MainActivity extends AppCompatActivity {
+ private static final String CHANNEL_ID = "order_channel";
+ private ActivityMainBinding binding;
+ private List<Fragment> fragments = new ArrayList<>();
+ private long mExitTime;
+ MqttManager mqttManager;
+ public volatile static Map<String, String> workerIddata = new HashMap<>();
+
+ 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();
+
+ try {
+ TagBean tagBean = DaoSingleton.getInstance(this).tagDao().findFirst();
+ MyApplication.myApplication.myTag = tagBean.getTag();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ mqttManager = new MqttManager(this, this);
+ LiveEventBus.get(CommonKeyName.NetworkCallback).observeForever(new Observer<Object>() {
+ @Override
+ public void onChanged(Object o) {
+ switch ((int) o) {
+ case NetUtils.Available:
+ MyLog.i("MqttManager>>>Lost");
+ InspectionUtils.aginPutInspectionData(MainActivity.this);
+ break;
+ case NetUtils.Lost:
+
+ break;
+ }
+ }
+ });
+ LiveEventBus.get(CommonKeyName.RedLotRefresh).observeForever(new Observer<Object>() {
+ @Override
+ public void onChanged(Object o) {
+ if (o instanceof Boolean) {
+ if ((boolean) o) {
+ binding.redDotImg.setVisibility(View.GONE);
+ workerIddata.clear();
+ }
+ } else if (o instanceof String) {
+ workerIddata.remove(o);
+ if (workerIddata.size() == 0) {
+ binding.redDotImg.setVisibility(View.GONE);
+ }
+ }
+
+ }
+ });
+ LiveEventBus.get(CommonKeyName.CreateNotification).observeForever(new Observer<Object>() {
+ @Override
+ public void onChanged(Object o) {
+ if (o instanceof OrderDetailResult) {
+ OrderDetailResult orderDetailResult = ((OrderDetailResult) o);
+ workerIddata.put(orderDetailResult.getWorkOrderId(), orderDetailResult.getWorkOrderId());
+ binding.redDotImg.setVisibility(View.VISIBLE);
+ creatOrderNotification(orderDetailResult.getWorkOrderId().hashCode(), orderDetailResult.getTaskType(), orderDetailResult.getWorkOrderId());
+ }
+
+
+ }
+ });
+ registNetCallBack();
}
- private void getPermission(){
+ @Override
+ protected void onStart() {
+ super.onStart();
}
+ 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(this, fragments);
binding.viewPager.setAdapter(adapter);
- binding.viewPager.setPagingEnabled(false);
- //璁剧疆缂撳瓨view 鐨勪釜鏁�
- binding.viewPager.setOffscreenPageLimit(3);
- // 灏� ViewPager 涓� TabLayout 鍏宠仈
- binding.tabLayout.setupWithViewPager(binding.viewPager);
+ binding.viewPager.setCurrentItem(1, false); // 榛樿鏄剧ず鍦板浘椤�
+ binding.viewPager.setOffscreenPageLimit(fragments.size());
+ binding.viewPager.setUserInputEnabled(false);
}
- long mExitTime;
-
- //鐐瑰嚮涓ゆ閫�鍑虹▼搴� 鏈夋椂闂撮棿闅� 闂撮殧鍐呯偣鍑诲垯閫�鍑虹▼搴� 鍚﹀垯 鍒欐彁绀�
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_BACK) {
@@ -68,11 +155,142 @@
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();
+
+ try {
+ //鍏抽棴MQ
+ mqttManager.disconnect();
+ unregisterNetworkCallback();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 淇敼搴曢儴鐘舵��
+ */
+ 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) {
+ if (position == 1) {
+ binding.viewPager.setCurrentItem(position, true);
+ } else {
+ binding.viewPager.setCurrentItem(position, false);
+ }
+
+ 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));
+ }
+
+ // 娉ㄥ唽缃戠粶鐩戞帶
+ private void registNetCallBack() {
+ NetUtils.registerNetCallBack(this);
+ }
+
+ private void unregisterNetworkCallback() {
+ NetUtils.unregisterReceiver(this);
+ }
+
+ /**
+ * 鍒涘缓宸ュ崟鎻愮ず閫氱煡
+ *
+ * @param notifucId
+ * @param data
+ */
+ private void creatOrderNotification(int notifucId, String data, String workOrderId) {
+ NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+ // 鍒涘缓NotificationChannel锛堜粎閽堝Android O鍙婁互涓婄増鏈級
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+ CharSequence name = getString(R.string.channel_name);
+ String description = getString(R.string.channel_description);
+ int importance = NotificationManager.IMPORTANCE_DEFAULT;
+ NotificationChannel channel = new NotificationChannel(CHANNEL_ID, name, importance);
+ channel.setDescription(description);
+ // 娉ㄥ唽閫氶亾
+ notificationManager.createNotificationChannel(channel);
+ }
+
+ Intent notificationIntent = new Intent(this, OrderDetailActivity.class);
+ notificationIntent.putExtra("workOrderId", workOrderId);
+ int requestCode = workOrderId.hashCode(); // 浣跨敤workOrderId鐨勫搱甯岀爜浣滀负requestCode
+ PendingIntent pendingIntent = PendingIntent.getActivity(this, requestCode, notificationIntent, PendingIntent.FLAG_MUTABLE);
+
+ // 鍒涘缓闇囧姩鏁堟灉
+ // 鑾峰彇 Vibrator 绯荤粺鏈嶅姟
+ Vibrator vibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
+ long[] vibrationPattern = {0, 1000, 500, 1000}; // 闇囧姩妯″紡锛氱瓑寰�0ms锛岄渿鍔�1000ms锛岀瓑寰�500ms锛岄渿鍔�1000ms
+ int repeat = -1; // 涓嶉噸澶�
+
+ // 瀵逛簬Android 26鍙婁互涓婄増鏈紝浣跨敤VibrationEffect
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+ VibrationEffect effect = VibrationEffect.createWaveform(vibrationPattern, repeat);
+ vibrator.vibrate(effect);
+ } else {
+ // 瀵逛簬Android 25鍙婁互涓嬬増鏈紝浣跨敤鏃х殑vibrate鏂规硶
+ vibrator.vibrate(vibrationPattern, repeat);
+ }
+ Notification notification = new NotificationCompat.Builder(this, CHANNEL_ID)
+ .setContentTitle("鏂板伐鍗�")
+ .setContentText(data)
+ .setSmallIcon(R.mipmap.ic_launcher)
+ .setContentIntent(pendingIntent)
+ .setAutoCancel(true) // 鐐瑰嚮閫氱煡鍚庤嚜鍔ㄦ秷澶�
+ .setDefaults(Notification.DEFAULT_SOUND | Notification.DEFAULT_VIBRATE)// 浣跨敤榛樿鐨勯煶鏁堝拰闇囧姩
+ .setVibrate(vibrationPattern)
+ .build();
+ notificationManager.notify(notifucId, notification);
+
+ }
+
+}
--
Gitblit v1.8.0