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

5
app/src/main/java/com/ckkj/water/device/DeviceControlActivity.java
View File

@@ -23,6 +23,7 @@ import com.ckkj.water.index.entity.WaterDeviceEntity;
import com.ckkj.water.network.BaseBean;
import com.ckkj.water.plan.entity.WaterPlanWeekEntity;
import com.ckkj.water.utils.manager.PowerIconManage;
import com.ckkj.water.utils.manager.ThemeManager;
import com.ckkj.water.utils.show.ToastUtil;
import com.gyf.immersionbar.ImmersionBar;
import com.lxj.xpopup.XPopup;
@@ -84,8 +85,8 @@ public class DeviceControlActivity extends BaseActivity<DeviceControlLayoutBindi
mTimeList.add("3h");
mTimeList.add("4h");
ImmersionBar.with(this)
.statusBarColor(R.color.mainBackgroundColor) // 设置状态栏颜色
.statusBarDarkFont(true) // 设置状态栏字体为黑色
.statusBarDarkFont(ThemeManager.isAppThemeLight(mContext)) // 白色状态栏图标
.navigationBarColor(R.color.mainBackgroundColor)
.titleBar(viewBinding.rlTitle)
.init();
viewBinding.includedTitle.imgSetting.setVisibility(View.VISIBLE);

5
app/src/main/java/com/ckkj/water/device/DeviceInfoActivity.java
View File

