Browse Source

1.替换UI

王鹏鹏 2 years ago
parent
commit
34d97ac18f

+ 2 - 0
.idea/misc.xml

@@ -488,6 +488,8 @@
         <entry key="..\:/workspace/hcp-pads/personalcenter/src/main/res/layout/activity_setting.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/personalcenter/src/main/res/layout/layout_setting_item.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/push/src/main/res/layout/activity_messge_list.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pads/push/src/main/res/layout/item_push_list.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pads/push/src/main/res/layout/item_push_type.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/layout/activity_service_package.xml" value="0.6" />
         <entry key="..\:/workspace/yingyangfly/app/src/main/res/layout/activity_main.xml" value="0.22826086956521738" />
         <entry key="..\:/workspace/yingyangfly/app/src/main/res/layout/activity_push.xml" value="0.22239583333333332" />

+ 1 - 1
push/src/main/java/com/yingyang/push/adapter/PushListAdapter.kt

@@ -35,7 +35,7 @@ class PushListAdapter(override val layoutId: Int = R.layout.item_push_list) :
         }
         if (TextUtils.equals("0", item.status)) {
             binding.tvStatus.text = "已读"
-            binding.tvStatus.setTextColorResource(R.color.color_FF4A76FF)
+            binding.tvStatus.setTextColorResource(R.color.color_0a374a)
         } else {
             binding.tvStatus.text = "未读"
             binding.tvStatus.setTextColorResource(R.color.color_FFFF2B2B)

+ 2 - 4
push/src/main/java/com/yingyang/push/adapter/PushTypeAdapter.kt

@@ -26,11 +26,9 @@ class PushTypeAdapter(override val layoutId: Int = R.layout.item_push_type) :
     ) {
         binding.data = item
         if (currentPosition == position) {
-            binding.tvType.setTextColorResource(R.color.color_FF4A76FF)
-            binding.messageLayout.setBackgroundResource(R.mipmap.icon_train_selected)
-        } else {
             binding.tvType.setTextColorResource(R.color.color_ffffff)
-            binding.messageLayout.setBackgroundResource(R.color.color_00000000)
+        } else {
+            binding.tvType.setTextColorResource(R.color.color_0a374a)
         }
         binding.tvType.setOnSingleClickListener {
             currentPosition = position

+ 2 - 2
push/src/main/res/layout/activity_messge_list.xml

@@ -6,7 +6,7 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         style="@style/push_layout_properties_specify_width_geight"
-        android:background="@mipmap/icon_uniform_background">
+        android:background="@mipmap/icon_bg_live_broadcast">
 
         <LinearLayout
             android:id="@+id/layoutHead"
@@ -65,7 +65,7 @@
                     style="@style/push_layout_properties_self_adaption"
                     android:layout_marginTop="@dimen/divider_31px"
                     android:text="@string/notify"
-                    android:textColor="@color/color_FF4A76FF"
+                    android:textColor="@color/color_0a374a"
                     android:textSize="@dimen/divider_42px"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"

+ 3 - 3
push/src/main/res/layout/item_push_list.xml

@@ -31,7 +31,7 @@
             style="@style/push_layout_properties_self_adaption"
             android:layout_marginStart="@dimen/divider_8px"
             android:text="@{data.msgType}"
-            android:textColor="@color/color_FF4A76FF"
+            android:textColor="@color/color_0a374a"
             android:textSize="@dimen/divider_28px"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toEndOf="@+id/imageTips"
@@ -40,7 +40,7 @@
         <TextView
             style="@style/push_layout_properties_self_adaption"
             android:text="@{data.msgTitle}"
-            android:textColor="@color/color_FF4A76FF"
+            android:textColor="@color/color_0a374a"
             android:textSize="@dimen/divider_24px"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -52,7 +52,7 @@
             style="@style/push_layout_properties_self_adaption"
             android:layout_marginTop="@dimen/divider_23px"
             android:layout_marginEnd="@dimen/divider_35px"
-            android:textColor="@color/color_FF2B70FF"
+            android:textColor="@color/color_0a374a"
             android:textSize="@dimen/divider_20px"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />

+ 2 - 1
push/src/main/res/layout/item_push_type.xml

@@ -14,7 +14,8 @@
         android:id="@+id/messageLayout"
         android:layout_width="@dimen/divider_133px"
         android:layout_height="@dimen/divider_55px"
-        android:layout_marginTop="@dimen/divider_40px">
+        android:layout_marginTop="@dimen/divider_40px"
+        android:background="@mipmap/icon_push_text_type">
 
         <TextView
             android:id="@+id/tvType"

BIN
push/src/main/res/mipmap-xxhdpi/icon_bg_live_broadcast.png


BIN
push/src/main/res/mipmap-xxhdpi/icon_push_text_type.png


+ 2 - 1
push/src/main/res/values/colors.xml

@@ -24,5 +24,6 @@
     <color name="color_69B8CFFF" tools:ignore="ResourceName">#69B8CFFF</color>
     <color name="color_FFFF2B2B" tools:ignore="ResourceName">#FFFF2B2B</color>
     <color name="color_ffffff" tools:ignore="ResourceName">#ffffff</color>
-    <color name="color_00000000" tools:ignore="ResourceName">#00000000</color><!-- 透明   -->
+    <color name="color_00000000" tools:ignore="ResourceName">#00000000</color>
+    <color name="color_0a374a" tools:ignore="ResourceName">#0a374a</color>
 </resources>