From 5d3efa4c93dde0cde474951e5310bb72ebbf4184 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期三, 07 五月 2025 15:18:26 +0800 Subject: [PATCH] 2025年05月07日15:18:20 1.2.0 --- app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java | 226 +++++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 173 insertions(+), 53 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 cb83d64..551a345 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,16 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import android.content.Context; +import android.os.AsyncTask; import android.os.Bundle; +import android.os.Handler; +import android.os.Looper; 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; @@ -17,9 +22,11 @@ import com.hdl.photovoltaic.R; import com.hdl.photovoltaic.base.CustomBaseActivity; import com.hdl.photovoltaic.bean.PageNumberObject; +import com.hdl.photovoltaic.config.UserConfigManage; 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; @@ -30,8 +37,12 @@ import com.hdl.photovoltaic.ui.adapter.SearchHistoryAdapter; import com.hdl.photovoltaic.ui.bean.CloudInverterDeviceBean; import com.hdl.photovoltaic.uni.HDLUniMP; +import com.hdl.photovoltaic.utils.KeyboardStateObserverUtils; import com.hdl.photovoltaic.utils.URLEncodingUtils; +import com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout; +import com.hdl.photovoltaic.widget.refreshlayout.HDLRefreshViewHolder; import com.hdl.sdk.link.core.bean.gateway.GatewayBean; +import com.hdl.sdk.link.core.config.HDLLinkConfig; import com.hdl.sdk.link.gateway.HDLLinkLocalGateway; import java.util.ArrayList; @@ -43,7 +54,8 @@ */ public class DeviceSearchActivity extends CustomBaseActivity { - + private Handler handler; + private Runnable delayedRunnable; private ActivityDeviceSearchBinding viewBinding; SearchDeviceAdapter searchDeviceAdapter;//璁惧閫傞厤鍣� @@ -51,9 +63,9 @@ private List<CloudInverterDeviceBean> deviceList = new ArrayList<>(); - private int currentHouseListPage = 0; // 褰撳墠鐢电珯鍒楄〃椤电爜 - private int currentHouseListTotal = 0; // 鐢电珯鍒楄〃鎬婚〉鐮� - private boolean isHouseLoadingMore = false; // 鏍囪鐢电珯鍒楄〃姝e湪鍔犺浇鏇村鏁版嵁 + private int currentDeviceListPage = 0; // 褰撳墠鐢电珯鍒楄〃椤电爜 + private int currentDeviceListTotal = 0; // 鐢电珯鍒楄〃鎬婚〉鐮� + private boolean isDeviceLoadingMore = false; // 鏍囪鐢电珯鍒楄〃姝e湪鍔犺浇鏇村鏁版嵁 private String currSearchText; @@ -68,6 +80,7 @@ @Override public void onBindView(Bundle savedInstanceState) { setStatusBarTranslucent(); + getWindow().setNavigationBarColor(getColor(R.color.text_FF000000)); //鍘嗗彶璁板綍鏂囦欢澶瑰垱寤� HdlFileLogic.getInstance().createFileDir(HdlFileLogic.getInstance().getCurrentUserRootPath()); //鍒濆鍖栨暟鎹� @@ -90,6 +103,54 @@ } } + /** + * 涓嬫媺鍒锋柊鐨勯�昏緫 + */ + protected void pullToRefresh() { + viewBinding.listSrl.setDelegate(new BGARefreshLayout.BGARefreshLayoutDelegate() { + @Override + public void onBGARefreshLayoutBeginRefreshing(BGARefreshLayout refreshLayout) { + handler = new Handler(Looper.getMainLooper()); + + delayedRunnable = new Runnable() { + @Override + public void run() { + viewBinding.listSrl.endRefreshing(); + loadNextPageDeviceList(false, 1, true); + } + }; + // 寤惰繜 5 绉掓墽琛� + handler.postDelayed(delayedRunnable, 1000); + } + + + @Override + public boolean onBGARefreshLayoutBeginLoadingMore(BGARefreshLayout refreshLayout) { + + handler = new Handler(Looper.getMainLooper()); + delayedRunnable = new Runnable() { + @Override + public void run() { + viewBinding.listSrl.endLoadingMore(); + if (!isDeviceLoadingMore) { + // 婊戝姩鍒颁簡搴曢儴锛屾墽琛岀浉搴旂殑鎿嶄綔 + HdlLogLogic.print("--->婊戝姩鍒颁簡搴曢儴"); + loadNextPageDeviceList(false, ++currentDeviceListPage, false); + } + } + }; + // 寤惰繜 5 绉掓墽琛� + handler.postDelayed(delayedRunnable, 10); + + return true; + } + }); + HDLRefreshViewHolder hdlRefreshViewHolder = new HDLRefreshViewHolder(_mActivity, true); + hdlRefreshViewHolder.setPullDownImageResource(R.mipmap.loading_44); + hdlRefreshViewHolder.setChangeToReleaseRefreshAnimResId(R.drawable.loading_refresh); + hdlRefreshViewHolder.setRefreshingAnimResId(R.drawable.loading_refresh_end); + viewBinding.listSrl.setRefreshViewHolder(hdlRefreshViewHolder); + } private void initEvent() { @@ -113,44 +174,15 @@ HdlThreadLogic.toast(_mActivity, R.string.search_content_null); return; } + viewBinding.powerStationSearchEt.clearFocus(); + hideSoftInputFromWindow(); viewBinding.historyListParent.setVisibility(View.GONE); viewBinding.listParent.setVisibility(View.VISIBLE); addSearchTextToList(); - loadNextPageHouseList(true, 1, true); + loadNextPageDeviceList(true, 1, true); } }); - - //涓嬫媺绠ご棰滆壊 - viewBinding.listSrl.setColorSchemeResources(R.color.text_FF245EC3); - //涓嬫媺璇诲彇 - viewBinding.listSrl.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { - @Override - public void onRefresh() { - viewBinding.listSrl.setRefreshing(false); - loadNextPageHouseList(true, 1, true); - } - }); - //涓婃媺璇诲彇 - viewBinding.listRcv.addOnScrollListener(new RecyclerView.OnScrollListener() { - @Override - public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) { - LinearLayoutManager layoutManager = (LinearLayoutManager) recyclerView.getLayoutManager(); - if (layoutManager == null) { - return; - } - int visibleItemCount = layoutManager.getChildCount(); - int totalItemCount = layoutManager.getItemCount(); - int firstVisibleItemPosition = layoutManager.findFirstVisibleItemPosition(); - if (visibleItemCount > 0 && visibleItemCount + firstVisibleItemPosition == totalItemCount) { - if (!isHouseLoadingMore) { - // 婊戝姩鍒颁簡搴曢儴锛屾墽琛岀浉搴旂殑鎿嶄綔 - HdlLogLogic.print("--->婊戝姩鍒颁簡搴曢儴"); - loadNextPageHouseList(false, ++currentHouseListPage, false); - } - } - } - }); //娓呴櫎 viewBinding.powerStationClearIv.setOnClickListener(new View.OnClickListener() { @Override @@ -159,17 +191,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()); + } }); //鍘嗗彶璁板綍鐐瑰嚮浜嬩欢 @@ -177,22 +216,51 @@ @Override public void onClick(int position, String title) { viewBinding.powerStationSearchEt.setText(title); + //鎼滅储鍏抽敭瀛� + currSearchText = viewBinding.powerStationSearchEt.getText().toString().replace(" ", ""); + if (TextUtils.isEmpty(currSearchText)) { + HdlThreadLogic.toast(_mActivity, R.string.search_content_null); + return; + } + viewBinding.powerStationSearchEt.clearFocus(); + hideSoftInputFromWindow(); + viewBinding.historyListParent.setVisibility(View.GONE); + viewBinding.listParent.setVisibility(View.VISIBLE); + addSearchTextToList(); + loadNextPageDeviceList(true, 1, true); } }); //璁惧鐐瑰嚮鏄簨浠� 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) { GatewayBean newGatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(deviceBean.getOsn()); + if (newGatewayBean == null) { + HdlThreadLogic.toast(_mActivity, getString(R.string.device_off)); + return; + } + if (TextUtils.isEmpty(newGatewayBean.getGatewayId()) || TextUtils.isEmpty(newGatewayBean.getAesKey())) { + //杩欓噷鍙敮鎸佽繙绋嬭皟璇曪紝杩滅▼鎷夸笉鍒癿qtt閫氳绉橀挜浠ュ強gatewayId锛� + HdlThreadLogic.toast(_mActivity,getString(R.string.Device_failed_to_certificate)+"(124004)"); + return; + } String jsonEncryption = URLEncodingUtils.encodeURIComponent(new Gson().toJson(newGatewayBean)); String path = HDLUniMP.UNI_EVENT_OPEN_DEVICE_DETAILS + "?inverterInfo=" + jsonEncryption; HdlUniLogic.getInstance().openUniMP(path, null); + } @Override @@ -204,6 +272,7 @@ }); } + private void initView() { viewBinding.historyListParent.setVisibility(View.VISIBLE); @@ -218,8 +287,48 @@ searchDeviceAdapter = new SearchDeviceAdapter(_mActivity); viewBinding.listRcv.setLayoutManager(new LinearLayoutManager(_mActivity)); viewBinding.listRcv.setAdapter(searchDeviceAdapter); + viewBinding.powerStationSearchEt.post(new Runnable() { + @Override + public void run() { + viewBinding.powerStationSearchEt.requestFocus(); + } + }); + pullToRefresh(); + + //鍦ㄧ晫闈腑浣跨敤 + KeyboardStateObserverUtils.getKeyboardStateObserver(_mActivity).setKeyboardVisibilityListener(new KeyboardStateObserverUtils.OnKeyboardVisibilityListener() { + @Override + public void onKeyboardShow(int h) { + //Toast.makeText(MainActivity.this,"閿洏寮瑰嚭",Toast.LENGTH_SHORT).show(); +// viewBinding.powerStationSearchEt.requestFocus(); + + } + + @Override + + public void onKeyboardHide(int h) { + viewBinding.powerStationSearchEt.clearFocus(); + } + + }); } + /** + * 鏄剧ず杞敭鐩� + */ + 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); + } /** * 杈撳叆鐢电珯鍚嶇О杩涜杩囨护 @@ -262,6 +371,9 @@ HdlFileLogic.getInstance().deleteFile(getHistoryFileNamePath()); HdlFileLogic.getInstance().appendFile(getHistoryFileNamePath(), new Gson().toJson(searchHistoryTitleList)); } + if (handler != null && delayedRunnable != null) { + handler.removeCallbacks(delayedRunnable); + } super.onDestroy(); } @@ -270,7 +382,7 @@ * * @param isRefreshing 琛ㄧず鏄笅鎷夊埛鏂扮殑 */ - private void loadNextPageHouseList(boolean isRefreshing, long pageNo, boolean isClear) { + private void loadNextPageDeviceList(boolean isRefreshing, long pageNo, boolean isClear) { //鎼滅储鍏抽敭瀛� if (TextUtils.isEmpty(currSearchText)) { @@ -281,12 +393,12 @@ clearData(); } //绗竴椤佃鍙栨暟鎹己鍒惰鍙� - if (pageNo > 1 && currentHouseListPage > currentHouseListTotal) { - --currentHouseListPage; + if (pageNo > 1 && currentDeviceListPage > currentDeviceListTotal) { + --currentDeviceListPage; //褰撳墠椤典笉鑳藉ぇ浜庢�婚〉鏁� return; } - isHouseLoadingMore = true;//鏍囪璇诲彇鐘舵�� + isDeviceLoadingMore = true;//鏍囪璇诲彇鐘舵�� if (isRefreshing) { showLoading(); } @@ -301,16 +413,17 @@ if (isRefreshing) { hideLoading(); } - isHouseLoadingMore = false; + isDeviceLoadingMore = false; if (deviceClass != null) { - currentHouseListTotal = (int) deviceClass.getTotalPage(); - currentHouseListPage = (int) deviceClass.getPageNo(); + currentDeviceListTotal = (int) deviceClass.getTotalPage(); + currentDeviceListPage = (int) deviceClass.getPageNo(); //鏇存柊缂撳瓨 setDeviceList(deviceClass.getList()); if (searchDeviceAdapter != null) { //鏇存柊UI searchDeviceAdapter.setList(deviceList); } + nullDataUpdateUi(); } } }, _mActivity, ShowErrorMode.YES); @@ -322,10 +435,10 @@ HdlThreadLogic.runMainThread(new Runnable() { @Override public void run() { - if (currentHouseListPage > 1) { - --currentHouseListPage; + if (currentDeviceListPage > 1) { + --currentDeviceListPage; } - isHouseLoadingMore = false; + isDeviceLoadingMore = false; if (isRefreshing) { hideLoading(); } @@ -385,6 +498,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); + } + /** * 娣诲姞鍘嗗彶璁板綍 */ @@ -394,14 +516,12 @@ searchHistoryTitleList.remove(searchHistoryTitleList.get(i)); } } - searchHistoryTitleList.add(currSearchText); - // 鍊掑簭鎺掑垪鏁版嵁(鎼滅储鏈�鍚庢帓鍦ㄥ墠闈�) - Collections.reverse(searchHistoryTitleList); - if (searchHistoryTitleList.size() > 10) { + int maxValue = 10; + searchHistoryTitleList.add(0, currSearchText); + if (searchHistoryTitleList.size() > maxValue) { //鍘嗗彶璁板綍涓嶈兘瓒呭嚭10 - searchHistoryTitleList.remove(searchHistoryTitleList.get(11)); + searchHistoryTitleList.remove(searchHistoryTitleList.get(maxValue)); } - } /** -- Gitblit v1.8.0