2024年11月27日20:03:09

wjc

2024-11-27 22c83310cbc4b04615be42d51645b47eff87cb7d

2024年11月27日20:03:09

 app/src/main/java/com/hdl/photovoltaic/ui/adapter/MessageAdapter.java

@@ -47,16 +47,16 @@
        String date = TimeUtils.getTimeFromTimestamp(messageBean.getCreateTime());
        holder.item_time_tv.setText(date);
        String type = "";//FAULT:故障,WARN:告警,EVENT:提示
        Drawable drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_ffb300);
        Drawable drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_satte_ffb300);
        if (messageBean.getType().equals(MessageAlarmStateType.fault)) {
            type = mContext.getString(R.string.my_power_station_malfunction);
            drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_e34343);
            drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_fff55252);
        } else if (messageBean.getType().equals(MessageAlarmStateType.warn)) {
            type = mContext.getString(R.string.message_alarm);
            drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_ffb300);
            drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_satte_ffb300);
        } else if (messageBean.getType().equals(MessageAlarmStateType.event)) {
            type = mContext.getString(R.string.loading_title_tip);
            drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_b9b9b9);
            drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_ffb9b9b9);
        }
        holder.item_estate_tv.setText(type);
        holder.item_estate_tv.setBackground(drawable);

 app/src/main/java/com/hdl/photovoltaic/ui/message/MessageFragment.java

@@ -109,8 +109,8 @@
                viewBinding.allTimeTitleTv.setText(getString(R.string.alarm_all_time));
                isAlarmDeviceClick = true;
                isRefreshTotalCount = true;
                viewBinding.messageTabNascentTitleTv.setTextAppearance(R.style.Text20Style);
                viewBinding.messageTabRecoverTitleTv.setTextAppearance(R.style.Text16Style);
                viewBinding.messageTabNascentTitleTv.setTextAppearance(R.style.Text18Style);
                viewBinding.messageTabRecoverTitleTv.setTextAppearance(R.style.Text14Style);
                viewBinding.allClearIv.setVisibility(View.VISIBLE);
                loadNextPageMessageList(true, 1, mDeviceTypeFilterKye, mDeviceTypeFilterValue, mTypeFilterKye, mTypeFilterValue, mTimeTypeFilterKye, mTimeTypeFilterValue, true);
            }
@@ -133,8 +133,8 @@
                viewBinding.allTimeTitleTv.setText(getString(R.string.alarm_all_time));
                isAlarmDeviceClick = false;
                isRefreshTotalCount = true;
                viewBinding.messageTabNascentTitleTv.setTextAppearance(R.style.Text16Style);
                viewBinding.messageTabRecoverTitleTv.setTextAppearance(R.style.Text20Style);
                viewBinding.messageTabNascentTitleTv.setTextAppearance(R.style.Text14Style);
                viewBinding.messageTabRecoverTitleTv.setTextAppearance(R.style.Text18Style);
                viewBinding.allClearIv.setVisibility(View.GONE);
                loadNextPageMessageList(true, 1, mDeviceTypeFilterKye, mDeviceTypeFilterValue, mTypeFilterKye, mTypeFilterValue, mTimeTypeFilterKye, mTimeTypeFilterValue, true);
            }
