app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -213,36 +213,7 @@ }); } /** * 电站状态概览(安装商) */ public void getStatusOverview(CloudCallBeak<StatusOverviewBean> cloudCallBeak) { String requestUrl = HttpApi.POST_statusOverview; JsonObject json = new JsonObject(); // json.addProperty("zoneType", zoneType);//区域 HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() { @Override public void onSuccess(String jsonStr) { if (TextUtils.isEmpty(jsonStr)) { if (cloudCallBeak != null) { cloudCallBeak.onSuccess(new StatusOverviewBean()); } } Gson gson = new Gson(); StatusOverviewBean statusOverviewBean = gson.fromJson(jsonStr, StatusOverviewBean.class); if (cloudCallBeak != null) { cloudCallBeak.onSuccess(statusOverviewBean); } } @Override public void onFailure(HDLException e) { if (cloudCallBeak != null) { cloudCallBeak.onFailure(e); } } }); } /** * 添加【设备列表】到本地缓存 app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
@@ -21,6 +21,7 @@ import com.hdl.photovoltaic.ui.bean.HouseInfoBean; import com.hdl.photovoltaic.ui.bean.HouseIdBean; import com.hdl.photovoltaic.ui.bean.MessageBean; import com.hdl.photovoltaic.ui.bean.StatusOverviewBean; import com.hdl.sdk.link.common.exception.HDLLinkException; import com.hdl.sdk.link.core.bean.gateway.GatewayBean; import com.hdl.sdk.link.core.callback.GatewayCallBack; @@ -579,6 +580,36 @@ }); } /** * 电站状态概览(安装商) */ public void getStatusOverview(CloudCallBeak<StatusOverviewBean> cloudCallBeak) { String requestUrl = HttpApi.POST_statusOverview; JsonObject json = new JsonObject(); // json.addProperty("zoneType", zoneType);//区域 HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() { @Override public void onSuccess(String jsonStr) { if (TextUtils.isEmpty(jsonStr)) { if (cloudCallBeak != null) { cloudCallBeak.onSuccess(new StatusOverviewBean()); } } Gson gson = new Gson(); StatusOverviewBean statusOverviewBean = gson.fromJson(jsonStr, StatusOverviewBean.class); if (cloudCallBeak != null) { cloudCallBeak.onSuccess(statusOverviewBean); } } @Override public void onFailure(HDLException e) { if (cloudCallBeak != null) { cloudCallBeak.onFailure(e); } } }); } /** * 添加住宅(电站)到云端 app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
@@ -365,7 +365,7 @@ if (this.currentFragmentIndex == 0) { //首页界面 viewBinding.myPowerStationBottomIl0.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.home_page_selected)); viewBinding.myPowerStationBottomIl0.titleTv.setTextColor(getColor(R.color.text_90000000)); viewBinding.myPowerStationBottomIl0.titleTv.setTextColor(getColor(R.color.text_E6000000)); 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_unselected)); @@ -377,7 +377,7 @@ viewBinding.myPowerStationBottomIl0.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.home_page_unselected)); viewBinding.myPowerStationBottomIl0.titleTv.setTextColor(getColor(R.color.text_65000000)); viewBinding.myPowerStationBottomIl1.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.power_station_selected)); viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_90000000)); viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_E6000000)); viewBinding.myMessageBottomIl2.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.message_unselected)); viewBinding.myMessageBottomIl2.titleTv.setTextColor(getColor(R.color.text_65000000)); viewBinding.myMeBottomIl3.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.me_unselected)); @@ -389,7 +389,7 @@ 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_90000000)); viewBinding.myMessageBottomIl2.titleTv.setTextColor(getColor(R.color.text_E6000000)); viewBinding.myMeBottomIl3.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.me_unselected)); viewBinding.myMeBottomIl3.titleTv.setTextColor(getColor(R.color.text_65000000)); } else if (this.currentFragmentIndex == 3) { @@ -401,7 +401,7 @@ viewBinding.myMessageBottomIl2.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.message_unselected)); viewBinding.myMessageBottomIl2.titleTv.setTextColor(getColor(R.color.text_65000000)); viewBinding.myMeBottomIl3.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.me_selected)); viewBinding.myMeBottomIl3.titleTv.setTextColor(getColor(R.color.text_90000000)); viewBinding.myMeBottomIl3.titleTv.setTextColor(getColor(R.color.text_E6000000)); } }
@@ -335,12 +335,12 @@ //手机号 viewBinding.changePhoneIc.accountTitleTv.setText(R.string.home_login_phone); viewBinding.changePhoneIc.accountTitleTv.setTextSize(20); viewBinding.changePhoneIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_90000000)); viewBinding.changePhoneIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_E6000000)); viewBinding.changePhoneIc.lineV.setVisibility(View.VISIBLE); viewBinding.changeMailRl.accountTitleTv.setText(R.string.home_login_email); viewBinding.changeMailRl.accountTitleTv.setTextSize(16); viewBinding.changeMailRl.accountTitleTv.setTextColor(getResources().getColor(R.color.text_40000000)); viewBinding.changeMailRl.accountTitleTv.setTextColor(getResources().getColor(R.color.text_66000000)); viewBinding.changeMailRl.lineV.setVisibility(View.GONE); //输入手机号 @@ -365,12 +365,12 @@ //邮箱 viewBinding.changePhoneIc.accountTitleTv.setText(R.string.home_login_phone); viewBinding.changePhoneIc.accountTitleTv.setTextSize(16); viewBinding.changePhoneIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_40000000)); viewBinding.changePhoneIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_66000000)); viewBinding.changePhoneIc.lineV.setVisibility(View.GONE); viewBinding.changeMailRl.accountTitleTv.setText(R.string.home_login_email); viewBinding.changeMailRl.accountTitleTv.setTextSize(20); viewBinding.changeMailRl.accountTitleTv.setTextColor(getResources().getColor(R.color.text_90000000)); viewBinding.changeMailRl.accountTitleTv.setTextColor(getResources().getColor(R.color.text_E6000000)); viewBinding.changeMailRl.lineV.setVisibility(View.VISIBLE); //输入邮箱 viewBinding.changeAccountEt.setInputType(InputType.TYPE_CLASS_TEXT); app/src/main/java/com/hdl/photovoltaic/ui/account/RegisterAccountActivity.java
@@ -27,7 +27,6 @@ import com.hdl.photovoltaic.other.HdlLogLogic; import com.hdl.photovoltaic.other.HdlThreadLogic; import com.hdl.photovoltaic.utils.KeyboardStateObserverUtils; import com.hdl.photovoltaic.utils.LocalManageUtil; import com.hdl.photovoltaic.widget.ConfirmationCancelDialog; import com.hdl.photovoltaic.widget.ConfirmationTipDialog; import com.hdl.photovoltaic.widget.ListStaticDialog; @@ -422,12 +421,12 @@ //手机号 viewBinding.registerPhoneTitleIc.accountTitleTv.setText(R.string.home_login_phone); viewBinding.registerPhoneTitleIc.accountTitleTv.setTextSize(20); viewBinding.registerPhoneTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_90000000, null)); viewBinding.registerPhoneTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_E6000000, null)); viewBinding.registerPhoneTitleIc.lineV.setVisibility(View.VISIBLE); viewBinding.registerMailTitleIc.accountTitleTv.setText(R.string.home_login_email); viewBinding.registerMailTitleIc.accountTitleTv.setTextSize(16); viewBinding.registerMailTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_40000000, null)); viewBinding.registerMailTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_66000000, null)); viewBinding.registerMailTitleIc.lineV.setVisibility(View.GONE); //显示区号 viewBinding.registerRegionAccountRl.setVisibility(View.VISIBLE); @@ -453,12 +452,12 @@ //邮箱 viewBinding.registerPhoneTitleIc.accountTitleTv.setText(R.string.home_login_phone); viewBinding.registerPhoneTitleIc.accountTitleTv.setTextSize(16); viewBinding.registerPhoneTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_40000000, null)); viewBinding.registerPhoneTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_66000000, null)); viewBinding.registerPhoneTitleIc.lineV.setVisibility(View.GONE); viewBinding.registerMailTitleIc.accountTitleTv.setText(R.string.home_login_email); viewBinding.registerMailTitleIc.accountTitleTv.setTextSize(20); viewBinding.registerMailTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_90000000, null)); viewBinding.registerMailTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_E6000000, null)); viewBinding.registerMailTitleIc.lineV.setVisibility(View.VISIBLE); //隐藏区号 app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java
@@ -75,7 +75,7 @@ holder.powerTv.setText(power); holder.item_parent_rl.setTag(position); setTextViewStyle(holder.stateTv, houseIdBean.getPowerStationStatus()); GlideUtils.getRoundedCornersImage(mContext, houseIdBean.getPowerStationImage(), holder.homeIconIv, new RoundedCorners(6), false); GlideUtils.getRoundedCornersImage(mContext, houseIdBean.getPowerStationImage(), holder.homeIconIv, new RoundedCorners(12), false); HdlLogLogic.print("---电站名称:" + houseIdBean.getHomeName() + "---图片url:" + houseIdBean.getPowerStationImage(), false); holder.item_parent_rl.setOnClickListener(new View.OnClickListener() { app/src/main/java/com/hdl/photovoltaic/ui/adapter/LanguageAdapter.java
@@ -13,9 +13,7 @@ import com.hdl.photovoltaic.R; import com.hdl.photovoltaic.config.UserConfigManage; import com.hdl.photovoltaic.other.HdlDeviceLogic; import com.hdl.photovoltaic.other.HdlLogLogic; import com.hdl.photovoltaic.other.HdlOtaLogic; import java.util.List; @@ -45,7 +43,7 @@ try { ItemData itemData = this.mList.get(position); holder.item_lift_name_tv.setText(itemData.getTitle()); holder.item_lift_name_tv.setTextColor(mContext.getColor(R.color.text_90000000)); holder.item_lift_name_tv.setTextColor(mContext.getColor(R.color.text_E6000000)); holder.item_right_icon_iv.setBackground(null); if (itemData.isState()) { holder.item_lift_name_tv.setTextColor(mContext.getColor(R.color.text_245EC3)); app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java
@@ -122,13 +122,13 @@ viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_38C494)); viewBinding.monthTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000)); viewBinding.monthTv.setTextColor(_mActivity.getColor(R.color.text_40000000)); viewBinding.monthTv.setTextColor(_mActivity.getColor(R.color.text_66000000)); viewBinding.yearTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000)); viewBinding.yearTv.setTextColor(_mActivity.getColor(R.color.text_40000000)); viewBinding.yearTv.setTextColor(_mActivity.getColor(R.color.text_66000000)); viewBinding.lifeCycleTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000)); viewBinding.lifeCycleTv.setTextColor(_mActivity.getColor(R.color.text_40000000)); viewBinding.lifeCycleTv.setTextColor(_mActivity.getColor(R.color.text_66000000)); viewBinding.v1.setVisibility(View.GONE); viewBinding.v2.setVisibility(View.VISIBLE); @@ -151,16 +151,16 @@ } timeType = TimeType.month; viewBinding.dayTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000)); viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_40000000)); viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_66000000)); viewBinding.monthTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.time_selected_38c494)); viewBinding.monthTv.setTextColor(_mActivity.getColor(R.color.text_38C494)); viewBinding.yearTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000)); viewBinding.yearTv.setTextColor(_mActivity.getColor(R.color.text_40000000)); viewBinding.yearTv.setTextColor(_mActivity.getColor(R.color.text_66000000)); viewBinding.lifeCycleTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000)); viewBinding.lifeCycleTv.setTextColor(_mActivity.getColor(R.color.text_40000000)); viewBinding.lifeCycleTv.setTextColor(_mActivity.getColor(R.color.text_66000000)); viewBinding.v1.setVisibility(View.GONE); viewBinding.v2.setVisibility(View.GONE); @@ -183,16 +183,16 @@ } timeType = TimeType.year; viewBinding.dayTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000)); viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_40000000)); viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_66000000)); viewBinding.monthTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000)); viewBinding.monthTv.setTextColor(_mActivity.getColor(R.color.text_40000000)); viewBinding.monthTv.setTextColor(_mActivity.getColor(R.color.text_66000000)); viewBinding.yearTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.time_selected_38c494)); viewBinding.yearTv.setTextColor(_mActivity.getColor(R.color.text_38C494)); viewBinding.lifeCycleTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000)); viewBinding.lifeCycleTv.setTextColor(_mActivity.getColor(R.color.text_40000000)); viewBinding.lifeCycleTv.setTextColor(_mActivity.getColor(R.color.text_66000000)); viewBinding.v1.setVisibility(View.VISIBLE); viewBinding.v2.setVisibility(View.GONE); @@ -213,13 +213,13 @@ } timeType = TimeType.all; viewBinding.dayTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000)); viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_40000000)); viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_66000000)); viewBinding.monthTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000)); viewBinding.monthTv.setTextColor(_mActivity.getColor(R.color.text_40000000)); viewBinding.monthTv.setTextColor(_mActivity.getColor(R.color.text_66000000)); viewBinding.yearTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000)); viewBinding.yearTv.setTextColor(_mActivity.getColor(R.color.text_40000000)); viewBinding.yearTv.setTextColor(_mActivity.getColor(R.color.text_66000000)); viewBinding.lifeCycleTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.time_selected_38c494)); viewBinding.lifeCycleTv.setTextColor(_mActivity.getColor(R.color.text_38C494)); @@ -321,12 +321,12 @@ .setTitleText(_mActivity.getString(R.string.time_selectd))//标题文字 .setOutSideCancelable(true)//点击屏幕，点在控件外部范围时，是否取消显示 .isCyclic(false)//是否循环滚动 .setTitleColor(_mActivity.getColor(R.color.text_90000000))//标题文字颜色 .setTitleColor(_mActivity.getColor(R.color.text_E6000000))//标题文字颜色 .setSubmitColor(_mActivity.getColor(R.color.text_38C494))//确定按钮文字颜色 .setCancelColor(_mActivity.getColor(R.color.text_40000000))//取消按钮文字颜色 .setCancelColor(_mActivity.getColor(R.color.text_66000000))//取消按钮文字颜色 .setTitleBgColor(_mActivity.getColor(R.color.text_FFFFFFFF))//标题背景颜色 Night mode .setBgColor(_mActivity.getColor(R.color.text_FFFFFFFF))//滚轮背景颜色 Night mode .setTextColorCenter(_mActivity.getColor(R.color.text_90000000)).setDate(selectedDate)// 如果不设置的话，默认是系统时间*/ .setTextColorCenter(_mActivity.getColor(R.color.text_E6000000)).setDate(selectedDate)// 如果不设置的话，默认是系统时间*/ .setRangDate(startDate, endDate)//起始终止年月日设定 .setLabel(_mActivity.getString(R.string.year), _mActivity.getString(R.string.month), _mActivity.getString(R.string.day), _mActivity.getString(R.string.hour), _mActivity.getString(R.string.minute), _mActivity.getString(R.string.seconds))//默认设置为年月日时分秒 .isCenterLabel(false) //是否只显示中间选中项的label文字，false则每项item全部都带有label。 @@ -375,11 +375,11 @@ viewBinding.dayTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.time_selected_38c494)); viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_38C494)); viewBinding.monthTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000)); viewBinding.monthTv.setTextColor(_mActivity.getColor(R.color.text_40000000)); viewBinding.monthTv.setTextColor(_mActivity.getColor(R.color.text_66000000)); viewBinding.yearTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000)); viewBinding.yearTv.setTextColor(_mActivity.getColor(R.color.text_40000000)); viewBinding.yearTv.setTextColor(_mActivity.getColor(R.color.text_66000000)); viewBinding.lifeCycleTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000)); viewBinding.lifeCycleTv.setTextColor(_mActivity.getColor(R.color.text_40000000)); viewBinding.lifeCycleTv.setTextColor(_mActivity.getColor(R.color.text_66000000)); viewBinding.v1.setVisibility(View.GONE); viewBinding.v2.setVisibility(View.VISIBLE); viewBinding.v3.setVisibility(View.VISIBLE); app/src/main/java/com/hdl/photovoltaic/ui/newC/adapter/HouseListAdapter.java
@@ -12,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.hdl.photovoltaic.R; import com.hdl.photovoltaic.config.UserConfigManage; import com.hdl.photovoltaic.ui.bean.HouseIdBean; import java.util.ArrayList; @@ -63,13 +62,13 @@ if (!houseIdBean.isMove()) { holder.houseSelectIv.setVisibility(View.VISIBLE); holder.houseSelectIv.setBackground(null); holder.homeNameTv.setTextColor(mContext.getColor(R.color.text_90000000)); holder.homeNameTv.setTextColor(mContext.getColor(R.color.text_E6000000)); if (houseIdBean.isState_select()) { holder.homeNameTv.setTextColor(mContext.getColor(R.color.text_38C494)); holder.houseSelectIv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.select)); } } else { holder.homeNameTv.setTextColor(mContext.getColor(R.color.text_90000000)); holder.homeNameTv.setTextColor(mContext.getColor(R.color.text_E6000000)); holder.houseSelectIv.setVisibility(View.GONE); }
@@ -34,6 +34,7 @@ import com.hdl.photovoltaic.ui.adapter.HouseInfoAdapter; import com.hdl.photovoltaic.ui.bean.DeviceBean; import com.hdl.photovoltaic.ui.bean.HouseIdBean; import com.hdl.photovoltaic.ui.bean.StatusOverviewBean; import com.hdl.photovoltaic.uni.HDLUniMP; import com.hdl.photovoltaic.utils.PermissionUtils; import com.hdl.photovoltaic.widget.DefaultFilteringDialog; @@ -106,6 +107,8 @@ isClickPowerStationLabel = true; viewBinding.powerStationLabel.setTextAppearance(R.style.Text20Style); viewBinding.deviceLabel.setTextAppearance(R.style.Text16Style); viewBinding.editIv.setVisibility(View.VISIBLE);//编辑图标隐藏 viewBinding.addIv.setVisibility(View.VISIBLE);//添加图标隐藏 viewBinding.powerStationLabelParent.setVisibility(View.VISIBLE);//电站标签【父容器】显示 viewBinding.deviceLabelParent.setVisibility(View.GONE);//设备标签【父容器】隐藏 loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true); @@ -422,6 +425,8 @@ this.deviceInfoList.add(new DeviceBean()); // this.deviceInfoList.addAll(HdlDeviceLogic.getInstance().getListDevice()); } } /** @@ -490,10 +495,35 @@ if (eventBus.getType().equals(HomepageTitleTabSwitch.powerstation.toString())) { HdlLogLogic.print("正在点击【电站】"); loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true); getStatusOverview(); } } } /** * 电站状态概览 */ private void getStatusOverview() { HdlResidenceLogic.getInstance().getStatusOverview(new CloudCallBeak<StatusOverviewBean>() { @Override public void onSuccess(StatusOverviewBean statusOverviewBean) { if (statusOverviewBean == null) { return; } viewBinding.screeningConditionNumber1Tv.setText(statusOverviewBean.getTotal()); viewBinding.screeningConditionNumber2Tv.setText(statusOverviewBean.getFault()); viewBinding.screeningConditionNumber3Tv.setText(statusOverviewBean.getOffline()); viewBinding.screeningConditionNumber4Tv.setText(statusOverviewBean.getConnecting()); } @Override public void onFailure(HDLException e) { } }); } /** * 刷新UI（电站） app/src/main/java/com/hdl/photovoltaic/utils/WifiUtils.java
@@ -50,18 +50,17 @@ * * @return 返回ssid名称 */ public String getCurrentConnectWifiSsid() { WifiInfo wifiInfo = this.getCurrentConnectWifiInfo(); return wifiInfo.getSSID().replace("\"", ""); } /** * 获取当前连接的wifi * * @return wifi信息 */ public WifiInfo getCurrentConnectWifiInfo() { return (mWifiManager == null) ? null : mWifiManager.getConnectionInfo(); public MyWifiInfo getCurrentConnectWifiInfo() { if (mWifiManager == null) { return new MyWifiInfo(); } MyWifiInfo myWifiInfo = new MyWifiInfo(); try { WifiInfo wifiInfo = mWifiManager.getConnectionInfo(); myWifiInfo.setSSID(wifiInfo.getSSID().replace("\"", "")); } catch (Exception ignored) { } return myWifiInfo; } /** app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java
@@ -4,8 +4,6 @@ import android.os.Bundle; import android.text.TextUtils; import android.view.View; import android.view.Window; import android.view.WindowManager; import android.widget.TextView; import androidx.annotation.NonNull; @@ -229,28 +227,28 @@ private void setBackgroundColor(TextView textView, TitleType titleType) { if (titleType == TitleType.string_capacity) { viewBinding.text1Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000)); viewBinding.text1Tv.setTextColor(mContext.getColor(R.color.text_90000000)); viewBinding.text1Tv.setTextColor(mContext.getColor(R.color.text_E6000000)); viewBinding.text2Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000)); viewBinding.text2Tv.setTextColor(mContext.getColor(R.color.text_90000000)); viewBinding.text2Tv.setTextColor(mContext.getColor(R.color.text_E6000000)); viewBinding.text3Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000)); viewBinding.text3Tv.setTextColor(mContext.getColor(R.color.text_90000000)); viewBinding.text3Tv.setTextColor(mContext.getColor(R.color.text_E6000000)); viewBinding.text4Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000)); viewBinding.text4Tv.setTextColor(mContext.getColor(R.color.text_90000000)); viewBinding.text4Tv.setTextColor(mContext.getColor(R.color.text_E6000000)); viewBinding.text5Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000)); viewBinding.text5Tv.setTextColor(mContext.getColor(R.color.text_90000000)); viewBinding.text5Tv.setTextColor(mContext.getColor(R.color.text_E6000000)); viewBinding.text6Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000)); viewBinding.text6Tv.setTextColor(mContext.getColor(R.color.text_90000000)); viewBinding.text6Tv.setTextColor(mContext.getColor(R.color.text_E6000000)); viewBinding.text7Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000)); viewBinding.text7Tv.setTextColor(mContext.getColor(R.color.text_90000000)); viewBinding.text7Tv.setTextColor(mContext.getColor(R.color.text_E6000000)); viewBinding.text8Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000)); viewBinding.text8Tv.setTextColor(mContext.getColor(R.color.text_90000000)); viewBinding.text8Tv.setTextColor(mContext.getColor(R.color.text_E6000000)); } else { viewBinding.allTv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000)); viewBinding.allTv.setTextColor(mContext.getColor(R.color.text_90000000)); viewBinding.allTv.setTextColor(mContext.getColor(R.color.text_E6000000)); viewBinding.gridConnectedTv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000)); viewBinding.gridConnectedTv.setTextColor(mContext.getColor(R.color.text_90000000)); viewBinding.gridConnectedTv.setTextColor(mContext.getColor(R.color.text_E6000000)); viewBinding.offNetworkTv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000)); viewBinding.offNetworkTv.setTextColor(mContext.getColor(R.color.text_90000000)); viewBinding.offNetworkTv.setTextColor(mContext.getColor(R.color.text_E6000000)); } if (textView != null) { textView.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.selected_38c494)); app/src/main/res/drawable/search_bj_ff05000000.xml
@@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <shape xmlns:android="http://schemas.android.com/apk/res/android"> <corners android:radius="@dimen/dp_17" /> <solid android:color="#05000000" /> <solid android:color="#0D000000" /> </shape> app/src/main/res/layout/activity_bind_phone.xml
@@ -46,7 +46,7 @@ android:layout_marginEnd="@dimen/dp_150" android:gravity="center_vertical" android:text="@string/home_chinese_mainland" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_16" /> <TextView app/src/main/res/layout/activity_change_password.xml
@@ -24,7 +24,7 @@ android:layout_marginTop="@dimen/dp_42" android:text="@string/home_login_change_password" android:textAlignment="center" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_28" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" app/src/main/res/layout/activity_contact_us.xml
@@ -28,7 +28,7 @@ android:layout_centerVertical="true" android:layout_marginStart="@dimen/dp_16" android:text="@string/wechat_id" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_16" /> @@ -40,7 +40,7 @@ android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/dp_16" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_16" /> </RelativeLayout> @@ -61,7 +61,7 @@ android:layout_centerVertical="true" android:layout_marginStart="@dimen/dp_16" android:text="@string/email_address" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_16" /> <TextView @@ -71,7 +71,7 @@ android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/dp_16" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_16" /> </RelativeLayout> app/src/main/res/layout/activity_device_search.xml
@@ -63,8 +63,8 @@ android:background="@null" android:gravity="start|center_vertical" android:hint="Search the power station" android:textColor="@color/text_90000000" android:textColorHint="@color/text_40000000" android:textColor="@color/text_E6000000" android:textColorHint="@color/text_66000000" android:textSize="@dimen/text_14" /> <ImageView @@ -86,7 +86,7 @@ android:layout_marginEnd="@dimen/dp_21" android:gravity="center" android:text="@string/search" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_16" /> @@ -109,7 +109,7 @@ android:layout_marginTop="@dimen/dp_23" android:layout_marginEnd="@dimen/dp_21" android:text="@string/history_search" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_16" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" app/src/main/res/layout/activity_home_login.xml
@@ -58,7 +58,7 @@ android:layout_height="@dimen/dp_39" android:layout_marginTop="@dimen/dp_40" android:text="@string/home_login_hdl_stored_energy" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_28" android:textStyle="bold" app:layout_constraintStart_toStartOf="@+id/home_login_server_iv" app/src/main/res/layout/activity_house_search.xml
@@ -62,8 +62,8 @@ android:background="@null" android:gravity="start|center_vertical" android:hint="Search the power station" android:textColor="@color/text_90000000" android:textColorHint="@color/text_40000000" android:textColor="@color/text_E6000000" android:textColorHint="@color/text_66000000" android:textSize="@dimen/text_14" /> <ImageView @@ -85,7 +85,7 @@ android:layout_marginEnd="@dimen/dp_21" android:gravity="center" android:text="@string/search" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_16" /> @@ -108,7 +108,7 @@ android:layout_marginTop="@dimen/dp_23" android:layout_marginEnd="@dimen/dp_21" android:text="@string/history_search" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_16" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" app/src/main/res/layout/activity_message_center_list.xml
@@ -39,7 +39,7 @@ android:layout_width="wrap_content" android:layout_height="@dimen/dp_20" android:text="@string/alarm_all_device" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_14" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -69,7 +69,7 @@ android:layout_width="wrap_content" android:layout_height="@dimen/dp_20" android:text="@string/alarm_all_grade" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_14" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -101,7 +101,7 @@ android:layout_height="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_7" android:text="@string/alarm_all_time" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_14" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/all_time_title_iv" app/src/main/res/layout/activity_register_account.xml
@@ -25,7 +25,7 @@ android:layout_marginTop="@dimen/dp_42" android:text="@string/home_login_register" android:textAlignment="center" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_28" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" @@ -77,7 +77,7 @@ android:layout_toEndOf="@+id/region_iv" android:gravity="center_vertical" android:text="HDL China" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_16" /> <ImageView @@ -115,7 +115,7 @@ android:layout_marginEnd="@dimen/dp_150" android:gravity="center_vertical" android:text="@string/home_chinese_mainland" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_16" /> <TextView app/src/main/res/layout/activity_search_messge.xml
@@ -62,8 +62,8 @@ android:background="@null" android:gravity="start|center_vertical" android:hint="Search the power station" android:textColor="@color/text_90000000" android:textColorHint="@color/text_40000000" android:textColor="@color/text_E6000000" android:textColorHint="@color/text_66000000" android:textSize="@dimen/text_14" /> <ImageView @@ -85,7 +85,7 @@ android:layout_marginEnd="@dimen/dp_21" android:gravity="center" android:text="@string/search" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_16" /> @@ -108,7 +108,7 @@ android:layout_marginTop="@dimen/dp_23" android:layout_marginEnd="@dimen/dp_21" android:text="@string/history_search" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_16" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" app/src/main/res/layout/dialog_default_filtering.xml
@@ -23,17 +23,19 @@ <LinearLayout android:id="@+id/cancel_ll" android:layout_width="@dimen/dp_51" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentStart="true" android:layout_marginStart="@dimen/dp_20" android:orientation="horizontal"> <TextView android:layout_width="match_parent" android:layout_width="wrap_content" android:layout_height="match_parent" android:gravity="center_vertical|end" android:gravity="center_vertical" android:text="@string/loading_cancel" android:textColor="@color/text_40000000" android:textColor="@color/text_66000000" android:textSize="@dimen/text_18" /> </LinearLayout> @@ -46,18 +48,19 @@ android:layout_toEndOf="@+id/cancel_ll" android:gravity="center" android:text="@string/filtering" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/dp_18" /> <LinearLayout android:id="@+id/affirm_ll" android:layout_width="@dimen/dp_51" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentEnd="true" android:layout_marginEnd="@dimen/dp_20" android:orientation="horizontal"> <TextView android:layout_width="match_parent" android:layout_width="wrap_content" android:layout_height="match_parent" android:gravity="center_vertical|start" android:text="@string/loading_affirm" @@ -81,7 +84,7 @@ android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_18" android:text="@string/string_capacity" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_16" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/cancel_affirm_cl" /> @@ -102,7 +105,7 @@ android:layout_marginTop="@dimen/dp_18" android:layout_marginEnd="@dimen/dp_20" android:text="@string/reset" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_16" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/cancel_affirm_cl" /> @@ -124,8 +127,8 @@ android:background="@drawable/search_bj_ff05000000" android:gravity="center" android:inputType="number" android:textColor="@color/text_90000000" android:textColorHint="@color/text_40000000" android:textColor="@color/text_E6000000" android:textColorHint="@color/text_66000000" android:textSize="@dimen/text_14" /> <View @@ -146,8 +149,8 @@ android:background="@drawable/search_bj_ff05000000" android:gravity="center" android:inputType="number" android:textColor="@color/text_90000000" android:textColorHint="@color/text_40000000" android:textColor="@color/text_E6000000" android:textColorHint="@color/text_66000000" android:textSize="@dimen/text_14" /> </RelativeLayout> @@ -161,7 +164,7 @@ android:gravity="center" android:tag="0-5" android:text="0 ~ 5" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_14" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/min_max_rl" /> @@ -176,7 +179,7 @@ android:gravity="center" android:tag="5-10" android:text="5 ~ 10" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_14" app:layout_constraintStart_toEndOf="@+id/text1_tv" app:layout_constraintTop_toBottomOf="@+id/min_max_rl" /> @@ -191,7 +194,7 @@ android:gravity="center" android:tag="10-15" android:text="10 ~ 15" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_14" app:layout_constraintStart_toEndOf="@+id/text2_tv" app:layout_constraintTop_toBottomOf="@+id/min_max_rl" /> @@ -206,7 +209,7 @@ android:gravity="center" android:tag="15-30" android:text="15 ~ 30" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_14" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/min_max_rl" /> @@ -221,7 +224,7 @@ android:gravity="center" android:tag="30-100" android:text="30 ~ 100" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_14" app:layout_constraintStart_toEndOf="@+id/text4_tv" app:layout_constraintTop_toBottomOf="@+id/min_max_rl" /> @@ -236,7 +239,7 @@ android:gravity="center" android:tag="100-300" android:text="100 ~ 300" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_14" app:layout_constraintStart_toEndOf="@+id/text5_tv" app:layout_constraintTop_toBottomOf="@+id/min_max_rl" /> @@ -251,7 +254,7 @@ android:gravity="center" android:tag="300-500" android:text="300 ~ 500" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_14" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/min_max_rl" /> @@ -266,7 +269,7 @@ android:gravity="center" android:tag="500+" android:text="500+" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_14" app:layout_constraintStart_toEndOf="@+id/text7_tv" app:layout_constraintTop_toBottomOf="@+id/min_max_rl" /> @@ -278,7 +281,7 @@ android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="167dp" android:text="@string/grid_connected_state" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_16" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/min_max_rl" /> @@ -292,7 +295,7 @@ android:background="@drawable/search_bj_ff05000000" android:gravity="center" android:text="@string/message_all" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_14" app:layout_constraintStart_toStartOf="@+id/min_max_rl" app:layout_constraintTop_toBottomOf="@+id/grid_connected_state_title_tv" /> @@ -306,7 +309,7 @@ android:background="@drawable/search_bj_ff05000000" android:gravity="center" android:text="@string/grid_connected" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_14" app:layout_constraintStart_toEndOf="@+id/all_tv" app:layout_constraintTop_toBottomOf="@+id/grid_connected_state_title_tv" /> @@ -320,7 +323,7 @@ android:background="@drawable/search_bj_ff05000000" android:gravity="center" android:text="@string/off_network" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_14" app:layout_constraintStart_toEndOf="@+id/grid_connected_tv" app:layout_constraintTop_toBottomOf="@+id/grid_connected_state_title_tv" /> app/src/main/res/layout/dialog_static_list.xml
@@ -29,7 +29,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="HDL China" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_18" /> </LinearLayout> @@ -61,7 +61,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="HDL Bahrain" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_18" /> @@ -84,7 +84,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/loading_cancel" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_18" /> app/src/main/res/layout/fragment_home_page.xml
@@ -10,7 +10,7 @@ android:id="@+id/home_page_title_tv" style="@style/Text20Style" android:layout_width="wrap_content" android:layout_height="@dimen/dp_24" android:layout_height="@dimen/dp_26" android:layout_marginStart="@dimen/dp_16" android:layout_marginTop="58dp" android:text="@string/power_shome_page" @@ -70,7 +70,7 @@ android:layout_marginTop="7dp" android:gravity="center" android:text="999" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_21" android:textStyle="bold" /> @@ -82,7 +82,7 @@ android:layout_marginTop="1dp" android:gravity="center" android:text="state" android:textColor="@color/text_40000000" android:textColor="@color/text_66000000" android:textSize="@dimen/text_14" /> </RelativeLayout> @@ -101,7 +101,7 @@ android:layout_marginTop="7dp" android:gravity="center" android:text="999" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_21" android:textStyle="bold" /> @@ -113,7 +113,7 @@ android:layout_marginTop="1dp" android:gravity="center" android:text="state" android:textColor="@color/text_40000000" android:textColor="@color/text_66000000" android:textSize="@dimen/text_14" /> </RelativeLayout> @@ -132,7 +132,7 @@ android:layout_marginTop="7dp" android:gravity="center" android:text="999" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_21" android:textStyle="bold" /> @@ -144,7 +144,7 @@ android:layout_marginTop="1dp" android:gravity="center" android:text="state" android:textColor="@color/text_40000000" android:textColor="@color/text_66000000" android:textSize="@dimen/text_14" /> </RelativeLayout> @@ -163,7 +163,7 @@ android:layout_marginTop="7dp" android:gravity="center" android:text="999" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_21" android:textStyle="bold" /> @@ -175,7 +175,7 @@ android:layout_marginTop="1dp" android:gravity="center" android:text="state" android:textColor="@color/text_40000000" android:textColor="@color/text_66000000" android:textSize="@dimen/text_14" /> </RelativeLayout> @@ -360,7 +360,7 @@ android:layout_height="18dp" android:layout_marginTop="@dimen/dp_25" android:text="@string/energy_generation_statistics" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_14" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" @@ -473,7 +473,7 @@ android:layout_height="match_parent" android:gravity="center" android:text="2024/03/07" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_16" android:textStyle="bold" /> @@ -520,7 +520,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentStart="true" android:textColor="@color/text_40000000" android:textColor="@color/text_66000000" android:textSize="@dimen/text_12" /> <TextView @@ -538,7 +538,7 @@ android:layout_height="match_parent" android:layout_alignParentEnd="true" android:text="PV power generation" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_12" /> </RelativeLayout> @@ -574,7 +574,7 @@ android:layout_width="wrap_content" android:layout_height="17dp" android:text="@string/social_contribution" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_14" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" @@ -603,7 +603,7 @@ android:layout_marginStart="@dimen/dp_10" android:layout_marginTop="@dimen/dp_16" android:text="13.14" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_18" android:textStyle="bold" /> @@ -615,7 +615,7 @@ android:layout_marginStart="@dimen/dp_2" android:layout_toEndOf="@+id/social_contribution_data_1_tv" android:text="(T)" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_12" @@ -630,7 +630,7 @@ android:layout_marginStart="@dimen/dp_10" android:layout_marginTop="@dimen/dp_35" android:text="ssss" android:textColor="@color/text_40000000" android:textColor="@color/text_66000000" android:textSize="@dimen/text_12" /> @@ -660,7 +660,7 @@ android:layout_marginStart="@dimen/dp_10" android:layout_marginTop="@dimen/dp_16" android:text="13.14" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_18" android:textStyle="bold" /> @@ -672,7 +672,7 @@ android:layout_marginStart="@dimen/dp_2" android:layout_toEndOf="@+id/social_contribution_data_2_tv" android:text="(T)" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_12" /> @@ -686,7 +686,7 @@ android:layout_marginStart="@dimen/dp_10" android:layout_marginTop="@dimen/dp_35" android:text="ssss" android:textColor="@color/text_40000000" android:textColor="@color/text_66000000" android:textSize="@dimen/text_12" /> @@ -715,7 +715,7 @@ android:layout_marginStart="@dimen/dp_10" android:layout_marginTop="@dimen/dp_16" android:text="13.14" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_18" android:textStyle="bold" /> @@ -727,7 +727,7 @@ android:layout_marginStart="@dimen/dp_2" android:layout_toEndOf="@+id/social_contribution_data_3_tv" android:text="(T)" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_12" /> @@ -741,7 +741,7 @@ android:layout_marginStart="@dimen/dp_10" android:layout_marginTop="@dimen/dp_35" android:text="ssss" android:textColor="@color/text_40000000" android:textColor="@color/text_66000000" android:textSize="@dimen/text_12" />
@@ -24,7 +24,7 @@ android:layout_centerVertical="true" android:gravity="center_vertical" android:text="Power Station" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_20" android:textStyle="bold" /> @@ -39,7 +39,7 @@ android:layout_toEndOf="@+id/power_station_label" android:gravity="start|center_vertical" android:text="Equipment" android:textColor="@color/text_40000000" android:textColor="@color/text_66000000" android:textSize="@dimen/text_16" /> @@ -99,13 +99,15 @@ android:background="@drawable/search_bj_ff05000000"> <ImageView android:id="@+id/power_station_search_iv" android:layout_width="@dimen/dp_18" android:layout_height="@dimen/dp_18" android:layout_alignParentStart="true" android:layout_centerVertical="true" android:layout_marginStart="@dimen/dp_13" android:src="@drawable/search_path" /> android:src="@drawable/search_path" /> <TextView android:id="@+id/power_station_search_tv" @@ -115,8 +117,9 @@ android:layout_marginStart="@dimen/dp_11" android:layout_toEndOf="@+id/power_station_search_iv" android:text="Search the power station" android:textColor="@color/text_40000000" android:textSize="@dimen/text_14" /> android:textColor="@color/text_66000000" android:textSize="@dimen/text_14" /> </RelativeLayout> <ImageView @@ -156,19 +159,18 @@ android:layout_height="@dimen/dp_25" android:layout_marginTop="7dp" android:gravity="center" android:text="99" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_21" android:textStyle="bold" /> <TextView android:id="@+id/screening_condition_text1_tv" android:layout_width="match_parent" android:layout_height="@dimen/dp_17" android:layout_height="17dp" android:layout_marginTop="1dp" android:gravity="center" android:text="state" android:textColor="@color/text_40000000" android:text="@string/message_all" android:textColor="@color/text_66000000" android:textSize="@dimen/text_14" /> </LinearLayout> @@ -191,8 +193,7 @@ android:layout_height="@dimen/dp_25" android:layout_marginTop="7dp" android:gravity="center" android:text="99" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_21" android:textStyle="bold" /> @@ -202,8 +203,8 @@ android:layout_height="@dimen/dp_17" android:layout_marginTop="1dp" android:gravity="center" android:text="state" android:textColor="@color/text_40000000" android:text="@string/alarm_all_grade_malfunction" android:textColor="@color/text_66000000" android:textSize="@dimen/text_14" /> </LinearLayout> @@ -226,8 +227,7 @@ android:layout_height="@dimen/dp_25" android:layout_marginTop="7dp" android:gravity="center" android:text="99" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_21" android:textStyle="bold" /> @@ -237,8 +237,8 @@ android:layout_height="@dimen/dp_17" android:layout_marginTop="1dp" android:gravity="center" android:text="state" android:textColor="@color/text_40000000" android:text="@string/my_power_station_off_line" android:textColor="@color/text_66000000" android:textSize="@dimen/text_14" /> </LinearLayout> @@ -261,8 +261,7 @@ android:layout_height="@dimen/dp_25" android:layout_marginTop="7dp" android:gravity="center" android:text="99" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_21" android:textStyle="bold" /> @@ -272,8 +271,8 @@ android:layout_height="@dimen/dp_17" android:layout_marginTop="1dp" android:gravity="center" android:text="state" android:textColor="@color/text_40000000" android:text="@string/to_be_added" android:textColor="@color/text_66000000" android:textSize="@dimen/text_14" /> </LinearLayout> @@ -305,7 +304,7 @@ android:layout_width="wrap_content" android:layout_height="@dimen/dp_17" android:text="@string/station_name" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_12" android:textStyle="bold" /> @@ -331,7 +330,7 @@ android:layout_width="wrap_content" android:layout_height="@dimen/dp_17" android:text="@string/generated_power" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_12" android:textStyle="bold" /> @@ -357,7 +356,7 @@ android:layout_width="wrap_content" android:layout_height="@dimen/dp_17" android:text="@string/day_power_generation" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_12" android:textStyle="bold" /> @@ -383,7 +382,7 @@ android:layout_width="wrap_content" android:layout_height="@dimen/dp_17" android:text="@string/month_power_generation" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_12" android:textStyle="bold" /> @@ -466,7 +465,7 @@ android:layout_marginStart="@dimen/dp_11" android:layout_toEndOf="@+id/device_search_iv" android:text="Search the power station" android:textColor="@color/text_40000000" android:textColor="@color/text_66000000" android:textSize="@dimen/text_14" /> </RelativeLayout>
@@ -40,7 +40,7 @@ android:layout_width="wrap_content" android:layout_height="25dp" android:layout_marginTop="@dimen/dp_16" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_18" app:layout_constraintEnd_toEndOf="@+id/fragment_me_icon_iv" app:layout_constraintStart_toStartOf="@+id/fragment_me_icon_iv" app/src/main/res/layout/fragment_me_line.xml
@@ -21,7 +21,7 @@ android:layout_height="@dimen/dp_23" android:layout_marginStart="@dimen/dp_7" android:text="@string/me_set" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_16" app:layout_constraintBottom_toBottomOf="@id/fragment_me_line_left_icon_iv" app:layout_constraintStart_toEndOf="@+id/fragment_me_line_left_icon_iv" app/src/main/res/layout/fragment_message.xml
@@ -23,7 +23,7 @@ android:layout_centerVertical="true" android:gravity="center_vertical" android:text="@string/message_nascent" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_20" android:textStyle="bold" /> @@ -38,7 +38,7 @@ android:layout_toEndOf="@+id/message_tab_nascent_title_tv" android:gravity="start|center_vertical" android:text="@string/alarm_record" android:textColor="@color/text_40000000" android:textColor="@color/text_66000000" android:textSize="@dimen/text_16" /> @@ -102,7 +102,7 @@ android:layout_marginStart="@dimen/dp_11" android:layout_toEndOf="@+id/power_station_search_iv" android:text="Search the message" android:textColor="@color/text_40000000" android:textColor="@color/text_66000000" android:textSize="@dimen/text_14" /> </RelativeLayout> @@ -142,7 +142,7 @@ android:layout_width="wrap_content" android:layout_height="@dimen/dp_20" android:text="@string/alarm_all_device" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_14" /> <View @@ -178,7 +178,7 @@ android:layout_width="wrap_content" android:layout_height="@dimen/dp_20" android:text="@string/alarm_all_grade" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_14" /> <View @@ -214,7 +214,7 @@ android:layout_height="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_7" android:text="@string/alarm_all_time" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_14" /> <View app/src/main/res/layout/home_bottom_line.xml
@@ -16,12 +16,11 @@ <TextView android:id="@+id/title_tv" android:layout_width="wrap_content" android:layout_height="@dimen/text_14" android:layout_height="@dimen/text_16" android:layout_below="@+id/icon_iv" android:layout_centerInParent="true" android:layout_marginTop="@dimen/dp_2" android:textColor="@color/text_90000000" android:textSize="@dimen/text_10" /> android:textColor="@color/text_E6000000" android:textSize="@dimen/text_12" /> <TextView android:id="@+id/red_count_tv" app/src/main/res/layout/item_data.xml
@@ -8,7 +8,7 @@ android:id="@+id/data_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_24" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_20" android:textStyle="bold" android:text="33" @@ -21,7 +21,7 @@ android:layout_width="wrap_content" android:layout_height="@dimen/dp_17" android:layout_marginTop="3dp" android:textColor="@color/text_40000000" android:textColor="@color/text_66000000" android:textSize="@dimen/text_14" app:layout_constraintEnd_toEndOf="@+id/data_tv" app:layout_constraintStart_toStartOf="@+id/data_tv" app/src/main/res/layout/item_device_details.xml
@@ -41,7 +41,7 @@ android:ellipsize="end" android:gravity="center_vertical|start" android:singleLine="true" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_16" android:textStyle="bold" /> @@ -53,7 +53,7 @@ android:layout_alignStart="@+id/device_details_name_tv" android:layout_marginTop="@dimen/dp_3" android:gravity="center_vertical" android:textColor="@color/text_40000000" android:textColor="@color/text_66000000" android:textSize="@dimen/text_12" /> <LinearLayout @@ -78,7 +78,7 @@ android:layout_height="wrap_content" android:gravity="center" android:text="99" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_15" android:textStyle="bold" /> @@ -89,7 +89,7 @@ android:layout_marginTop="3dp" android:gravity="center" android:text="@string/generated_power" android:textColor="@color/text_40000000" android:textColor="@color/text_66000000" android:textSize="@dimen/text_12" /> </LinearLayout> @@ -107,7 +107,7 @@ android:layout_height="@dimen/dp_18" android:gravity="center" android:text="99" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_15" android:textStyle="bold" /> @@ -118,7 +118,7 @@ android:layout_marginTop="3dp" android:gravity="center" android:text="@string/day_power_generation" android:textColor="@color/text_40000000" android:textColor="@color/text_66000000" android:textSize="@dimen/text_12" /> </LinearLayout> @@ -136,7 +136,7 @@ android:layout_height="@dimen/dp_18" android:gravity="center" android:text="99" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_15" android:textStyle="bold" /> @@ -147,7 +147,7 @@ android:layout_marginTop="3dp" android:gravity="center" android:text="@string/month_power_generation" android:textColor="@color/text_40000000" android:textColor="@color/text_66000000" android:textSize="@dimen/text_12" /> </LinearLayout> @@ -186,7 +186,7 @@ android:gravity="center_vertical|start" android:singleLine="true" android:text="@string/power_station" android:textColor="@color/text_40000000" android:textColor="@color/text_66000000" android:textSize="@dimen/text_12" /> <TextView app/src/main/res/layout/item_history_title.xml
@@ -11,7 +11,7 @@ android:layout_marginStart="@dimen/dp_16" android:ellipsize="end" android:singleLine="true" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_16" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> app/src/main/res/layout/item_house_line_c.xml
@@ -15,7 +15,7 @@ android:ellipsize="end" android:singleLine="true" android:text="@string/power_station" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_16" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/house_Image_ll" app/src/main/res/layout/item_message.xml
@@ -32,7 +32,7 @@ android:gravity="center_vertical" android:singleLine="true" android:textStyle="bold" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_16" app:layout_constraintEnd_toStartOf="@+id/item_estate_tv" app:layout_constraintStart_toStartOf="parent" @@ -43,7 +43,7 @@ android:layout_width="wrap_content" android:layout_height="@dimen/dp_17" android:layout_marginTop="@dimen/dp_6" android:textColor="@color/text_40000000" android:textColor="@color/text_66000000" android:textSize="@dimen/text_12" app:layout_constraintStart_toStartOf="@+id/item_content_tv" app:layout_constraintTop_toBottomOf="@+id/item_content_tv" /> @@ -54,7 +54,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_6" android:gravity="center_vertical" android:textColor="@color/text_40000000" android:textColor="@color/text_66000000" android:textSize="@dimen/text_12" app:layout_constraintStart_toStartOf="@+id/item_home_name_tv" app:layout_constraintTop_toBottomOf="@+id/item_home_name_tv" /> app/src/main/res/layout/item_message_c.xml
@@ -33,7 +33,7 @@ android:ellipsize="end" android:gravity="center_vertical" android:singleLine="true" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_16" app:layout_constraintEnd_toStartOf="@+id/item_estate_tv" app:layout_constraintStart_toStartOf="parent" @@ -44,7 +44,7 @@ android:layout_width="wrap_content" android:layout_height="@dimen/dp_17" android:layout_marginTop="@dimen/dp_6" android:textColor="@color/text_40000000" android:textColor="@color/text_66000000" android:textSize="@dimen/text_12" app:layout_constraintStart_toStartOf="@+id/item_content_tv" app:layout_constraintTop_toBottomOf="@+id/item_content_tv" /> @@ -55,7 +55,7 @@ android:layout_height="@dimen/dp_17" android:layout_marginTop="@dimen/dp_6" android:gravity="center_vertical" android:textColor="@color/text_40000000" android:textColor="@color/text_66000000" android:textSize="@dimen/text_12" app:layout_constraintStart_toStartOf="@+id/item_home_name_tv" app:layout_constraintTop_toBottomOf="@+id/item_home_name_tv" /> app/src/main/res/layout/item_plant_details.xml
@@ -3,7 +3,7 @@ <com.hdl.photovoltaic.widget.SwipeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/item_parent_swipeLayout" android:layout_width="match_parent" android:layout_height="wrap_content"> android:layout_height="@dimen/dp_164"> <include android:id="@+id/swipe_layout_il" @@ -17,9 +17,8 @@ <RelativeLayout android:id="@+id/device_details_info_rl" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_height="@dimen/dp_148" android:layout_marginStart="@dimen/dp_16" android:layout_marginTop="@dimen/dp_16" android:layout_marginEnd="@dimen/dp_16" android:background="@drawable/ffffff_13"> @@ -43,7 +42,7 @@ android:gravity="center_vertical|start" android:singleLine="true" android:text="@string/power_station" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_16" android:textStyle="bold" /> @@ -56,7 +55,7 @@ android:layout_marginTop="@dimen/dp_3" android:gravity="center_vertical" android:text="@string/installed_capacity" android:textColor="@color/text_40000000" android:textColor="@color/text_66000000" android:textSize="@dimen/text_12" /> <LinearLayout @@ -81,7 +80,7 @@ android:layout_height="@dimen/dp_18" android:gravity="center" android:text="99" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_15" android:textStyle="bold" /> @@ -92,7 +91,7 @@ android:layout_marginTop="3dp" android:gravity="center" android:text="@string/generated_power" android:textColor="@color/text_40000000" android:textColor="@color/text_66000000" android:textSize="@dimen/text_12" /> </LinearLayout> @@ -110,7 +109,7 @@ android:layout_height="@dimen/dp_18" android:gravity="center" android:text="99" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_15" android:textStyle="bold" /> @@ -121,7 +120,7 @@ android:layout_marginTop="3dp" android:gravity="center" android:text="@string/day_power_generation" android:textColor="@color/text_40000000" android:textColor="@color/text_66000000" android:textSize="@dimen/text_12" /> </LinearLayout> @@ -139,7 +138,7 @@ android:layout_height="@dimen/dp_18" android:gravity="center" android:text="99" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_15" android:textStyle="bold" /> @@ -150,7 +149,7 @@ android:layout_marginTop="3dp" android:gravity="center" android:text="@string/month_power_generation" android:textColor="@color/text_40000000" android:textColor="@color/text_66000000" android:textSize="@dimen/text_12" /> </LinearLayout> @@ -189,7 +188,7 @@ android:gravity="center_vertical|start" android:singleLine="true" android:text="@string/power_station" android:textColor="@color/text_40000000" android:textColor="@color/text_66000000" android:textSize="@dimen/text_12" /> <TextView app/src/main/res/layout/item_search_house.xml
@@ -20,7 +20,7 @@ android:layout_marginStart="@dimen/dp_23" android:ellipsize="end" android:singleLine="true" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_16" app:layout_constraintStart_toEndOf="@+id/power_station_search_iv" app:layout_constraintTop_toTopOf="parent" /> @@ -30,7 +30,7 @@ android:layout_width="wrap_content" android:layout_height="@dimen/dp_17" android:layout_marginTop="@dimen/dp_7" android:textColor="@color/text_40000000" android:textColor="@color/text_66000000" android:textSize="@dimen/text_12" app:layout_constraintStart_toStartOf="@+id/message_name_tv" app:layout_constraintTop_toBottomOf="@+id/message_name_tv" /> app/src/main/res/layout/item_search_message.xml
@@ -33,7 +33,7 @@ android:layout_marginTop="@dimen/dp_19" android:ellipsize="end" android:singleLine="true" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_16" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" @@ -44,7 +44,7 @@ android:layout_width="wrap_content" android:layout_height="@dimen/dp_17" android:layout_marginTop="@dimen/dp_6" android:textColor="@color/text_40000000" android:textColor="@color/text_66000000" android:textSize="@dimen/text_12" app:layout_constraintStart_toStartOf="@+id/message_name_tv" app:layout_constraintTop_toBottomOf="@+id/message_name_tv" /> @@ -54,7 +54,7 @@ android:layout_width="wrap_content" android:layout_height="@dimen/dp_17" android:layout_marginTop="@dimen/dp_6" android:textColor="@color/text_40000000" android:textColor="@color/text_66000000" android:textSize="@dimen/text_12" app:layout_constraintStart_toStartOf="@+id/message_content_tv" app:layout_constraintTop_toBottomOf="@+id/message_content_tv" /> app/src/main/res/layout/item_station.xml
@@ -12,7 +12,7 @@ android:layout_height="@dimen/dp_25" android:layout_marginTop="7dp" android:text="99" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_21" android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" @@ -25,7 +25,7 @@ android:layout_height="@dimen/dp_17" android:layout_marginTop="1dp" android:text="state" android:textColor="@color/text_40000000" android:textColor="@color/text_66000000" android:textSize="@dimen/text_14" app:layout_constraintEnd_toEndOf="@+id/station_status_tv" app:layout_constraintStart_toStartOf="@+id/station_status_tv" app/src/main/res/layout/item_type_title.xml
@@ -20,7 +20,7 @@ android:layout_width="match_parent" android:layout_height="@dimen/dp_20" android:gravity="center" android:textColor="@color/text_90000000" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_14" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app/src/main/res/layout/text_underline.xml
@@ -10,7 +10,7 @@ android:layout_height="@dimen/dp_28" android:gravity="center" android:text="@string/home_login_phone" android:textColor="@color/text_40000000" android:textColor="@color/text_66000000" android:textSize="@dimen/text_16" />
@@ -15,13 +15,13 @@ <color name="text_245EC3">#38C494</color> <color name="text_25000000">#25000000</color> <color name="text_40000000">#40000000</color> <color name="text_66000000">#66000000</color> <color name="text_65000000">#65000000</color> <color name="text_60000000">#60000000</color> <color name="text_90000000">#90000000</color> <color name="text_E6000000">#E6000000</color> <color name="text_00000000">#00000000</color> <color name="text_FF000000">#FF000000</color> <color name="text_E1E1E1">#E1E1E1</color> <color name="text_E1E1E1">#FFE1E1E1</color> <color name="text_94B6E7">#94B6E7</color> <color name="text_FFFFFFFF">#FFFFFFFF</color> <color name="text80_FFFFFF">#80FFFFFF</color> app/src/main/res/values/strings.xml
@@ -292,4 +292,5 @@ <string name="wechat_id">微信号</string> <string name="email_address">邮箱地址</string> <string name="successful_replication">复制成功</string> <string name="to_be_added">待接入</string> </resources> app/src/main/res/values/styles.xml
@@ -12,7 +12,7 @@ <style name="Text20Style"> <item name="android:textSize">@dimen/text_20</item> <item name="android:textStyle">bold</item> <item name="android:textColor">@color/text_90000000</item> <item name="android:textColor">@color/text_E6000000</item> <!-- <item name="android:fontFamily"></item>--> </style> @@ -20,18 +20,18 @@ <style name="Text21Style"> <item name="android:textSize">@dimen/text_21</item> <item name="android:textStyle">bold</item> <item name="android:textColor">@color/text_90000000</item> <item name="android:textColor">@color/text_E6000000</item> </style> <!-- 自定义字体样式 --> <style name="Text14Style"> <item name="android:textSize">@dimen/text_14</item> <item name="android:textColor">@color/text_40000000</item> <item name="android:textColor">@color/text_66000000</item> </style> <!-- 自定义字体样式 --> <style name="Text16Style"> <item name="android:textSize">@dimen/text_16</item> <item name="android:textColor">@color/text_40000000</item> <item name="android:textColor">@color/text_66000000</item> </style>
