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/powerstation/DeviceSearchActivity.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 48 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java index bee47e2..5c99ae0 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java @@ -5,11 +5,13 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import android.content.Context; 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 com.google.gson.Gson; import com.google.gson.reflect.TypeToken; @@ -21,6 +23,7 @@ import com.hdl.photovoltaic.databinding.ActivityDeviceSearchBinding; import com.hdl.photovoltaic.enums.ShowErrorMode; import com.hdl.photovoltaic.listener.CloudCallBeak; +import com.hdl.photovoltaic.other.HdlCommonLogic; import com.hdl.photovoltaic.other.HdlDeviceLogic; import com.hdl.photovoltaic.other.HdlFileLogic; import com.hdl.photovoltaic.other.HdlLogLogic; @@ -71,6 +74,7 @@ @Override public void onBindView(Bundle savedInstanceState) { setStatusBarTranslucent(); + getWindow().setNavigationBarColor(getColor(R.color.text_FF000000)); //鍘嗗彶璁板綍鏂囦欢澶瑰垱寤� HdlFileLogic.getInstance().createFileDir(HdlFileLogic.getInstance().getCurrentUserRootPath()); //鍒濆鍖栨暟鎹� @@ -116,6 +120,8 @@ HdlThreadLogic.toast(_mActivity, R.string.search_content_null); return; } + viewBinding.powerStationSearchEt.clearFocus(); + hideSoftInputFromWindow(); viewBinding.historyListParent.setVisibility(View.GONE); viewBinding.listParent.setVisibility(View.VISIBLE); addSearchTextToList(); @@ -162,17 +168,24 @@ viewBinding.powerStationSearchEt.setText(""); viewBinding.historyListParent.setVisibility(View.VISIBLE); viewBinding.listParent.setVisibility(View.GONE); + viewBinding.deviceNullDataIc.getRoot().setVisibility(View.GONE); searchHistoryAdapter.setList(searchHistoryTitleList); clearData(); + viewBinding.powerStationSearchEt.requestFocus(); + showSoftInput(); } }); //鍒犻櫎 viewBinding.powerStationDelIv.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + viewBinding.powerStationSearchEt.clearFocus(); + hideSoftInputFromWindow(); searchHistoryTitleList = new ArrayList<>(); searchHistoryAdapter.setList(searchHistoryTitleList); + viewBinding.deviceNullDataIc.getRoot().setVisibility(View.GONE); HdlFileLogic.getInstance().deleteFile(getHistoryFileNamePath()); + } }); //鍘嗗彶璁板綍鐐瑰嚮浜嬩欢 @@ -186,6 +199,8 @@ HdlThreadLogic.toast(_mActivity, R.string.search_content_null); return; } + viewBinding.powerStationSearchEt.clearFocus(); + hideSoftInputFromWindow(); viewBinding.historyListParent.setVisibility(View.GONE); viewBinding.listParent.setVisibility(View.VISIBLE); addSearchTextToList(); @@ -196,12 +211,16 @@ searchDeviceAdapter.setOnclickListener(new DeviceInfoAdapter.OnClickListener() { @Override public void onClick(int position, CloudInverterDeviceBean deviceBean) { + if (deviceBean.getDeviceStatus() == 4) { + HdlThreadLogic.toast(_mActivity, R.string.device_off); + return; + } //閰嶇疆鏈湴閫氫俊鐨勪俊鎭� HDLLinkConfig.getInstance().setHomeId(deviceBean.getHomeId()); HDLLinkConfig.getInstance().setLocalSecret(deviceBean.getLocalSecret()); List<CloudInverterDeviceBean> newList = new ArrayList<>(); newList.add(deviceBean); - //鐩殑鏄负浜嗚幏鍙栨嬁鍒扮綉鍏矷D锛宮qtt閫氳绉橀挜绛変俊鎭紝缂撳瓨鏈湴閫嗗彉鍣ㄥ垪琛ㄩ噷闈紝鍙戦�佹暟鎹暟鎹椂鑷姩鍘荤紦瀛樺垪琛ㄩ噷闈㈠幓鏌ユ壘锛� + //鐩殑鏄负浜嗚幏鍙栨嬁鍒扮綉鍏矷D锛宮qtt閫氳绉橀挜绛変俊鎭紝鎷垮埌鍚庣紦瀛樺埌鏈湴閫嗗彉鍣ㄥ垪琛ㄩ噷闈紝鍙戦�佹暟鎹暟鎹椂鑷姩鍘荤紦瀛樺垪琛ㄩ噷闈㈠幓鏌ユ壘锛� HdlDeviceLogic.getInstance().setDeviceRemoteInfo(newList, deviceBean.getHomeId(), new CloudCallBeak<List<GatewayBean>>() { @Override public void onSuccess(List<GatewayBean> obj) { @@ -220,6 +239,7 @@ }); } + private void initView() { viewBinding.historyListParent.setVisibility(View.VISIBLE); @@ -246,7 +266,7 @@ @Override public void onKeyboardShow(int h) { //Toast.makeText(MainActivity.this,"閿洏寮瑰嚭",Toast.LENGTH_SHORT).show(); - viewBinding.powerStationSearchEt.requestFocus(); +// viewBinding.powerStationSearchEt.requestFocus(); } @@ -259,6 +279,22 @@ }); } + /** + * 鏄剧ず杞敭鐩� + */ + public void showSoftInput() { + InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputMethodManager.showSoftInput(viewBinding.powerStationSearchEt, 0); + + } + + /** + * 闅愯棌杞敭鐩� + */ + public void hideSoftInputFromWindow() { + InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputMethodManager.hideSoftInputFromWindow(viewBinding.getRoot().getWindowToken(), 0); + } /** * 杈撳叆鐢电珯鍚嶇О杩涜杩囨护 @@ -350,6 +386,7 @@ //鏇存柊UI searchDeviceAdapter.setList(deviceList); } + nullDataUpdateUi(); } } }, _mActivity, ShowErrorMode.YES); @@ -424,6 +461,15 @@ } } + + /** + * 娌℃湁璁惧鍒楄〃鐨勬牱寮� + */ + private void nullDataUpdateUi() { + boolean is_data = deviceList != null && deviceList.size() > 0; + HdlCommonLogic.getInstance().nullDataUpdateUi(_mActivity, viewBinding.deviceNullDataIc.getRoot(), viewBinding.deviceNullDataIc.nullDataGifAnimationIv, viewBinding.deviceNullDataIc.nullDataTv, getString(R.string.no_equipment), is_data); + } + /** * 娣诲姞鍘嗗彶璁板綍 */ -- Gitblit v1.8.0