app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/java/com/hdl/photovoltaic/ui/adapter/LanguageAdapter.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/res/drawable/unchecked_btn.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/res/layout/activity_home_login.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/res/values-en/strings.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/res/values/colors.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
@@ -105,8 +105,7 @@ * 初始化UI */ private void initView() { viewBinding.homeLoginCheckBCIv.setSelected(UserConfigManage.getInstance().isBAccount()); viewBinding.homeLoginInstallUserTv.setSelected(UserConfigManage.getInstance().isBAccount()); viewBinding.homeLoginCheckBCCl.setSelected(UserConfigManage.getInstance().isBAccount()); viewBinding.homeLoginPrivacyCheckIv.setSelected(UserConfigManage.getInstance().isAcceiptPolicy()); setStringDifferentColors(viewBinding.homeLoginPrivacyTv); if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(LocalManageUtil.zh)) { @@ -187,27 +186,13 @@ } } }); //选择b端,c端 viewBinding.homeLoginInstallUserTv.setOnClickListener(new View.OnClickListener() { viewBinding.homeLoginCheckBCCl.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { v.setSelected(!v.isSelected()); UserConfigManage.getInstance().setBAccount(v.isSelected()); viewBinding.homeLoginCheckBCIv.setSelected(UserConfigManage.getInstance().isBAccount()); if (UserConfigManage.getInstance().isBAccount()) { viewBinding.homeLoginRegisterTv.setVisibility(View.GONE); } else { viewBinding.homeLoginRegisterTv.setVisibility(View.VISIBLE); } } }); //选择b端,c端 viewBinding.homeLoginCheckBCIv.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { v.setSelected(!v.isSelected()); UserConfigManage.getInstance().setBAccount(v.isSelected()); if (UserConfigManage.getInstance().isBAccount()) { viewBinding.homeLoginRegisterTv.setVisibility(View.GONE); } else { app/src/main/java/com/hdl/photovoltaic/ui/adapter/LanguageAdapter.java
@@ -50,7 +50,7 @@ if (itemData.isState()) { holder.item_lift_name_tv.setTextColor(mContext.getColor(R.color.text_245EC3)); holder.item_right_icon_iv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.select_state)); holder.item_right_icon_iv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.select)); } if (position == this.mList.size() - 1) { holder.item_bottom_line_v.setVisibility(View.GONE); app/src/main/res/drawable/unchecked_btn.xml
@@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <shape xmlns:android="http://schemas.android.com/apk/res/android"> <solid android:color="@color/text_94B6E7"/> <solid android:color="@color/text_C2EDDE"/> <corners android:radius="@dimen/dp_8"/> </shape> app/src/main/res/layout/activity_home_login.xml
@@ -64,26 +64,37 @@ app:layout_constraintStart_toStartOf="@+id/home_login_server_iv" app:layout_constraintTop_toBottomOf="@+id/home_login_language_tv" /> <ImageView android:id="@+id/home_login_check_b_c_iv" android:layout_width="@dimen/dp_20" android:layout_height="@dimen/dp_20" android:layout_marginTop="@dimen/dp_56" android:background="@drawable/yesandnoselected" app:layout_constraintStart_toStartOf="@+id/home_login_server_iv" app:layout_constraintTop_toBottomOf="@+id/home_login_title_tv" /> <TextView android:id="@+id/home_login_install_user_tv" <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/home_login_check_b_c_cl" android:layout_width="wrap_content" android:layout_height="@dimen/dp_20" android:layout_marginStart="@dimen/dp_16" android:text="@string/home_login_an_installer" android:textColor="@color/text_FF000000" android:textSize="@dimen/text_14" app:layout_constraintBottom_toBottomOf="@+id/home_login_check_b_c_iv" app:layout_constraintStart_toEndOf="@+id/home_login_check_b_c_iv" app:layout_constraintTop_toTopOf="@+id/home_login_check_b_c_iv" /> android:layout_height="20dp" android:layout_marginTop="@dimen/dp_56" app:layout_constraintStart_toStartOf="@+id/home_login_server_iv" app:layout_constraintTop_toBottomOf="@+id/home_login_title_tv"> <ImageView android:id="@+id/home_login_check_b_c_iv" android:layout_width="20dp" android:layout_height="20dp" android:background="@drawable/yesandnoselected" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> <TextView android:id="@+id/home_login_install_user_tv" android:layout_width="wrap_content" android:layout_height="17dp" android:layout_marginStart="@dimen/dp_16" android:text="@string/home_login_an_installer" android:textColor="@color/text_FF000000" android:textSize="@dimen/text_14" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@+id/home_login_check_b_c_iv" app:layout_constraintTop_toTopOf="parent" /> </androidx.constraintlayout.widget.ConstraintLayout> <!--账号输入框--> <EditText android:id="@+id/home_login_account_et" @@ -103,7 +114,7 @@ android:textSize="@dimen/text_16" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/home_login_install_user_tv" /> app:layout_constraintTop_toBottomOf="@+id/home_login_check_b_c_cl" /> <ImageView android:id="@+id/home_login_clear_contents_iv" @@ -252,7 +263,7 @@ <TextView android:id="@+id/home_login_privacy_tv" android:layout_width="wrap_content" android:layout_width="287dp" android:layout_height="@dimen/dp_40" android:layout_marginStart="@dimen/dp_16" android:gravity="start|center" app/src/main/res/values-en/strings.xml
@@ -224,7 +224,7 @@ <string name="delete_power_station">Do you want to delete %s power station?</string> <string name="power_station_selection">Power station selection</string> <string name="alarm_all_device">All Devices</string> <string name="alarm_all_device">All devices</string> <string name="alarm_all_device_inverter">inverter</string> <string name="alarm_all_device_bms">BMS control box</string> <string name="alarm_all_device_battery_cell">Battery unit</string> @@ -232,7 +232,7 @@ <string name="alarm_all_grade_malfunction">malfunction</string> <string name="alarm_all_grade_warning">warning</string> <string name="alarm_all_grade_tip">hint</string> <string name="alarm_all_time">all time</string> <string name="alarm_all_time">All time</string> <string name="alarm_all_time_same_day">the day</string> <string name="alarm_all_time_3">Last 3 Days</string> <string name="alarm_all_time_7">Last 7 Days</string> app/src/main/res/values/colors.xml
@@ -47,6 +47,7 @@ <color name="text_191919">#191919</color> <color name="text_B2B2B2">#B2B2B2</color> <color name="text_38C494">#38C494</color> <color name="text_C2EDDE">#C2EDDE</color> </resources>