@@ -11,6 +11,7 @@ import com.ckkj.water.device.mvp.DeviceImpl;
import com.ckkj.water.device.mvp.DevicePresenter;
import com.ckkj.water.index.entity.WaterDeviceEntity;
import com.ckkj.water.network.BaseBean;
import com.ckkj.water.utils.manager.ThemeManager;
import com.gyf.immersionbar.ImmersionBar;
/**
@@ -28,8 +29,8 @@ public class DeviceInfoActivity extends BaseActivity<DeviceInfoLayoutBinding, De
super.initData(savedInstanceState);
ImmersionBar.with(this)
.statusBarColor(R.color.white) // 设置状态栏颜色
.statusBarDarkFont(true) // 设置状态栏字体为黑色
.statusBarDarkFont(ThemeManager.isAppThemeLight(mContext)) // 白色状态栏图标
.navigationBarColor(R.color.mainBackgroundColor)
.titleBar(viewBinding.rlTitle)
.init();
viewBinding.includedTitle.tvTitle.setText(R.string.device_setting_info);

5
app/src/main/java/com/ckkj/water/device/DeviceSettingsActivity.java
View File

@@ -18,6 +18,7 @@ import com.ckkj.water.device.mvp.DeviceImpl;
import com.ckkj.water.device.mvp.DevicePresenter;
import com.ckkj.water.index.entity.WaterDeviceEntity;
import com.ckkj.water.network.BaseBean;
import com.ckkj.water.utils.manager.ThemeManager;
import com.ckkj.water.utils.show.ToastUtil;
import com.gyf.immersionbar.ImmersionBar;
@@ -46,8 +47,8 @@ public class DeviceSettingsActivity extends BaseActivity<DeviceSettingsLayoutBin
}
ImmersionBar.with(this)
.statusBarColor(R.color.white) // 设置状态栏颜色
.statusBarDarkFont(true) // 设置状态栏字体为黑色
.statusBarDarkFont(ThemeManager.isAppThemeLight(mContext)) // 白色状态栏图标
.navigationBarColor(R.color.mainBackgroundColor)
.titleBar(viewBinding.rlTitle)
.init();
viewBinding.includedTitle.tvTitle.setText(R.string.settings_title);

2
app/src/main/java/com/ckkj/water/device/SelectWifiActivity.java
View File

@@ -101,7 +101,7 @@ public class SelectWifiActivity extends BaseActivity<DeviceResetWifiBinding, Dev
}
ImmersionBar.with(this)
.statusBarColor(R.color.mainBackgroundColor)
.statusBarColor(R.color.color_gray_theme)
.statusBarDarkFont(ThemeManager.isAppThemeLight(mContext))
.titleBar(viewBinding.rlTitle)
.init();

32
app/src/main/java/com/ckkj/water/history/TabHistoryFragment.java
View File

@@ -18,6 +18,7 @@ import com.ckkj.water.history.mvp.HistoryImpl;
import com.ckkj.water.history.mvp.HistoryPresenter;
import com.ckkj.water.network.BaseBean;
import com.ckkj.water.plan.entity.WaterPlanWeekEntity;
import com.ckkj.water.utils.manager.ThemeManager;
import com.ckkj.water.utils.show.ToastUtil;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
@@ -64,6 +65,9 @@ public class TabHistoryFragment extends BaseFragment<TabHistoryFragmentLayoutBin
viewBinding.refresh.setRefreshFooter(new ClassicsFooter(mContext));
viewBinding.refresh.setOnRefreshListener(layout -> {
mCurrentPage = 1;
mFilterStartTime = "";
mFilterEndTime = "";
mFilterType = -1;
viewBinding.refresh.setNoMoreData(false);
getWaterHistoryList();
@@ -72,15 +76,24 @@ public class TabHistoryFragment extends BaseFragment<TabHistoryFragmentLayoutBin
mCurrentPage++;
getWaterHistoryList();
});
viewBinding.imgTimeFilter.setImageResource(
ThemeManager.isAppThemeLight(mContext) ?
R.mipmap.icon_triangle_down : R.mipmap.icon_white_triangle_down);
viewBinding.imgTypeFilter.setImageResource(
ThemeManager.isAppThemeLight(mContext) ?
R.mipmap.icon_triangle_down : R.mipmap.icon_white_triangle_down);
}
private void getWaterHistoryList(){
showLoadingDialog();
mPresenter.getWaterHistoryList(mCurrentPage,mFilterStartTime,mFilterEndTime,mFilterType);
}
private void initListener() {
setClick(viewBinding.linearTimeFilter);
setClick(viewBinding.linearTypeFilter);
setClick(viewBinding.includedNoresult.btnRefresh);
mAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
@Override
public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
@@ -126,8 +139,10 @@ public class TabHistoryFragment extends BaseFragment<TabHistoryFragmentLayoutBin
}
@Override
public void onDismiss(BasePopupView popupView) {
viewBinding.tvTimeFilter.setTextColor(mContext.getColor(R.color.color_222222));
viewBinding.imgTimeFilter.setImageResource(R.mipmap.icon_triangle_down);
viewBinding.tvTimeFilter.setTextColor(mContext.getColor(R.color.textPrimaryColor));
viewBinding.imgTimeFilter.setImageResource(
ThemeManager.isAppThemeLight(mContext) ?
R.mipmap.icon_triangle_down : R.mipmap.icon_white_triangle_down);
}
})
.asCustom(new CustomTimeFilterPopupView(getContext(), new CustomTimeFilterPopupView.OnClickListener() {
@@ -156,8 +171,10 @@ public class TabHistoryFragment extends BaseFragment<TabHistoryFragmentLayoutBin
}
@Override
public void onDismiss(BasePopupView popupView) {
viewBinding.tvTypeFilter.setTextColor(mContext.getColor(R.color.color_222222));
viewBinding.imgTypeFilter.setImageResource(R.mipmap.icon_triangle_down);
viewBinding.tvTypeFilter.setTextColor(mContext.getColor(R.color.textPrimaryColor));
viewBinding.imgTypeFilter.setImageResource(
ThemeManager.isAppThemeLight(mContext) ?
R.mipmap.icon_triangle_down : R.mipmap.icon_white_triangle_down);
}
})
.asCustom(new CustomTypeFilterPopupView(getContext(), new CustomTypeFilterPopupView.OnClickListener() {
@@ -173,7 +190,14 @@ public class TabHistoryFragment extends BaseFragment<TabHistoryFragmentLayoutBin
}
}));
typePopupView.show();
break;
case R.id.btn_refresh:
mCurrentPage = 1;
mFilterStartTime = "";
mFilterEndTime = "";
mFilterType = -1;
getWaterHistoryList();
break;
}
}

6
app/src/main/java/com/ckkj/water/index/IndexFragment.java
View File

@@ -88,6 +88,7 @@ public class IndexFragment extends BaseFragment<IndexFragmentLayoutBinding, Inde
private void initListener() {
setClick(viewBinding.imgScan);
setClick(viewBinding.imgAdd);
setClick(viewBinding.includedNoresult.btnRefresh);
}
private void setClick(View view) {
@@ -117,6 +118,11 @@ public class IndexFragment extends BaseFragment<IndexFragmentLayoutBinding, Inde
goTo(mContext, AddDeviceActivity_copy.class,null);
}
break;
case R.id.btn_refresh:
mCurrentPage = 1;
mPresenter.getDevicesList(mCurrentPage);
break;
}
}

5
app/src/main/java/com/ckkj/water/login/ForgetPasswordActivity.java
View File

@@ -13,6 +13,7 @@ import com.ckkj.water.login.mvp.LoginContract;
import com.ckkj.water.login.mvp.LoginImpl;
import com.ckkj.water.login.mvp.LoginPresenter;
import com.ckkj.water.network.BaseBean;
import com.ckkj.water.utils.manager.ThemeManager;
import com.ckkj.water.utils.number.PhoneNumberUtils;
import com.ckkj.water.utils.show.ToastUtil;
import com.gyf.immersionbar.ImmersionBar;
@@ -36,8 +37,8 @@ public class ForgetPasswordActivity extends BaseActivity<RegisterLayoutBinding,
public void initData(Bundle savedInstanceState) {
super.initData(savedInstanceState);
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.reset_psd_title);

5
app/src/main/java/com/ckkj/water/login/RegisterActivity.java
View File

@@ -13,6 +13,7 @@ import com.ckkj.water.login.mvp.LoginContract;
import com.ckkj.water.login.mvp.LoginImpl;
import com.ckkj.water.login.mvp.LoginPresenter;
import com.ckkj.water.network.BaseBean;
import com.ckkj.water.utils.manager.ThemeManager;
import com.ckkj.water.utils.number.PhoneNumberUtils;
import com.ckkj.water.utils.show.ToastUtil;
import com.gyf.immersionbar.ImmersionBar;
@@ -35,8 +36,8 @@ public class RegisterActivity extends BaseActivity<RegisterLayoutBinding, LoginP
public void initData(Bundle savedInstanceState) {
super.initData(savedInstanceState);
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.register_title);

5
app/src/main/java/com/ckkj/water/mine/MineInfomationActivity.java
View File

@@ -22,6 +22,7 @@ import com.ckkj.water.network.BaseBean;
import com.ckkj.water.utils.LubanCompressUtil;
import com.ckkj.water.utils.PreviewFileUtil;
import com.ckkj.water.utils.dataUtil.FileUtil;
import com.ckkj.water.utils.manager.ThemeManager;
import com.ckkj.water.utils.manager.WaterUserInfoManager;
import com.ckkj.water.utils.show.ToastUtil;
import com.esafirm.imagepicker.features.ImagePicker;
@@ -62,8 +63,8 @@ public class MineInfomationActivity extends BaseActivity<MineInformationLayoutBi
}
}
ImmersionBar.with(this)
.statusBarColor(R.color.white) // 设置状态栏颜色
.statusBarDarkFont(true) // 设置状态栏字体为黑色
.statusBarDarkFont(ThemeManager.isAppThemeLight(mContext)) // 白色状态栏图标
.navigationBarColor(R.color.mainBackgroundColor)
.titleBar(viewBinding.rlTitle)
.init();
viewBinding.includedTitle.tvTitle.setText(R.string.mine_infomation_title);

7
app/src/main/java/com/ckkj/water/mine/PsdManageActivity.java
View File

@@ -12,6 +12,7 @@ import com.ckkj.water.mine.mvp.MineContract;
import com.ckkj.water.mine.mvp.MineImpl;
import com.ckkj.water.mine.mvp.MinePresenter;
import com.ckkj.water.network.BaseBean;
import com.ckkj.water.utils.manager.ThemeManager;
import com.gyf.immersionbar.ImmersionBar;
/**
@@ -27,11 +28,11 @@ public class PsdManageActivity extends BaseActivity<PasswordManLayoutBinding, Mi
super.initData(savedInstanceState);
ImmersionBar.with(this)
.statusBarColor(R.color.white) // 设置状态栏颜色
.statusBarDarkFont(true) // 设置状态栏字体为黑色
.statusBarDarkFont(ThemeManager.isAppThemeLight(mContext)) // 白色状态栏图标
.navigationBarColor(R.color.mainBackgroundColor)
.titleBar(viewBinding.rlTitle)
.init();
viewBinding.includedTitle.tvTitle.setText(R.string.register_title);
viewBinding.includedTitle.tvTitle.setText(R.string.mine_psd_manager);
initListener();
}

5
app/src/main/java/com/ckkj/water/mine/ResetPsdActivity.java
View File

@@ -12,6 +12,7 @@ import com.ckkj.water.mine.mvp.MineContract;
import com.ckkj.water.mine.mvp.MineImpl;
import com.ckkj.water.mine.mvp.MinePresenter;
import com.ckkj.water.network.BaseBean;
import com.ckkj.water.utils.manager.ThemeManager;
import com.ckkj.water.utils.show.ToastUtil;
import com.gyf.immersionbar.ImmersionBar;
@@ -28,8 +29,8 @@ public class ResetPsdActivity extends BaseActivity<ResetPsdLayoutBinding, MinePr
super.initData(savedInstanceState);
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.mine_psd_reset);

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;
}
}

9
app/src/main/res/drawable/tab_selector_bg.xml
View File

@@ -3,7 +3,14 @@
<item android:state_selected="true">
<shape android:shape="rectangle">
<solid android:color="@color/color_zhu" />
<corners android:topLeftRadius="@dimen/dp_4" android:bottomLeftRadius="@dimen/dp_4" />
<corners android:radius="@dimen/dp_4"/>
</shape>
</item>
<item android:state_selected="false">
<shape android:shape="rectangle">
<solid android:color="@color/white" />
<corners android:radius="@dimen/dp_4"/>
</shape>
</item>

6
app/src/main/res/drawable/tab_selector_bg2.xml
View File

@@ -6,4 +6,10 @@
<corners android:topRightRadius="@dimen/dp_4" android:bottomRightRadius="@dimen/dp_4" />
</shape>
</item>
<item android:state_selected="false">
<shape android:shape="rectangle">
<solid android:color="@color/white" />
<corners android:topRightRadius="@dimen/dp_4" android:bottomRightRadius="@dimen/dp_4" />
</shape>
</item>
</selector>

12
app/src/main/res/layout/add_water_plan_layout.xml
View File

@@ -2,7 +2,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="@color/color_gray_theme">
<RelativeLayout
android:id="@+id/rl_title"
android:layout_width="match_parent"
@@ -10,7 +11,7 @@
<include
android:id="@+id/included_title"
layout="@layout/include_activity_back_layout" />
layout="@layout/include_activity_back_gray_layout" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
@@ -24,6 +25,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:layout_margin="@dimen/dp_1"
android:background="@drawable/tab_selector_bg"
android:textSize="14sp"
android:textColor="@drawable/tab_selector_text"
@@ -34,7 +36,8 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:background="@drawable/tab_selector_bg_center"
android:layout_margin="@dimen/dp_1"
android:background="@drawable/tab_selector_bg"
android:textSize="14sp"
android:textColor="@drawable/tab_selector_text"
android:text="@string/water_bound_device"/>
@@ -44,7 +47,8 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:background="@drawable/tab_selector_bg2"
android:layout_margin="@dimen/dp_1"
android:background="@drawable/tab_selector_bg"
android:textSize="14sp"
android:textColor="@drawable/tab_selector_text"
android:text="@string/water_device_bind"/>

1
app/src/main/res/layout/device_control_layout.xml
View File

@@ -195,6 +195,7 @@
android:layout_weight="3"
android:background="@null"
android:textSize="14sp"
android:textColorHint="@color/text_hint_theme_color"
android:hint="@string/device_custom_work_time"/>
<TextView
android:layout_width="wrap_content"

10
app/src/main/res/layout/device_info_layout.xml
View File

@@ -3,7 +3,7 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white">
android:background="@color/mainBackgroundColor">
<RelativeLayout
android:id="@+id/rl_title"
android:layout_width="match_parent"
@@ -22,7 +22,7 @@
android:layout_marginLeft="@dimen/dp_20"
android:layout_centerVertical="true"
android:textSize="16sp"
android:textColor="@color/color_222222"
android:textColor="@color/textPrimaryColor"
android:text="@string/device_info_code"/>
<TextView
android:layout_width="wrap_content"
@@ -44,7 +44,7 @@
android:layout_marginLeft="@dimen/dp_20"
android:layout_centerVertical="true"
android:textSize="16sp"
android:textColor="@color/color_222222"
android:textColor="@color/textPrimaryColor"
android:text="@string/device_info_type"/>
<TextView
android:layout_width="wrap_content"
@@ -66,7 +66,7 @@
android:layout_marginLeft="@dimen/dp_20"
android:layout_centerVertical="true"
android:textSize="16sp"
android:textColor="@color/color_222222"
android:textColor="@color/textPrimaryColor"
android:text="@string/device_info_serial_number"/>
<TextView
android:layout_width="wrap_content"
@@ -88,7 +88,7 @@
android:layout_marginLeft="@dimen/dp_20"
android:layout_centerVertical="true"
android:textSize="16sp"
android:textColor="@color/color_222222"
android:textColor="@color/textPrimaryColor"
android:text="@string/device_info_firmware_version"/>
<TextView
android:id="@+id/tv_device_name"

4
app/src/main/res/layout/device_reset_wifi.xml
View File

@@ -4,7 +4,7 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/mainBackgroundColor">
android:background="@color/color_gray_theme">
<RelativeLayout
android:id="@+id/rl_title"
android:layout_width="match_parent"
@@ -12,7 +12,7 @@
<include
android:id="@+id/included_title"
layout="@layout/include_activity_back_whitebg_layout" />
layout="@layout/include_activity_back_gray_layout" />
</RelativeLayout>
<TextView

14
app/src/main/res/layout/device_settings_layout.xml
View File

@@ -3,7 +3,7 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_F9F9F9">
android:background="@color/mainBackgroundColor">
<RelativeLayout
android:id="@+id/rl_title"
android:layout_width="match_parent"
@@ -19,7 +19,7 @@
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_20"
android:textSize="14sp"
android:textColor="@color/color_222222"
android:textColor="@color/textPrimaryColor"
android:text="@string/device_setting_info"
android:textStyle="bold"/>
<LinearLayout
@@ -37,7 +37,7 @@
android:layout_marginLeft="@dimen/dp_20"
android:layout_centerVertical="true"
android:textSize="16sp"
android:textColor="@color/color_222222"
android:textColor="@color/textPrimaryColor"
android:text="@string/device_setting_name"/>
<ImageView
android:id="@+id/img_point1"
@@ -55,7 +55,7 @@
android:layout_toLeftOf="@+id/img_point1"
android:layout_marginRight="@dimen/dp_20"
android:textSize="14sp"
android:textColor="@color/color_999999"
android:textColor="@color/textPrimaryColor"
android:text="设备名称"/>
</RelativeLayout>
@@ -69,7 +69,7 @@
android:layout_marginLeft="@dimen/dp_20"
android:layout_centerVertical="true"
android:textSize="16sp"
android:textColor="@color/color_222222"
android:textColor="@color/textPrimaryColor"
android:text="@string/device_setting_info"/>
<ImageView
android:id="@+id/img_point2"
@@ -91,7 +91,7 @@
android:layout_marginLeft="@dimen/dp_20"
android:layout_centerVertical="true"
android:textSize="16sp"
android:textColor="@color/color_222222"
android:textColor="@color/textPrimaryColor"
android:text="@string/device_setting_wifi_manager"/>
<ImageView
android:id="@+id/img_point3"
@@ -123,7 +123,7 @@
android:layout_marginLeft="@dimen/dp_20"
android:layout_centerVertical="true"
android:textSize="16sp"
android:textColor="@color/color_222222"
android:textColor="@color/textPrimaryColor"
android:text="@string/device_setting_unbind"/>
<ImageView
android:id="@+id/img_point4"

8
app/src/main/res/layout/history_filter_time_dialog.xml
View File

@@ -28,7 +28,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_10"
android:text="@string/history_filter_time_title"
android:textColor="@color/color_666666"
android:textColor="@color/textPrimaryColor"
android:textSize="12sp" />
<LinearLayout
android:layout_width="match_parent"
@@ -51,7 +51,8 @@
android:layout_weight="2"
android:layout_marginStart="@dimen/dp_10"
android:hint="@string/history_filter_start_time_tip"
android:textColor="@color/color_666666"
android:textColor="@color/textPrimaryColor"
android:textColorHint="@color/textPrimaryColor"
android:textSize="12sp" />
<TextView
@@ -70,7 +71,8 @@
android:layout_marginEnd="@dimen/dp_10"
android:gravity="right"
android:hint="@string/history_filter_end_time_tip"
android:textColor="@color/color_666666"
android:textColor="@color/textPrimaryColor"
android:textColorHint="@color/textPrimaryColor"
android:textSize="12sp" />
</LinearLayout>

7
app/src/main/res/layout/history_fragment_layout.xml
View File

@@ -17,13 +17,15 @@
android:layout_width="match_parent"
android:layout_height="@dimen/dp_40"
android:orientation="horizontal"
android:layout_marginHorizontal="@dimen/dp_20">
android:layout_marginHorizontal="@dimen/dp_20"
android:background="@drawable/shape_add_water_tab_bg">
<TextView
android:id="@+id/tv_history"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:layout_margin="@dimen/dp_1"
android:background="@drawable/tab_selector_bg"
android:textSize="14sp"
android:textColor="@drawable/tab_selector_text"
@@ -34,7 +36,8 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:background="@drawable/tab_selector_bg2"
android:layout_margin="@dimen/dp_1"
android:background="@drawable/tab_selector_bg"
android:textSize="14sp"
android:textColor="@drawable/tab_selector_text"
android:text="@string/plan_tab_tally"/>

62
app/src/main/res/layout/include_activity_back_gray_layout.xml Normal file
View File

@@ -0,0 +1,62 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<RelativeLayout
android:id="@+id/relative_title"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_48"
android:background="@color/color_gray_theme">
<ImageView
android:id="@+id/img_back"
android:layout_width="22dp"
android:layout_height="match_parent"
android:layout_centerVertical="true"
android:src="@mipmap/img_back_black"
android:layout_marginLeft="@dimen/dp_10"/>
<TextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="18sp"
android:textColor="@color/textPrimaryColor"
android:textStyle="bold"
android:text="标题名称"
android:layout_marginLeft="@dimen/dp_10"
android:layout_centerVertical="true"
android:layout_centerHorizontal="true"/>
<TextView
android:id="@+id/tv_title_info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toRightOf="@+id/tv_title"
android:textSize="@dimen/sp_14"
android:textColor="@color/color_2E2E2E"
android:text="(剩余时间)"
android:layout_marginLeft="@dimen/dp_5"
android:visibility="gone"/>
<TextView
android:id="@+id/tv_title_right"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:layout_alignParentRight="true"
android:layout_marginRight="@dimen/dp_10"
android:textSize="14sp"
android:textColor="@color/color_333333"
android:text=""
android:layout_marginLeft="@dimen/dp_5"
android:visibility="visible"/>
<ImageView
android:id="@+id/img_setting"
android:layout_width="@dimen/dp_20"
android:layout_height="@dimen/dp_20"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:src="@mipmap/icon_mine_settings"
android:layout_marginRight="@dimen/dp_20"
android:visibility="gone"/>
</RelativeLayout>
</RelativeLayout>

15
app/src/main/res/layout/include_no_result_layout.xml
View File

@@ -14,6 +14,7 @@
android:layout_centerVertical="true"
android:layout_centerHorizontal="true"/>
<TextView
android:id="@+id/tv_noresult"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14sp"
@@ -21,5 +22,19 @@
android:text="暂无结果"
android:layout_below="@+id/img_noresult"
android:layout_centerHorizontal="true"/>
<TextView
android:id="@+id/btn_refresh"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingVertical="@dimen/dp_5"
android:paddingHorizontal="@dimen/dp_10"
android:layout_centerHorizontal="true"
android:background="@drawable/shape_green_button_bg"
android:layout_below="@+id/tv_noresult"
android:layout_marginTop="@dimen/dp_10"
android:gravity="center"
android:text="@string/btn_manual_refresh"
android:textColor="@color/color_white"
android:textSize="16sp" />
</RelativeLayout>
</RelativeLayout>

8
app/src/main/res/layout/include_plan_time_item_layout.xml
View File

@@ -28,7 +28,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_4"
android:textSize="14sp"
android:textColor="@color/color_222222"
android:textColor="@color/textPrimaryColor"
android:text="@string/plan_start_time"
android:layout_marginVertical="@dimen/dp_13"/>
@@ -39,7 +39,7 @@
android:layout_weight="9"
android:gravity="center_vertical"
android:textSize="14sp"
android:textColor="@color/color_222222"
android:textColor="@color/textPrimaryColor"
android:layout_marginLeft="@dimen/dp_10"
android:hint="@string/select_water_time"/>
@@ -70,7 +70,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_4"
android:textSize="14sp"
android:textColor="@color/color_222222"
android:textColor="@color/textPrimaryColor"
android:text="@string/plan_time"
android:layout_marginVertical="@dimen/dp_13"/>
@@ -81,7 +81,7 @@
android:layout_weight="9"
android:gravity="center_vertical"
android:textSize="14sp"
android:textColor="@color/color_222222"
android:textColor="@color/textPrimaryColor"
android:layout_marginLeft="@dimen/dp_10"
android:hint="@string/input_water_plan_time"/>
<TextView

4
app/src/main/res/layout/index_device_list_item.xml
View File

@@ -42,7 +42,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_4"
android:text="YA226641000107"
android:textColor="@color/color_666666"
android:textColor="@color/color_subtitle"
android:textSize="12sp" />
<!-- 电量信息 -->
@@ -65,7 +65,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_4"
android:text="100%"
android:textColor="@color/color_666666"
android:textColor="@color/color_subtitle"
android:textSize="12sp" />
</LinearLayout>
</LinearLayout>

4
app/src/main/res/layout/mine_information_layout.xml
View File

@@ -64,7 +64,7 @@
android:layout_marginLeft="@dimen/dp_20"
android:layout_centerVertical="true"
android:textSize="16sp"
android:textColor="@color/color_222222"
android:textColor="@color/textPrimaryColor"
android:text="@string/mine_nickname"/>
<ImageView
android:id="@+id/img_point1"
@@ -96,7 +96,7 @@
android:layout_marginLeft="@dimen/dp_20"
android:layout_centerVertical="true"
android:textSize="16sp"
android:textColor="@color/color_222222"
android:textColor="@color/textPrimaryColor"
android:text="@string/mine_bind_phone"/>
<ImageView
android:id="@+id/img_point2"

6
app/src/main/res/layout/password_man_layout.xml
View File

@@ -3,7 +3,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/white">
android:background="@color/mainBackgroundColor">
<RelativeLayout
android:id="@+id/rl_title"
android:layout_width="match_parent"
@@ -24,7 +24,7 @@
android:layout_marginLeft="@dimen/dp_20"
android:layout_centerVertical="true"
android:textSize="16sp"
android:textColor="@color/color_222222"
android:textColor="@color/textPrimaryColor"
android:text="@string/mine_psd_reset"/>
<ImageView
android:layout_width="@dimen/dp_7"
@@ -45,7 +45,7 @@
android:layout_marginLeft="@dimen/dp_20"
android:layout_centerVertical="true"
android:textSize="16sp"
android:textColor="@color/color_222222"
android:textColor="@color/textPrimaryColor"
android:text="@string/mine_find_psd"/>
<ImageView
android:layout_width="@dimen/dp_7"

2
app/src/main/res/layout/plan_bind_device_item.xml
View File

@@ -30,7 +30,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="智能浇水设备A1"
android:textColor="@color/color_333333"
android:textColor="@color/textPrimaryColor"
android:textSize="17sp"
android:textStyle="bold" />

2
app/src/main/res/layout/plan_bound_device_item.xml
View File

@@ -30,7 +30,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="智能浇水设备A1"
android:textColor="@color/color_333333"
android:textColor="@color/textPrimaryColor"
android:textSize="17sp"
android:textStyle="bold" />

2
app/src/main/res/layout/plan_period_item.xml
View File

@@ -19,7 +19,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="12sp"
android:textColor="@color/color_222222"
android:textColor="@color/textPrimaryColor"
android:text="周一"/>
<View

3
app/src/main/res/layout/public_dialog_input_text.xml
View File

@@ -50,7 +50,8 @@
android:background="@drawable/shape_line_gray_bg"
android:layout_marginTop="@dimen/dp_10"
android:textSize="16sp"
android:textColor="@color/color_333333"
android:textColor="@color/textPrimaryColor"
android:textColorHint="@color/color_subtitle"
android:hint="请输入激活码"/>
<TextView

18
app/src/main/res/layout/register_layout.xml
View File

@@ -3,7 +3,7 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_F9F9F9">
android:background="@color/color_gray_theme">
<RelativeLayout
android:id="@+id/rl_title"
android:layout_width="match_parent"
@@ -11,7 +11,7 @@
<include
android:id="@+id/included_title"
layout="@layout/include_activity_back_layout" />
layout="@layout/include_activity_back_gray_layout" />
</RelativeLayout>
<TextView
android:id="@+id/tv_register_resetpsd"
@@ -20,7 +20,7 @@
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_10"
android:textSize="20sp"
android:textColor="@color/color_222222"
android:textColor="@color/textPrimaryColor"
android:text="@string/register_title"
android:textStyle="bold"/>
@@ -44,7 +44,8 @@
android:layout_marginLeft="@dimen/dp_5"
android:background="@null"
android:textSize="14sp"
android:textColor="@color/color_222222"
android:textColor="@color/text_hint_theme_color"
android:textColorHint="@color/text_hint_theme_color"
android:hint="@string/hint_input_account"/>
</LinearLayout>
@@ -70,7 +71,8 @@
android:layout_marginLeft="@dimen/dp_5"
android:background="@null"
android:textSize="14sp"
android:textColor="@color/color_222222"
android:textColor="@color/text_hint_theme_color"
android:textColorHint="@color/text_hint_theme_color"
android:hint="@string/hint_input_verifi"/>
<TextView
android:id="@+id/tv_get_verifi_code"
@@ -106,7 +108,8 @@
android:layout_marginLeft="@dimen/dp_5"
android:background="@null"
android:textSize="14sp"
android:textColor="@color/color_222222"
android:textColor="@color/text_hint_theme_color"
android:textColorHint="@color/text_hint_theme_color"
android:hint="@string/hint_input_psd"/>
</LinearLayout>
@@ -131,7 +134,8 @@
android:layout_marginLeft="@dimen/dp_5"
android:background="@null"
android:textSize="14sp"
android:textColor="@color/color_222222"
android:textColor="@color/text_hint_theme_color"
android:textColorHint="@color/text_hint_theme_color"
android:hint="@string/hint_input_psd_agin"/>
</LinearLayout>

13
app/src/main/res/layout/reset_psd_layout.xml
View File

@@ -3,7 +3,7 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_F9F9F9">
android:background="@color/color_gray_theme">
<RelativeLayout
android:id="@+id/rl_title"
android:layout_width="match_parent"
@@ -11,7 +11,7 @@
<include
android:id="@+id/included_title"
layout="@layout/include_activity_back_layout" />
layout="@layout/include_activity_back_gray_layout" />
</RelativeLayout>
<LinearLayout
@@ -34,7 +34,8 @@
android:layout_marginLeft="@dimen/dp_5"
android:background="@null"
android:textSize="14sp"
android:textColor="@color/color_222222"
android:textColor="@color/text_hint_theme_color"
android:textColorHint="@color/text_hint_theme_color"
android:hint="@string/hint_input_old_psd"/>
</LinearLayout>
@@ -58,7 +59,8 @@
android:layout_marginLeft="@dimen/dp_5"
android:background="@null"
android:textSize="14sp"
android:textColor="@color/color_222222"
android:textColor="@color/text_hint_theme_color"
android:textColorHint="@color/text_hint_theme_color"
android:hint="@string/hint_input_new_psd"/>
</LinearLayout>
@@ -83,7 +85,8 @@
android:layout_marginLeft="@dimen/dp_5"
android:background="@null"
android:textSize="14sp"
android:textColor="@color/color_222222"
android:textColor="@color/text_hint_theme_color"
android:textColorHint="@color/text_hint_theme_color"
android:hint="@string/hint_input_new_psd_agin"/>
</LinearLayout>

2
app/src/main/res/layout/single_recycleview_item.xml
View File

@@ -12,7 +12,7 @@
android:layout_weight="2"
android:textSize="14sp"
android:textStyle="bold"
android:textColor="@color/color_222222"
android:textColor="@color/textPrimaryColor"
android:text="周一"/>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_plan_detail_times"

8
app/src/main/res/layout/water_config_fragment_layout_copy.xml
View File

@@ -28,7 +28,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_4"
android:textSize="14sp"
android:textColor="@color/color_222222"
android:textColor="@color/textPrimaryColor"
android:text="@string/plan_name_text"
android:layout_marginVertical="@dimen/dp_13"/>
@@ -38,7 +38,7 @@
android:layout_height="match_parent"
android:gravity="center_vertical"
android:textSize="14sp"
android:textColor="@color/color_222222"
android:textColor="@color/textPrimaryColor"
android:background="@null"
android:layout_marginLeft="@dimen/dp_10"
android:hint="@string/input_plan_name"/>
@@ -66,7 +66,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_4"
android:textSize="14sp"
android:textColor="@color/color_222222"
android:textColor="@color/textPrimaryColor"
android:text="@string/plan_period"
android:layout_marginVertical="@dimen/dp_13"/>
</LinearLayout>
@@ -94,7 +94,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_4"
android:textSize="14sp"
android:textColor="@color/color_222222"
android:textColor="@color/textPrimaryColor"
android:text="@string/device_control_start"
android:layout_marginVertical="@dimen/dp_13"/>
<View

14
app/src/main/res/layout/water_plan_detail_layout.xml
View File

@@ -12,12 +12,12 @@
<include
android:id="@+id/included_title"
layout="@layout/include_activity_back_layout" />
layout="@layout/include_activity_back_whitebg_layout" />
</RelativeLayout>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/color_white"
android:background="@color/mainBackgroundColor"
android:fillViewport="true"
android:overScrollMode="never">
<LinearLayout
@@ -39,7 +39,7 @@
android:layout_width="82dp"
android:layout_height="wrap_content"
android:text="@string/plan_name_text"
android:textColor="@color/color_222222"
android:textColor="@color/textPrimaryColor"
android:textSize="16sp" />
<TextView
@@ -49,7 +49,7 @@
android:layout_marginStart="@dimen/dp_10"
android:layout_weight="1"
android:text="名称名称"
android:textColor="@color/color_666666"
android:textColor="@color/textPrimaryColor"
android:textSize="16sp" />
</LinearLayout>
@@ -69,7 +69,7 @@
android:layout_width="82dp"
android:layout_height="wrap_content"
android:text="@string/plan_period"
android:textColor="@color/color_222222"
android:textColor="@color/textPrimaryColor"
android:textSize="16sp" />
<androidx.recyclerview.widget.RecyclerView
@@ -94,7 +94,7 @@
android:layout_width="82dp"
android:layout_height="wrap_content"
android:text="@string/water_bound_device"
android:textColor="@color/color_222222"
android:textColor="@color/textPrimaryColor"
android:textSize="16sp" />
<LinearLayout
@@ -141,7 +141,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="@string/device_status"
android:textColor="@color/color_222222"
android:textColor="@color/textPrimaryColor"
android:textSize="16sp" />
<com.kyleduo.switchbutton.SwitchButton

3
app/src/main/res/layout/water_plan_fragment.xml
View File

@@ -41,7 +41,8 @@
android:layout_toRightOf="@+id/img_search"
android:layout_marginLeft="@dimen/dp_8"
android:textSize="14sp"
android:hint="@string/input_plan_name"/>
android:hint="@string/input_plan_name"
android:textColorHint="@color/color_subtitle"/>
</RelativeLayout>
<TextView
android:id="@+id/tv_add"

BIN
app/src/main/res/mipmap-xhdpi/icon_white_triangle_down.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 312 B

BIN
app/src/main/res/mipmap-xhdpi/icon_white_triangle_up.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 306 B

BIN
app/src/main/res/mipmap-xxhdpi/icon_white_triangle_down.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 490 B

BIN
app/src/main/res/mipmap-xxhdpi/icon_white_triangle_up.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 486 B

BIN
app/src/main/res/mipmap-xxxhdpi/icon_white_triangle_down.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 507 B

BIN
app/src/main/res/mipmap-xxxhdpi/icon_white_triangle_up.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 510 B

3
app/src/main/res/values-night/colors.xml
View File

@@ -4,5 +4,8 @@
<color name="colorPrimaryDark">#000063</color>
<color name="colorAccent">#FF80AB</color>
<color name="mainBackgroundColor">#303030</color>
<color name="color_gray_theme">#303030</color>
<color name="textPrimaryColor">#E0E0E0</color>
<color name="color_subtitle">#E0E0E0</color>
<color name="text_hint_theme_color">#303030</color>
</resources>

13
app/src/main/res/values/colors.xml
View File

@@ -5,6 +5,11 @@
<color name="colorAccent">#FF4081</color>
<color name="mainBackgroundColor">#FFFFFF</color>
<color name="textPrimaryColor">#222222</color>
<color name="text_hint_theme_color">#838080</color>
<color name="color_subtitle">#666666</color>
<color name="color_gray_theme">#F9F9F9</color>
<color name="transparent">#00000000</color>
<color name="color_white">#FFFFFF</color>
@@ -48,7 +53,13 @@
<color name="color_676767">#676767</color>
<color name="color_c5d7e1">#C5D7E1</color>
<color name="color_EFEFEF">#EFEFEF</color>
<!-- 主题适配 -->
<color name="color_666666">#666666</color>
<color name="color_F9F9F9">#F9F9F9</color>
<color name="color_DDE6F5">#DDE6F5</color>
<color name="color_2E9CF3">#2E9CF3</color>
<color name="color_F7F9FA">#F7F9FA</color>
@@ -105,7 +116,7 @@
<color name="color_F0F8F1">#F0F8F1</color>
<color name="color_FFFCEB">#FFFCEB</color>
<color name="color_1D90FF">#1D90FF</color>
<color name="color_F9F9F9">#F9F9F9</color>
<color name="color_8000CA9D">#8000CA9D</color>

1
app/src/main/res/values/strings.xml
View File

@@ -114,6 +114,7 @@
<string name="button_delete">删除</string>
<string name="button_edit">编辑</string>
<string name="plan_detail_title">排程详情</string>
<string name="btn_manual_refresh">手动刷新</string>
<!--历史-->