From 87cd5df70918e6ba1af849c5f026d3719bfdb1ac Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:06:29 +0800
Subject: [PATCH] Merge branch '1.5.2' into dev
---
app/src/main/java/com/hdl/photovoltaic/ui/message/SearchMessageActivity.java | 9 ++++++++-
1 files changed, 8 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 bc89327..0817798 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
@@ -66,6 +66,7 @@
@Override
public void onBindView(Bundle savedInstanceState) {
setStatusBarTranslucent();
+ getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
mMessageStateType = getIntent().getStringExtra("MessageStateType");
//鍘嗗彶璁板綍鏂囦欢澶瑰垱寤�
HdlFileLogic.getInstance().createFileDir(HdlFileLogic.getInstance().getCurrentUserRootPath());
@@ -110,6 +111,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();
@@ -167,6 +170,8 @@
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);
@@ -184,6 +189,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();
@@ -245,7 +252,7 @@
@Override
public void onKeyboardShow(int h) {
//Toast.makeText(MainActivity.this,"閿洏寮瑰嚭",Toast.LENGTH_SHORT).show();
- viewBinding.messageSearchEt.requestFocus();
+// viewBinding.messageSearchEt.requestFocus();
}
--
Gitblit v1.8.0