parent: 22c83310 | 补丁 | 提交 | ignore whitespace
wjc
2024-11-27 f15ce517f0ed2f37526cb1d720ffae107f832f0a 
2024年11月27日20:51:03
7个文件已修改
184 ■■■■■ 已修改文件
app/src/main/java/com/hdl/photovoltaic/ui/adapter/SearchMessageAdapter.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/activity_message_info.xml 76 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/activity_search_messge.xml 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/item_message.xml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/item_search_message.xml 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/line_message_info.xml 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 app/src/main/java/com/hdl/photovoltaic/ui/adapter/SearchMessageAdapter.java


@@ -50,16 +50,16 @@


        String date = TimeUtils.getTimeFromTimestamp(messageBean.getCreateTime());


        itemHolder.message_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);


        }


        itemHolder.message_state_tv.setText(type);


        itemHolder.message_state_tv.setBackground(drawable);




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


@@ -244,16 +244,16 @@


     */


    private void stateStyle(TextView textView) {


        String type = "";//FAULT:故障,WARN:告警,EVENT:事件


        Drawable drawable = AppCompatResources.getDrawable(_mActivity, R.drawable.alarm_ffb300);


        Drawable drawable = AppCompatResources.getDrawable(_mActivity, R.drawable.device_satte_ffb300);


        if (mMessageBean.getType().equals(MessageAlarmStateType.fault)) {


            type = _mActivity.getString(R.string.my_power_station_malfunction);


            drawable = AppCompatResources.getDrawable(_mActivity, R.drawable.alarm_e34343);


            drawable = AppCompatResources.getDrawable(_mActivity, R.drawable.device_state_fff55252);


        } else if (mMessageBean.getType().equals(MessageAlarmStateType.warn)) {


            type = _mActivity.getString(R.string.message_alarm);


            drawable = AppCompatResources.getDrawable(_mActivity, R.drawable.alarm_ffb300);


            drawable = AppCompatResources.getDrawable(_mActivity, R.drawable.device_satte_ffb300);


        } else if (mMessageBean.getType().equals(MessageAlarmStateType.event)) {


            type = _mActivity.getString(R.string.loading_title_tip);


            drawable = AppCompatResources.getDrawable(_mActivity, R.drawable.state_b9b9b9);


            drawable = AppCompatResources.getDrawable(_mActivity, R.drawable.device_state_ffb9b9b9);


        }


        textView.setText(type);


        textView.setBackground(drawable);




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


@@ -22,31 +22,33 @@


        app:layout_constraintStart_toStartOf="parent"


        app:layout_constraintTop_toBottomOf="@+id/toolbar_top_in">






        <TextView


            android:id="@+id/message_info_home_name_tv"


            android:layout_width="wrap_content"


            android:layout_height="@dimen/dp_21"


            android:id="@+id/message_info_alarm_state_tv"


            android:layout_width="7dp"


            android:layout_height="7dp"


            android:layout_marginStart="@dimen/dp_16"


            android:layout_marginTop="@dimen/dp_13"


            android:gravity="center"


            android:textColor="@color/text_030D1C"


            android:textSize="@dimen/text_15"


            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/message_info_alarm_state_tv"


            android:layout_width="wrap_content"


            android:layout_height="32.5dp"


            android:background="@drawable/alarm_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"


            android:id="@+id/message_info_home_name_tv"


            android:layout_width="0dp"


            android:layout_height="22.5dp"


            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_E6FFFFFF"


            android:textSize="@dimen/text_16"


            app:layout_constraintEnd_toEndOf="parent"


            app:layout_constraintStart_toEndOf="@+id/message_info_alarm_state_tv"


            app:layout_constraintTop_toTopOf="parent" />






        <LinearLayout


            android:layout_width="match_parent"


@@ -60,18 +62,33 @@


            <include


                android:id="@+id/message_info_alarm_content_in"


                layout="@layout/line_message_info" />




            <View


            <!--隔间+间隔线¬-->


            <LinearLayout


                android:layout_width="match_parent"


                android:layout_height="@dimen/dp_33" />


                android:layout_height="@dimen/dp_32"


                android:gravity="center">




                <View


                    android:layout_width="match_parent"


                    android:layout_height="0.5dp"


                    android:background="@color/text_1AFFFFFF" />


            </LinearLayout>




            <include


                android:id="@+id/message_info_alarm_device_in"


                layout="@layout/line_message_info" />




            <View


            <!--隔间+间隔线¬-->


            <LinearLayout


                android:layout_width="match_parent"


                android:layout_height="@dimen/dp_33" />


                android:layout_height="@dimen/dp_32"


                android:gravity="center">




                <View


                    android:layout_width="match_parent"


                    android:layout_height="0.5dp"


                    android:background="@color/text_1AFFFFFF" />


            </LinearLayout>


            <!--产品说硬件没做 隐藏掉 2024年05月28日13:46:53-->


            <include


                android:id="@+id/message_info_alarm_range_in"


@@ -86,10 +103,17 @@


            <include


                android:id="@+id/message_info_power_station_location_in"


                layout="@layout/line_message_info" />




            <View


            <!--隔间+间隔线¬-->


            <LinearLayout


                android:layout_width="match_parent"


                android:layout_height="@dimen/dp_33" />


                android:layout_height="@dimen/dp_32"


                android:gravity="center">




                <View


                    android:layout_width="match_parent"


                    android:layout_height="0.5dp"


                    android:background="@color/text_1AFFFFFF" />


            </LinearLayout>




            <include


                android:id="@+id/message_info_alarm_time_in"


@@ -97,7 +121,7 @@




            <View


                android:layout_width="match_parent"


                android:layout_height="@dimen/dp_18" />


                android:layout_height="@dimen/dp_16" />




        </LinearLayout>






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


@@ -4,7 +4,7 @@


    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.SearchMessageActivity">


    <!--搜索-->


    <RelativeLayout


@@ -62,8 +62,8 @@


                android:background="@null"


                android:gravity="start|center_vertical"


                android:hint="@string/enter_alarm_name"


                android:textColor="@color/text_E6000000"


                android:textColorHint="@color/text_66000000"


                android:textColor="@color/text_E6FFFFFF"


                android:textColorHint="@color/text_66FFFFFF"


                android:textSize="@dimen/text_14" />




            <ImageView


@@ -85,8 +85,8 @@


            android:layout_marginEnd="@dimen/dp_21"


            android:gravity="center"


            android:text="@string/search"


            android:textColor="@color/text_E6000000"


            android:textSize="@dimen/text_16" />


            android:textColor="@color/text_E6FFFFFF"


            android:textSize="@dimen/text_14" />






    </RelativeLayout>


@@ -108,9 +108,8 @@


            android:layout_marginTop="@dimen/dp_23"


            android:layout_marginEnd="@dimen/dp_21"


            android:text="@string/history_search"


            android:textColor="@color/text_E6000000"


            android:textColor="@color/text_E6FFFFFF"


            android:textSize="@dimen/text_16"


            android:textStyle="bold"


            app:layout_constraintStart_toStartOf="parent"


            app:layout_constraintTop_toTopOf="parent" />






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


@@ -31,7 +31,7 @@


            android:layout_height="7dp"


            android:layout_marginStart="@dimen/dp_16"


            android:layout_marginTop="22.5dp"


            android:background="@drawable/device_state_ff38c494"


            android:background="@drawable/device_state_ffb9b9b9"


            app:layout_constraintStart_toStartOf="parent"


            app:layout_constraintTop_toTopOf="parent" />






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


@@ -4,37 +4,50 @@


    android:layout_width="match_parent"


    android:layout_height="@dimen/dp_127">




<!--    <ImageView-->


<!--        android:id="@+id/message_search_iv"-->


<!--        android:layout_width="@dimen/dp_18"-->


<!--        android:layout_height="@dimen/dp_18"-->


<!--        android:layout_marginStart="@dimen/dp_16"-->


<!--        android:src="@drawable/search_path"-->


<!--        app:layout_constraintStart_toStartOf="parent"-->


<!--        app:layout_constraintTop_toTopOf="parent" />-->


    <!--    <ImageView-->


    <!--        android:id="@+id/message_search_iv"-->


    <!--        android:layout_width="@dimen/dp_18"-->


    <!--        android:layout_height="@dimen/dp_18"-->


    <!--        android:layout_marginStart="@dimen/dp_16"-->


    <!--        android:src="@drawable/search_path"-->


    <!--        app:layout_constraintStart_toStartOf="parent"-->


    <!--        app:layout_constraintTop_toTopOf="parent" />-->




    <androidx.constraintlayout.widget.ConstraintLayout


        android:layout_width="0dp"


        android:layout_height="@dimen/dp_99"


        android:layout_marginStart="@dimen/dp_16"


        android:layout_marginEnd="@dimen/dp_21"


        android:background="@drawable/bj_13fffffff"


        android:background="@drawable/search_bj_ff333738"


        app:layout_constraintEnd_toEndOf="parent"


        app:layout_constraintStart_toStartOf="parent"


        app:layout_constraintTop_toTopOf="parent">






        <TextView


            android:id="@+id/message_state_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_ffb9b9b9"


            app:layout_constraintStart_toStartOf="parent"


            app:layout_constraintTop_toTopOf="parent" />




        <TextView


            android:id="@+id/message_name_tv"


            android:layout_width="wrap_content"


            android:layout_height="@dimen/dp_23"


            android:layout_marginStart="@dimen/dp_16"


            android:layout_marginTop="@dimen/dp_19"


            android:layout_width="0dp"


            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_constraintStart_toStartOf="parent"


            android:textColor="@color/text_E6FFFFFF"


            android:textSize="@dimen/text_14"


            app:layout_constraintEnd_toEndOf="parent"


            app:layout_constraintStart_toEndOf="@+id/message_state_tv"


            app:layout_constraintTop_toTopOf="parent" />




        <TextView


@@ -42,9 +55,9 @@


            android:layout_width="wrap_content"


            android:layout_height="@dimen/dp_17"


            android:layout_marginTop="@dimen/dp_6"


            android:textColor="@color/text_66000000"


            android:textColor="@color/text_66FFFFFF"


            android:textSize="@dimen/text_12"


            app:layout_constraintStart_toStartOf="@+id/message_name_tv"


            app:layout_constraintStart_toStartOf="@+id/message_state_tv"


            app:layout_constraintTop_toBottomOf="@+id/message_name_tv" />




        <TextView


@@ -52,23 +65,11 @@


            android:layout_width="wrap_content"


            android:layout_height="@dimen/dp_17"


            android:layout_marginTop="@dimen/dp_6"


            android:textColor="@color/text_66000000"


            android:textColor="@color/text_66FFFFFF"


            android:textSize="@dimen/text_12"


            app:layout_constraintStart_toStartOf="@+id/message_content_tv"


            app:layout_constraintStart_toStartOf="@+id/message_state_tv"


            app:layout_constraintTop_toBottomOf="@+id/message_content_tv" />




        <TextView


            android:id="@+id/message_state_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: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/line_message_info.xml


@@ -8,12 +8,12 @@


    <TextView


        android:id="@+id/left_title_tv"


        android:layout_width="wrap_content"


        android:layout_height="16.5dp"


        android:layout_height="20dp"


        android:layout_alignParentStart="true"


        android:layout_centerInParent="true"


        android:gravity="center"


        android:textColor="@color/text_565758"


        android:textSize="@dimen/text_12" />


        android:textColor="@color/text_E6FFFFFF"


        android:textSize="@dimen/text_14" />




    <TextView


        android:id="@+id/right_content_tv"


@@ -22,8 +22,8 @@


        android:layout_alignParentEnd="true"


        android:layout_centerVertical="true"


        android:gravity="end"


        android:textColor="@color/text_565758"


        android:textSize="@dimen/text_12" />


        android:textColor="@color/text_E6FFFFFF"


        android:textSize="@dimen/text_14" />






</RelativeLayout>