mac
2024-07-02 bd9acb07d64afbd8d6454ebbe23f2a3cdd6b8f23
2024年07月02日15:29:19

备份时间
1个文件已添加
6个文件已修改
59 ■■■■ 已修改文件
app/src/main/java/com/hdl/photovoltaic/enums/UnitType.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/drawable/language_bj.png 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/activity_power_stations_list.xml 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/dialog_list.xml 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/diaog_list_line.xml 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/item_house_line_c.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/enums/UnitType.java
@@ -2,7 +2,7 @@
public @interface UnitType {
    String kWp = "kWp";
    String kWh = "kW.h";
    String kWh = "kWh";
    String kW = "kW";
    String noValue = "0.00";
}
app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
@@ -120,14 +120,12 @@
        } else {
            viewBinding.homeLoginRegisterTv.setVisibility(View.VISIBLE);
        }
//        String acc = "18402017839";
//        String acc = "13375012441";
//        String acc = "18316672920";
//        String acc = "nuy13368@uzxia.com";
//        String pws = "123456";
        //测试用
//        viewBinding.homeLoginAccountEt.setText(acc);
        viewBinding.homeLoginAccountEt.setText(UserConfigManage.getInstance().getAccount());
//        viewBinding.homeLoginPasswordEt.setText(pws);
        checkClearIconShowOrNot(viewBinding.homeLoginAccountEt.getText().toString());
        isLoginTextViewEnabled();
@@ -175,7 +173,8 @@
        viewBinding.homeLoginClearContentsIv.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                viewBinding.homeLoginAccountEt.setText("");}
                viewBinding.homeLoginAccountEt.setText("");
            }
        });
        //输入密码
        viewBinding.homeLoginPasswordEt.addTextChangedListener(passwordTextWatcher);
app/src/main/res/drawable/language_bj.png
app/src/main/res/layout/activity_power_stations_list.xml
@@ -16,28 +16,24 @@
        android:layout_width="match_parent"
        android:layout_height="0dp"
        android:layout_marginTop="@dimen/dp_10"
        app:layout_constraintBottom_toTopOf="@+id/add_power_station_tv"
        app:layout_constraintBottom_toTopOf="@+id/add_power_station_rl"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_house_list_rl">
        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/fragment_house_srl_list_rc"
            android:layout_width="0dp"
            android:layout_height="0dp"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:clipToPadding="false"
            android:paddingBottom="@dimen/dp_16"
            app:layout_constraintBottom_toTopOf="@+id/add_power_station_rl"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_house_list_rl" />
            android:paddingBottom="@dimen/dp_16" />
    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
    <RelativeLayout
        android:background="@color/text_FFFFFFFF"
        android:id="@+id/add_power_station_rl"
        android:layout_width="match_parent"
        android:layout_height="82dp"
        android:background="@color/text_FFFFFFFF"
        android:gravity="center"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
app/src/main/res/layout/dialog_list.xml
@@ -7,12 +7,12 @@
    <androidx.constraintlayout.widget.ConstraintLayout
        android:id="@+id/dialog_parent"
        android:layout_width="@dimen/dp_141"
        android:layout_width="140.5dp"
        android:layout_height="wrap_content"
        android:layout_marginStart="61dp"
        android:layout_marginTop="57dp"
        android:layout_marginStart="20dp"
        android:layout_marginTop="40dp"
        android:layout_marginEnd="174dp"
        android:background="@drawable/ffffff_13"
        android:background="@drawable/language_bj"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent">
@@ -20,10 +20,10 @@
            android:id="@+id/logic_rcv"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:layout_marginTop="@dimen/dp_6"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent" />
    </androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/layout/diaog_list_line.xml
@@ -1,29 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="@dimen/dp_141"
    android:layout_width="140.5dp"
    android:layout_height="@dimen/dp_54"
   >
    >
    <TextView
        android:id="@+id/list_item_title_tv"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_20"
        android:layout_marginStart="@dimen/dp_28"
        android:layout_marginStart="@dimen/dp_16"
        android:layout_marginTop="@dimen/dp_17"
        android:layout_marginEnd="@dimen/dp_16"
        android:layout_marginBottom="@dimen/dp_17"
        android:gravity="center"
        android:textColor="@color/text_E6000000"
        android:textSize="@dimen/text_14"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent" />
        app:layout_constraintTop_toTopOf="parent"
        />
    <View
        android:id="@+id/list_item_line_v"
        android:layout_width="109dp"
        android:layout_height="1dp"
        android:layout_width="0dp"
        android:layout_height="0.5dp"
        android:layout_marginStart="@dimen/dp_16"
        android:layout_marginBottom="@dimen/dp_1"
        android:background="@color/text_10FFFFFF"
        android:layout_marginEnd="@dimen/dp_16"
        android:layout_marginBottom="0.5dp"
        android:background="@color/text_E1E1E1"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/layout/item_house_line_c.xml
@@ -62,6 +62,7 @@
        android:layout_marginStart="@dimen/dp_16"
        android:layout_marginEnd="@dimen/dp_16"
        android:layout_marginBottom="0.5dp"
        android:background="@color/text_E1E1E1"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"