@@ -302,11 +302,11 @@

    private void initView() {
        if (isAlarmDeviceClick) {
            viewBinding.messageTabNascentTitleTv.setTextAppearance(R.style.Text20Style);
            viewBinding.messageTabRecoverTitleTv.setTextAppearance(R.style.Text16Style);
            viewBinding.messageTabNascentTitleTv.setTextAppearance(R.style.Text18Style);
            viewBinding.messageTabRecoverTitleTv.setTextAppearance(R.style.Text14Style);
        } else {
            viewBinding.messageTabNascentTitleTv.setTextAppearance(R.style.Text16Style);
            viewBinding.messageTabRecoverTitleTv.setTextAppearance(R.style.Text20Style);
            viewBinding.messageTabNascentTitleTv.setTextAppearance(R.style.Text18Style);
            viewBinding.messageTabRecoverTitleTv.setTextAppearance(R.style.Text14Style);
        }
//        viewBinding..topMoreBtn.setVisibility(View.VISIBLE);
//        viewBinding.toolbarTopMessageCenterListRl.topMoreIv.setImageResource(R.drawable.clearall);

 app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java

@@ -206,9 +206,7 @@
    private void initView() {

        viewBinding.toolbarTopIn.topTitleTv.setText(R.string.message_alarm_info);
        viewBinding.toolbarTopIn.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
        viewBinding.toolbarTopIn.topBackLl.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopIn.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFECECEC, null));

        if (!UserConfigManage.getInstance().isBAccount()) {
            viewBinding.messageInfoBackTv.setTextColor(getColor(R.color.text_38C494));

 app/src/main/java/com/hdl/photovoltaic/widget/adapter/TypeListDialogAdapter.java

@@ -45,9 +45,9 @@
        if (position == this.mList.size() - 1) {
            holder.type_line_v.setVisibility(View.GONE);
        }
        holder.type_title_tv.setTextColor(mContext.getColor(R.color.text_161718));
        holder.type_title_tv.setTextColor(mContext.getColor(R.color.text_66FFFFFF));
        if (mSelectType.equals(title)) {
            holder.type_title_tv.setTextColor(mContext.getColor(R.color.text_38C494));
            holder.type_title_tv.setTextColor(mContext.getColor(R.color.text_E6FFFFFF));
        }
        holder.itemView.setOnClickListener(new View.OnClickListener() {
            @Override

 app/src/main/res/drawable/clearall.png

 app/src/main/res/drawable/down.png

 app/src/main/res/drawable/search_bj_ff333738.xml

 app/src/main/res/drawable/up.png

 app/src/main/res/layout/activity_device_search.xml

@@ -40,7 +40,7 @@
            android:layout_marginEnd="@dimen/dp_21"
            android:layout_toStartOf="@+id/power_station_search_tv"
            android:layout_toEndOf="@+id/back_rl"
            android:background="@drawable/search_bj_ff05000000">
            android:background="@drawable/search_bj_ff333738">

            <ImageView
                android:id="@+id/power_station_search_iv"

 app/src/main/res/layout/activity_house_search.xml

@@ -39,7 +39,7 @@
            android:layout_marginEnd="@dimen/dp_21"
            android:layout_toStartOf="@+id/power_station_search_tv"
            android:layout_toEndOf="@+id/back_rl"
            android:background="@drawable/search_bj_ff05000000">
            android:background="@drawable/search_bj_ff333738">

            <ImageView
                android:id="@+id/power_station_search_iv"

 app/src/main/res/layout/activity_message_info.xml

@@ -4,10 +4,11 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@color/text_FFECECEC"
    android:background="@color/text_FF161616"
    tools:context=".ui.message.MessageInfoActivity">

    <include

        android:id="@+id/toolbar_top_in"
        layout="@layout/toolbar_top_view_52" />

@@ -15,8 +16,8 @@
        android:id="@+id/message_info_cl"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginTop="@dimen/dp_13"
        android:background="@color/text_FFFFFFFF"
        android:layout_marginTop="@dimen/dp_10"
        android:background="@color/text_FF333738"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/toolbar_top_in">

 app/src/main/res/layout/activity_search_messge.xml

@@ -39,7 +39,7 @@
            android:layout_marginEnd="@dimen/dp_21"
            android:layout_toStartOf="@+id/power_station_search_tv"
            android:layout_toEndOf="@+id/back_rl"
            android:background="@drawable/search_bj_ff05000000">
            android:background="@drawable/search_bj_ff333738">

            <ImageView
                android:id="@+id/message_search_iv"

 app/src/main/res/layout/dialog_type_title_list_b.xml

@@ -4,7 +4,7 @@
    android:id="@+id/dialog_parent_cl"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:background="@drawable/loading_ffffffff_4"
    android:background="@drawable/bj_ff333738"
    app:layout_constraintEnd_toEndOf="parent"
    app:layout_constraintStart_toStartOf="parent"
    app:layout_constraintTop_toTopOf="parent">

 app/src/main/res/layout/fragment_house_list.xml

@@ -97,7 +97,7 @@
                    android:layout_height="match_parent"
                    android:layout_marginEnd="@dimen/dp_17"
                    android:layout_toStartOf="@+id/power_station_default_condition_iv"
                    android:background="@drawable/search_bj_ff05000000">
                    android:background="@drawable/search_bj_ff333738">

                    <ImageView

@@ -478,7 +478,7 @@
                android:layout_height="@dimen/dp_35"
                android:layout_marginStart="@dimen/dp_13"
                android:layout_marginEnd="@dimen/dp_16"
                android:background="@drawable/search_bj_ff05000000"
                android:background="@drawable/search_bj_ff333738"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toTopOf="parent">

 app/src/main/res/layout/fragment_message.xml

@@ -23,9 +23,8 @@
            android:layout_height="wrap_content"
            android:layout_centerVertical="true"
            android:text="@string/message_nascent"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_20"
            android:textStyle="bold" />
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_18" />

        <TextView
            android:id="@+id/message_tab_recover_title_tv"
@@ -36,19 +35,16 @@
            android:layout_marginEnd="36dp"
            android:layout_toEndOf="@+id/message_tab_nascent_title_tv"
            android:text="@string/alarm_record"
            android:textColor="@color/text_66000000"
            android:textSize="@dimen/text_16"

            />
            android:textColor="@color/text_66FFFFFF"
            android:textSize="@dimen/text_14" />

        <ImageView

            android:id="@+id/all_clear_iv"
            android:layout_width="@dimen/dp_28"
            android:layout_height="@dimen/dp_28"
            android:layout_width="@dimen/dp_33"
            android:layout_height="@dimen/dp_33"
            android:layout_alignParentEnd="true"
            android:layout_centerVertical="true"
            android:layout_marginTop="@dimen/dp_4"
            android:layout_marginEnd="@dimen/dp_5"
            android:src="@drawable/clearall" />


@@ -58,7 +54,7 @@
        android:id="@+id/message_cl"
        android:layout_width="match_parent"
        android:layout_height="98dp"
        android:layout_marginTop="@dimen/dp_13"
        android:layout_marginTop="@dimen/dp_10"
        android:orientation="vertical"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
@@ -80,7 +76,7 @@
                android:layout_height="match_parent"
                android:layout_alignParentEnd="true"
                android:layout_marginEnd="@dimen/dp_17"
                android:background="@drawable/search_bj_ff05000000">
                android:background="@drawable/search_bj_ff333738">

                <ImageView
                    android:id="@+id/power_station_search_iv"
@@ -99,7 +95,7 @@
                    android:layout_marginStart="@dimen/dp_11"
                    android:layout_toEndOf="@+id/power_station_search_iv"
                    android:text="@string/enter_alarm_name"
                    android:textColor="@color/text_66000000"
                    android:textColor="@color/text_66FFFFFF"
                    android:textSize="@dimen/text_14" />
            </RelativeLayout>

@@ -126,7 +122,7 @@
                    android:layout_width="wrap_content"
                    android:layout_height="@dimen/dp_20"
                    android:text="@string/alarm_all_device"
                    android:textColor="@color/text_E6000000"
                    android:textColor="@color/text_E6FFFFFF"
                    android:textSize="@dimen/text_14" />

                <View
@@ -159,7 +155,7 @@
                    android:layout_width="wrap_content"
                    android:layout_height="@dimen/dp_20"
                    android:text="@string/alarm_all_grade"
                    android:textColor="@color/text_E6000000"
                    android:textColor="@color/text_E6FFFFFF"
                    android:textSize="@dimen/text_14" />

                <View
@@ -191,7 +187,7 @@
                    android:layout_width="wrap_content"
                    android:layout_height="@dimen/dp_20"
                    android:text="@string/alarm_all_time"
                    android:textColor="@color/text_E6000000"
                    android:textColor="@color/text_E6FFFFFF"
                    android:textSize="@dimen/text_14" />

                <View

 app/src/main/res/layout/item_message.xml

@@ -2,14 +2,14 @@
<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="match_parent"
    android:layout_height="@dimen/dp_115">
    android:layout_height="117.5dp">

    <androidx.constraintlayout.widget.ConstraintLayout
        android:layout_width="0dp"
        android:layout_height="@dimen/dp_99"
        android:layout_height="107.5dp"
        android:layout_marginStart="@dimen/dp_16"
        android:layout_marginEnd="@dimen/dp_16"
        android:background="@drawable/house_list_line_parent_bg"
        android:background="@drawable/bj_ff333738"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent">
@@ -17,63 +17,62 @@
        <!--未读标签-->
        <TextView
            android:id="@+id/item_unread_message_tv"
            android:layout_width="8dp"
            android:layout_height="8dp"
            android:layout_width="9dp"
            android:layout_height="9dp"
            android:layout_marginTop="@dimen/dp_3"
            android:layout_marginEnd="@dimen/dp_2"
            android:background="@drawable/red_font"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintTop_toTopOf="parent" />

        <TextView
            android:id="@+id/item_estate_tv"
            android:layout_width="7dp"
            android:layout_height="7dp"
            android:layout_marginStart="@dimen/dp_16"
            android:layout_marginTop="22.5dp"
            android:background="@drawable/device_state_ff38c494"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent" />

        <TextView
            android:id="@+id/item_content_tv"
            android:layout_width="0dp"
            android:layout_height="@dimen/dp_23"
            android:layout_marginStart="16dp"
            android:layout_marginTop="19dp"
            android:layout_height="@dimen/dp_20"
            android:layout_marginStart="6dp"
            android:layout_marginTop="16dp"
            android:layout_marginEnd="@dimen/dp_5"
            android:ellipsize="end"
            android:gravity="center_vertical"
            android:singleLine="true"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_16"
            android:textStyle="bold"
            app:layout_constraintEnd_toStartOf="@+id/item_estate_tv"
            app:layout_constraintStart_toStartOf="parent"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_14"
            app:layout_constraintStart_toEndOf="@+id/item_estate_tv"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintTop_toTopOf="parent" />

        <TextView
            android:id="@+id/item_home_name_tv"
            android:layout_width="wrap_content"
            android:layout_height="@dimen/dp_17"
            android:layout_marginTop="@dimen/dp_6"
            android:textColor="@color/text_66000000"
            android:layout_height="16.5dp"
            android:layout_marginTop="14.5dp"
            android:textColor="@color/text_66FFFFFF"
            android:textSize="@dimen/text_12"
            app:layout_constraintStart_toStartOf="@+id/item_content_tv"
            app:layout_constraintStart_toStartOf="@+id/item_estate_tv"
            app:layout_constraintTop_toBottomOf="@+id/item_content_tv" />

        <TextView
            android:id="@+id/item_time_tv"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginTop="@dimen/dp_6"
            android:layout_height="16.5dp"
            android:layout_marginTop="@dimen/dp_8"
            android:gravity="center_vertical"
            android:textColor="@color/text_66000000"
            android:textColor="@color/text_66FFFFFF"
            android:textSize="@dimen/text_12"
            app:layout_constraintStart_toStartOf="@+id/item_home_name_tv"
            app:layout_constraintStart_toStartOf="@+id/item_estate_tv"
            app:layout_constraintTop_toBottomOf="@+id/item_home_name_tv" />

        <TextView
            android:id="@+id/item_estate_tv"
            android:layout_width="wrap_content"
            android:layout_height="@dimen/dp_33"
            android:background="@drawable/state_ffb300"
            android:gravity="center"
            android:paddingStart="@dimen/dp_12"
            android:paddingEnd="@dimen/dp_12"
            android:text="@string/message_alarm"
            android:textColor="@color/text_FFFFFFFF"
            android:textSize="@dimen/text_12"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintTop_toTopOf="parent" />

    </androidx.constraintlayout.widget.ConstraintLayout>

</androidx.constraintlayout.widget.ConstraintLayout>

 app/src/main/res/layout/item_type_title.xml

@@ -11,7 +11,7 @@
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_20"
        android:gravity="center"
        android:textColor="@color/text_E6000000"
        android:textColor="@color/text_E6FFFFFF"
        android:textSize="@dimen/text_14"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
@@ -25,7 +25,7 @@
        android:layout_width="match_parent"
        android:layout_height="0.5dp"
        android:layout_marginBottom="0.5dp"
        android:background="@color/text_EDEFF2"
        android:background="@color/text_1AFFFFFF"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintEnd_toStartOf="parent" />

 app/src/main/res/layout/toolbar_top_view_52.xml

@@ -3,7 +3,7 @@
    android:id="@+id/top_bar_view"
    android:layout_width="match_parent"
    android:layout_height="@dimen/dp_52"
    android:background="@color/text_245EC3"
    android:background="@color/text_FF161616"
    android:orientation="horizontal">

    <!--1.返回按钮 增大点击区域-->
@@ -16,8 +16,8 @@
        android:visibility="gone">

        <ImageView
            android:layout_width="@dimen/dp_24"
            android:layout_height="@dimen/dp_24"
            android:layout_width="@dimen/dp_30"
            android:layout_height="@dimen/dp_30"
            android:layout_gravity="center"
            android:layout_marginStart="@dimen/dp_16"
            android:scaleType="centerInside"
@@ -35,7 +35,7 @@
        android:fontFamily="sans-serif-medium"
        android:gravity="center"
        android:maxLines="1"
        android:textColor="@color/text_FFFFFFFF"
        android:textColor="@color/text_E6FFFFFF"
        android:textSize="@dimen/text_18" />

    <!--3.更多按钮 默认隐藏-->