app/src/main/AndroidManifest.xml
@@ -107,9 +107,6 @@ android:name=".ui.message.MessageInfoActivity" android:exported="false" /> <activity android:name=".ui.message.TestMessageActivity" android:exported="false" /> <activity android:name=".ui.me.BindMailActivity" android:exported="false" /> <activity app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java
@@ -15,6 +15,7 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.hdl.photovoltaic.R; import com.hdl.photovoltaic.enums.PowerStationStatus; import com.hdl.photovoltaic.enums.UnitType; import com.hdl.photovoltaic.other.HdlCommonLogic; import com.hdl.photovoltaic.other.HdlDeviceLogic; @@ -32,6 +33,8 @@ private List<HouseIdBean> mList; private final Context mContext; private OnclickListener noOnclickListener;//点击了的监听器 String mPowerStationStatus; /** * 收集SwipeLayout数组,要一键全部打开; @@ -114,7 +117,8 @@ } public void setList(List<HouseIdBean> newData) { public void setList(List<HouseIdBean> newData, String powerStationStatus) { mPowerStationStatus = powerStationStatus; if (this.mList == null) { this.mList = new ArrayList<>(); } else { @@ -148,15 +152,16 @@ * @param state_value 电站状态(1:正常(运行),2:离线,3:连接中,4:故障,5:离线有故障) */ private void setTextViewStyle(TextView textView, int state_value) { String text = mContext.getString(R.string.my_power_station_operation); Drawable drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_06b92a); if (mPowerStationStatus.equals(PowerStationStatus.All)) { switch (state_value) { case 1: { text = mContext.getString(R.string.my_power_station_operation); } break; case 5: case 2: { text = mContext.getString(R.string.my_power_station_off_line); drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_b9b9b9); @@ -168,7 +173,7 @@ } break; case 4: { case 5: { text = mContext.getString(R.string.my_power_station_malfunction); drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_e34343); } @@ -180,6 +185,13 @@ // } // break; } } else if (mPowerStationStatus.equals(PowerStationStatus.malfunction)) { text = mContext.getString(R.string.my_power_station_malfunction); drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_e34343); } else if (mPowerStationStatus.equals(PowerStationStatus.off)) { text = mContext.getString(R.string.my_power_station_off_line); drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_b9b9b9); } textView.setText(text); textView.setBackground(drawable);
@@ -27,6 +27,7 @@ import com.hdl.photovoltaic.ui.adapter.SearchHistoryAdapter; import com.hdl.photovoltaic.ui.adapter.SearchMessageAdapter; import com.hdl.photovoltaic.ui.bean.MessageBean; import com.hdl.photovoltaic.utils.KeyboardStateObserverUtils; import java.util.ArrayList; import java.util.Collections; @@ -208,6 +209,29 @@ searchMessageAdapter = new SearchMessageAdapter(_mActivity); viewBinding.listRcv.setLayoutManager(new LinearLayoutManager(_mActivity)); viewBinding.listRcv.setAdapter(searchMessageAdapter); viewBinding.messageSearchEt.post(new Runnable() { @Override public void run() { viewBinding.messageSearchEt.requestFocus(); } }); //在界面中使用 KeyboardStateObserverUtils.getKeyboardStateObserver(_mActivity).setKeyboardVisibilityListener(new KeyboardStateObserverUtils.OnKeyboardVisibilityListener() { @Override public void onKeyboardShow(int h) { //Toast.makeText(MainActivity.this,"键盘弹出",Toast.LENGTH_SHORT).show(); viewBinding.messageSearchEt.requestFocus(); } @Override public void onKeyboardHide(int h) { viewBinding.messageSearchEt.clearFocus(); } }); } @@ -394,14 +418,11 @@ searchHistoryTitleList.remove(searchHistoryTitleList.get(i)); } } searchHistoryTitleList.add(currSearchText); // 倒序排列数据(搜索最后排在前面) Collections.reverse(searchHistoryTitleList); searchHistoryTitleList.add(0, currSearchText); if (searchHistoryTitleList.size() > maxValue) { //历史记录不能超出10 searchHistoryTitleList.remove(searchHistoryTitleList.get(maxValue)); } } /** app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java
@@ -31,6 +31,7 @@ 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.sdk.link.core.bean.gateway.GatewayBean; import com.hdl.sdk.link.core.config.HDLLinkConfig; @@ -233,6 +234,29 @@ 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(); } }); //在界面中使用 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(); } }); } @@ -409,15 +433,12 @@ searchHistoryTitleList.remove(searchHistoryTitleList.get(i)); } } searchHistoryTitleList.add(currSearchText); // 倒序排列数据(搜索最后排在前面) Collections.reverse(searchHistoryTitleList); int maxValue = 10; searchHistoryTitleList.add(0, currSearchText); if (searchHistoryTitleList.size() > maxValue) { //历史记录不能超出10 searchHistoryTitleList.remove(searchHistoryTitleList.get(maxValue)); } } /** app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java
@@ -284,7 +284,7 @@ //移动电站位置 HdlResidenceLogic.getInstance().moveHouseId(houseIdBean.getHomeId()); initData();//初始化缓存数据 houseInfoAdapter.setList(houseListBeanIDList);//重新刷新列表 houseInfoAdapter.setList(houseListBeanIDList, powerStationStatusValue);//重新刷新列表 nullDataUpdateUi();//检测数据是否为空 } @@ -503,7 +503,7 @@ houseInfoAdapter = new HouseInfoAdapter(_mActivity); viewBinding.fragmentHouseSrlListRc.setLayoutManager(new LinearLayoutManager(_mActivity)); viewBinding.fragmentHouseSrlListRc.setAdapter(houseInfoAdapter); houseInfoAdapter.setList(this.houseListBeanIDList); houseInfoAdapter.setList(this.houseListBeanIDList, powerStationStatusValue); //设备标签 deviceInfoAdapter = new DeviceInfoAdapter(_mActivity); @@ -662,7 +662,7 @@ if (houseInfoAdapter != null) { initData(); //更新UI houseInfoAdapter.setList(houseListBeanIDList); houseInfoAdapter.setList(houseListBeanIDList, powerStationStatusValue); } } } @@ -744,7 +744,7 @@ if (houseInfoAdapter != null) { initData(); //更新UI houseInfoAdapter.setList(houseListBeanIDList); houseInfoAdapter.setList(houseListBeanIDList, powerStationStatusValue); } } nullDataUpdateUi(); @@ -925,7 +925,7 @@ initializeInverter(list); //发起初始化指令给逆变器;（注意:只能是本地发送了(要搜索局域网逆变器列表，建立本地通讯通道),删除电站成功后,云端解绑逆变器的关系） HdlResidenceLogic.getInstance().delHouseId(homeId);//删除电站缓存 initData();//初始化缓存数据 houseInfoAdapter.setList(houseListBeanIDList);//重新刷新列表 houseInfoAdapter.setList(houseListBeanIDList, powerStationStatusValue);//重新刷新列表 nullDataUpdateUi();//检测数据是否为空 }
@@ -30,6 +30,7 @@ import com.hdl.photovoltaic.ui.adapter.SearchHouseAdapter; import com.hdl.photovoltaic.ui.bean.HouseIdBean; import com.hdl.photovoltaic.uni.HDLUniMP; import com.hdl.photovoltaic.utils.KeyboardStateObserverUtils; import java.util.ArrayList; import java.util.Collections; @@ -212,6 +213,29 @@ searchHouseAdapter = new SearchHouseAdapter(_mActivity); viewBinding.listRcv.setLayoutManager(new LinearLayoutManager(_mActivity)); viewBinding.listRcv.setAdapter(searchHouseAdapter); viewBinding.powerStationSearchEt.post(new Runnable() { @Override public void run() { viewBinding.powerStationSearchEt.requestFocus(); } }); //在界面中使用 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(); } }); } @@ -385,15 +409,13 @@ * 添加历史记录 */ private void addSearchTextToList() { int maxValue = 10; for (int i = 0; i < searchHistoryTitleList.size(); i++) { if (searchHistoryTitleList.get(i).equals(currSearchText)) { searchHistoryTitleList.remove(searchHistoryTitleList.get(i)); } } searchHistoryTitleList.add(currSearchText); // 倒序排列数据(搜索最后排在前面) Collections.reverse(searchHistoryTitleList); int maxValue = 10; searchHistoryTitleList.add(0, currSearchText); if (searchHistoryTitleList.size() > maxValue) { //历史记录不能超出10 searchHistoryTitleList.remove(searchHistoryTitleList.get(maxValue)); app/src/main/res/layout/item_device_details.xml
@@ -1,17 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> <com.hdl.photovoltaic.widget.SwipeLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/item_parent_swipeLayout" android:layout_width="match_parent" android:layout_height="wrap_content"> <include <!--先隐藏右滑功能 SwipeLayout--> <!-- <include android:id="@+id/swipe_layout_il" layout="@layout/swipe_right_layout" /> layout="@layout/swipe_right_layout" />--> <RelativeLayout android:id="@+id/item_parent_rl" android:layout_width="match_parent" android:layout_height="164dp"> android:layout_width="0dp" android:layout_height="164dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> <RelativeLayout android:id="@+id/device_details_info_rl" @@ -206,4 +211,4 @@ </RelativeLayout> </com.hdl.photovoltaic.widget.SwipeLayout> </androidx.constraintlayout.widget.ConstraintLayout>
