From f10cda784bede39a861566850898747c38e6c94f Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期二, 21 一月 2025 15:32:54 +0800 Subject: [PATCH] 2025年01月21日15:31:52 --- app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java | 53 +++++++++++++++++++++++++++-------------------------- 1 files changed, 27 insertions(+), 26 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java index f51699b..a7edc27 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java @@ -7,6 +7,7 @@ import androidx.fragment.app.FragmentTransaction; import android.Manifest; +import android.app.Activity; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; @@ -18,6 +19,7 @@ import android.text.TextUtils; import android.util.Log; import android.view.View; +import android.view.WindowManager; import android.widget.TextView; import com.google.gson.Gson; @@ -102,8 +104,8 @@ @Override public void onBindView(Bundle savedInstanceState) { -// setNotificationBarBackgroundColor(CustomColor.blue); setStatusBarTranslucent(); + getWindow().setNavigationBarColor(getColor(R.color.text_FF1C1C1E)); //鍒濆鍖栫鐗� initFragment(savedInstanceState); //鍒濆鍖� @@ -122,8 +124,6 @@ this.requestPermissions(); //璇诲彇娑堟伅鏈鏁伴噺 this.getUnreadCount(); - //棰勫垱寤鸿剼鏈琷son鏂囦欢澶� - HdlFileLogic.getInstance().createHdlESLocalJsonDirectory(); //鑾峰彇浜戠鑴氭湰 HdlESLocalJsonLogic.getInstance().getAllHdlESLocalJson(); @@ -389,43 +389,43 @@ if (this.currentFragmentIndex == 0) { //姒傝鐣岄潰 viewBinding.myPowerStationBottomIl0.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.home_page_selected)); - viewBinding.myPowerStationBottomIl0.titleTv.setTextColor(getColor(R.color.text_E6000000)); + viewBinding.myPowerStationBottomIl0.titleTv.setTextColor(getColor(R.color.text_E6FFFFFF)); viewBinding.myPowerStationBottomIl1.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.power_station_unselected)); - viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_65000000)); + viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_66FFFFFF)); viewBinding.myMessageBottomIl2.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.message_unselected)); - viewBinding.myMessageBottomIl2.titleTv.setTextColor(getColor(R.color.text_65000000)); + viewBinding.myMessageBottomIl2.titleTv.setTextColor(getColor(R.color.text_66FFFFFF)); viewBinding.myMeBottomIl3.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.me_unselected)); - viewBinding.myMeBottomIl3.titleTv.setTextColor(getColor(R.color.text_65000000)); + viewBinding.myMeBottomIl3.titleTv.setTextColor(getColor(R.color.text_66FFFFFF)); } else if (this.currentFragmentIndex == 1) { //鐢电珯鐣岄潰 viewBinding.myPowerStationBottomIl0.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.home_page_unselected)); - viewBinding.myPowerStationBottomIl0.titleTv.setTextColor(getColor(R.color.text_65000000)); + viewBinding.myPowerStationBottomIl0.titleTv.setTextColor(getColor(R.color.text_66FFFFFF)); viewBinding.myPowerStationBottomIl1.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.power_station_selected)); - viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_E6000000)); + viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_E6FFFFFF)); viewBinding.myMessageBottomIl2.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.message_unselected)); - viewBinding.myMessageBottomIl2.titleTv.setTextColor(getColor(R.color.text_65000000)); + viewBinding.myMessageBottomIl2.titleTv.setTextColor(getColor(R.color.text_66FFFFFF)); viewBinding.myMeBottomIl3.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.me_unselected)); - viewBinding.myMeBottomIl3.titleTv.setTextColor(getColor(R.color.text_65000000)); + viewBinding.myMeBottomIl3.titleTv.setTextColor(getColor(R.color.text_66FFFFFF)); } else if (this.currentFragmentIndex == 2) { //娑堟伅鐣岄潰 viewBinding.myPowerStationBottomIl0.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.home_page_unselected)); - viewBinding.myPowerStationBottomIl0.titleTv.setTextColor(getColor(R.color.text_65000000)); + viewBinding.myPowerStationBottomIl0.titleTv.setTextColor(getColor(R.color.text_66FFFFFF)); viewBinding.myPowerStationBottomIl1.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.power_station_unselected)); - viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_65000000)); - viewBinding.myMessageBottomIl2.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.message_select)); - viewBinding.myMessageBottomIl2.titleTv.setTextColor(getColor(R.color.text_E6000000)); + viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_66FFFFFF)); + viewBinding.myMessageBottomIl2.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.message_selected)); + viewBinding.myMessageBottomIl2.titleTv.setTextColor(getColor(R.color.text_E6FFFFFF)); viewBinding.myMeBottomIl3.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.me_unselected)); - viewBinding.myMeBottomIl3.titleTv.setTextColor(getColor(R.color.text_65000000)); + viewBinding.myMeBottomIl3.titleTv.setTextColor(getColor(R.color.text_66FFFFFF)); } else if (this.currentFragmentIndex == 3) { //鎴戠殑鐣岄潰 viewBinding.myPowerStationBottomIl0.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.home_page_unselected)); - viewBinding.myPowerStationBottomIl0.titleTv.setTextColor(getColor(R.color.text_65000000)); + viewBinding.myPowerStationBottomIl0.titleTv.setTextColor(getColor(R.color.text_66FFFFFF)); viewBinding.myPowerStationBottomIl1.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.power_station_unselected)); - viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_65000000)); + viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_66FFFFFF)); viewBinding.myMessageBottomIl2.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.message_unselected)); - viewBinding.myMessageBottomIl2.titleTv.setTextColor(getColor(R.color.text_65000000)); + viewBinding.myMessageBottomIl2.titleTv.setTextColor(getColor(R.color.text_66FFFFFF)); viewBinding.myMeBottomIl3.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.me_selected)); - viewBinding.myMeBottomIl3.titleTv.setTextColor(getColor(R.color.text_E6000000)); + viewBinding.myMeBottomIl3.titleTv.setTextColor(getColor(R.color.text_E6FFFFFF)); } } @@ -435,12 +435,12 @@ this.notificationSet(); //ACCESS_FINE_LOCATION 鍏佽浣跨敤GPS瀹氫綅 //ACCESS_COARSE_LOCATION 鍏佽浣跨敤WIFI鐑偣鎴栧熀绔欐潵鑾峰彇绮楃暐鐨勫畾浣� - String[] ary = PermissionUtils.checkPermission(_mActivity, new String[]{Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION}); - if (ary.length > 0) { - this.requestPermissions(ary, PermissionUtils.STATUS_SUCCESS); - } else { - locationUpdates(); - } +// String[] ary = PermissionUtils.checkPermission(_mActivity, new String[]{Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION}); +// if (ary.length > 0) { +// this.requestPermissions(ary, PermissionUtils.STATUS_SUCCESS); +// } else { +// locationUpdates(); +// } } @Override @@ -472,6 +472,7 @@ @Override public void onMessage(Object msg) { + if (msg == null) { return; } -- Gitblit v1.8.0