fengjingqi/Android-WaterProject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

适配黑色主题，调整细节

Browse Source
This commit is contained in:
fengjignqi
2026-06-06 10:47:02 +08:00
parent bc270205d0
commit e0249fa0fa
49 changed files with 262 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/ckkj/water/plan/AddWaterPlanActivity.java
View File

@@ -20,6 +20,7 @@ import com.ckkj.water.plan.mvp.WaterPlanContract;
import com.ckkj.water.plan.mvp.WaterPlanImpl;
import com.ckkj.water.plan.mvp.WaterPlanPresenter;
import com.ckkj.water.plate.adapter.ViewPagerAdapter;
import com.ckkj.water.utils.manager.ThemeManager;
import com.ckkj.water.utils.show.ToastUtil;
import com.gyf.immersionbar.ImmersionBar;
@@ -57,11 +58,10 @@ public class AddWaterPlanActivity extends BaseActivity<AddWaterPlanLayoutBinding
super.initData(savedInstanceState);
ImmersionBar.with(this)
.statusBarColor(R.color.color_F9F9F9) // 设置状态栏颜色
.statusBarDarkFont(true) // 设置状态栏字体为黑色
.statusBarDarkFont(ThemeManager.isAppThemeLight(mContext)) // 白色状态栏图标
.navigationBarColor(R.color.color_zhu)
.titleBar(viewBinding.rlTitle)
.init();
Bundle bundle = getIntent().getExtras();
if (bundle != null) {
mIsEditMode = bundle.getBoolean("is_edit", false);
@@ -76,7 +76,6 @@ public class AddWaterPlanActivity extends BaseActivity<AddWaterPlanLayoutBinding
viewBinding.includedTitle.tvTitle.setText(R.string.add_water_plan_title);
viewBinding.tvBound.setVisibility(GONE);
}
mFragmentList.add(new WaterConfigFragment_copy());
mFragmentList.add(new PlanBoundDeviceFragment());
mFragmentList.add(new BindDeviceFragment());

5
app/src/main/java/com/ckkj/water/plan/PlanDetailActivity.java
View File

@@ -21,6 +21,7 @@ import com.ckkj.water.plan.entity.WaterPlanWeekEntity;
import com.ckkj.water.plan.mvp.WaterPlanContract;
import com.ckkj.water.plan.mvp.WaterPlanImpl;
import com.ckkj.water.plan.mvp.WaterPlanPresenter;
import com.ckkj.water.utils.manager.ThemeManager;
import com.ckkj.water.utils.show.ToastUtil;
import com.ckkj.water.utils.time.ZYTimeUtils;
import com.google.gson.Gson;
@@ -59,8 +60,8 @@ public class PlanDetailActivity extends BaseActivity<WaterPlanDetailLayoutBindin
String jsonContent = getString(R.string.plan_water_entity_json);
WaterPlanWeekEntity entity = new Gson().fromJson(jsonContent, WaterPlanWeekEntity.class);
ImmersionBar.with(this)
.statusBarColor(R.color.color_F9F9F9) // 设置状态栏颜色
.statusBarDarkFont(true) // 设置状态栏字体为黑色
.statusBarDarkFont(ThemeManager.isAppThemeLight(mContext)) // 白色状态栏图标
.navigationBarColor(R.color.color_gray_theme)
.titleBar(viewBinding.rlTitle)
.init();
viewBinding.includedTitle.tvTitle.setText(R.string.plan_detail_title);

6
app/src/main/java/com/ckkj/water/plan/WaterPlanFragment.java
View File

@@ -82,6 +82,7 @@ public class WaterPlanFragment extends BaseFragment<WaterPlanFragmentBinding, Wa
private void initListener() {
setClick(viewBinding.tvAdd);
setClick(viewBinding.includedNoresult.btnRefresh);
}
private void setClick(View view) {
@@ -93,6 +94,11 @@ public class WaterPlanFragment extends BaseFragment<WaterPlanFragmentBinding, Wa
case R.id.tv_add:
goTo(mContext, AddWaterPlanActivity.class,null);
break;
case R.id.btn_refresh:
mCurrentPage = 1;
mPresenter.getWaterPlanList(mCurrentPage);
break;
}
}