From 2bc156ec08369884b44961cd446201d35a66fff0 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 25 六月 2024 10:50:40 +0800
Subject: [PATCH] Merge branch 'feature/v1.4.1' of http://59.41.255.150:6688/r/~wjc/HDLPhotovoltaicDebugAPP into feature/v1.4.1
---
app/src/main/java/com/hdl/photovoltaic/ui/message/SearchMessageActivity.java | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 insertions(+), 1 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/message/SearchMessageActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/message/SearchMessageActivity.java
index 41cb83e..6268561 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/message/SearchMessageActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/message/SearchMessageActivity.java
@@ -1,12 +1,14 @@
package com.hdl.photovoltaic.ui.message;
+import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.View;
+import android.view.inputmethod.InputMethodManager;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.LinearLayoutManager;
@@ -20,6 +22,7 @@
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.databinding.ActivitySearchMessgeBinding;
import com.hdl.photovoltaic.listener.CloudCallBeak;
+import com.hdl.photovoltaic.other.HdlCommonLogic;
import com.hdl.photovoltaic.other.HdlFileLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlMessageLogic;
@@ -107,6 +110,8 @@
HdlThreadLogic.toast(_mActivity, R.string.search_content_null);
return;
}
+ viewBinding.messageSearchEt.clearFocus();
+ hideSoftInputFromWindow();
viewBinding.historyListParent.setVisibility(View.GONE);
viewBinding.listParent.setVisibility(View.VISIBLE);
addSearchTextToList();
@@ -152,17 +157,23 @@
currSearchText = "";
viewBinding.messageSearchEt.setText("");
viewBinding.historyListParent.setVisibility(View.VISIBLE);
+ viewBinding.deviceNullDataIc.getRoot().setVisibility(View.GONE);
viewBinding.listParent.setVisibility(View.GONE);
searchHistoryAdapter.setList(searchHistoryTitleList);
clearCacheData();
+ viewBinding.messageSearchEt.requestFocus();
+ showSoftInput();
}
});
//鍒犻櫎
viewBinding.messageDelIv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
+ viewBinding.messageSearchEt.clearFocus();
+ hideSoftInputFromWindow();
searchHistoryTitleList = new ArrayList<>();
searchHistoryAdapter.setList(searchHistoryTitleList);
+ viewBinding.deviceNullDataIc.getRoot().setVisibility(View.GONE);
HdlFileLogic.getInstance().deleteFile(getHistoryFileNamePath());
}
});
@@ -177,6 +188,8 @@
HdlThreadLogic.toast(_mActivity, R.string.search_content_null);
return;
}
+ viewBinding.messageSearchEt.clearFocus();
+ hideSoftInputFromWindow();
viewBinding.historyListParent.setVisibility(View.GONE);
viewBinding.listParent.setVisibility(View.VISIBLE);
addSearchTextToList();
@@ -194,6 +207,23 @@
}
});
+ }
+
+ /**
+ * 鏄剧ず杞敭鐩�
+ */
+ public void showSoftInput() {
+ InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+ inputMethodManager.showSoftInput(viewBinding.messageSearchEt, 0);
+
+ }
+
+ /**
+ * 闅愯棌杞敭鐩�
+ */
+ public void hideSoftInputFromWindow() {
+ InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+ inputMethodManager.hideSoftInputFromWindow(viewBinding.getRoot().getWindowToken(), 0);
}
private void initView() {
@@ -221,7 +251,7 @@
@Override
public void onKeyboardShow(int h) {
//Toast.makeText(MainActivity.this,"閿洏寮瑰嚭",Toast.LENGTH_SHORT).show();
- viewBinding.messageSearchEt.requestFocus();
+// viewBinding.messageSearchEt.requestFocus();
}
@@ -271,6 +301,7 @@
if (searchMessageAdapter != null) {
searchMessageAdapter.setList(mList);
}
+ nullDataUpdateUi();
}
});
}
@@ -426,6 +457,14 @@
}
/**
+ * 娌℃湁娑堟伅鍒楄〃鐨勬牱寮�
+ */
+ private void nullDataUpdateUi() {
+ boolean is_data = mList != null && mList.size() > 0;
+ HdlCommonLogic.getInstance().nullDataUpdateUi(_mActivity, viewBinding.deviceNullDataIc.getRoot(), viewBinding.deviceNullDataIc.nullDataGifAnimationIv, viewBinding.deviceNullDataIc.nullDataTv, getString(R.string.message_alarm_data_null), is_data);
+ }
+
+ /**
* 鑾峰彇銆愭悳绱㈠巻鍙茶褰曟枃浠躲�戝叏璺緞
*/
public String getHistoryFileNamePath() {
--
Gitblit v1.8.0