红包记录的修改

jixin/src/main/java/com/jixin/im/ui/me/redpacket/RedDetailsActivity.java

@@ -1,6 +1,7 @@
 package com.jixin.im.ui.me.redpacket;
 
 import android.content.Intent;
+import android.graphics.PorterDuff;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
@@ -16,12 +17,14 @@ import com.jixin.im.R;
 import com.jixin.im.bean.Friend;
 import com.jixin.im.bean.RoomMember;
 import com.jixin.im.bean.redpacket.OpenRedpacket;
+import com.jixin.im.db.InternationalizationHelper;
 import com.jixin.im.db.dao.FriendDao;
 import com.jixin.im.db.dao.RoomMemberDao;
 import com.jixin.im.helper.AvatarHelper;
 import com.jixin.im.helper.DialogHelper;
 import com.jixin.im.ui.base.BaseActivity;
 import com.jixin.im.ui.base.CoreManager;
+import com.jixin.im.view.SkinImageView;
 import com.xuan.xuanhttplibrary.okhttp.HttpUtils;
 import com.xuan.xuanhttplibrary.okhttp.callback.BaseCallback;
 import com.xuan.xuanhttplibrary.okhttp.result.ObjectResult;
@@ -84,8 +87,24 @@ public class RedDetailsActivity extends BaseActivity implements View.OnClickList
 
     private void initView() {
         getSupportActionBar().hide();
+        findViewById(R.id.mergerStatus).setBackgroundColor(getResources().getColor(R.color.transparent));
+        findViewById(R.id.iv_title_left).setOnClickListener(view -> finish());
+        TextView tvTitle = findViewById(R.id.tv_title_center);
+        tvTitle.setText("红包详情");
 
-        red_head_iv = (ImageView) findViewById(R.id.red_head_iv);
+
+        tvTitle.setTextColor(getResources().getColor(R.color.white));
+
+        TextView tvTitleRight = findViewById(R.id.tv_title_right);
+        tvTitleRight.setText("红包记录");
+        tvTitleRight.setTextColor(getResources().getColor(R.color.white));
+        tvTitleRight.setOnClickListener(v -> {
+            Intent intent = new Intent(RedDetailsActivity.this, RedListActivity.class);
+            startActivity(intent);
+        });
+
+
+        red_head_iv = (ImageView) findViewById(R.id.iv_avatar);
         red_nickname_tv = (TextView) findViewById(R.id.red_nickname_tv);
         red_words_tv = (TextView) findViewById(R.id.red_words_tv);
         red_money_tv = (TextView) findViewById(R.id.get_money_tv);
@@ -107,8 +126,6 @@ public class RedDetailsActivity extends BaseActivity implements View.OnClickList
         }
 
         red_reply_tv.setOnClickListener(this);
-        findViewById(R.id.red_back_tv).setOnClickListener(this);
-        findViewById(R.id.get_redlist_tv).setOnClickListener(this);
     }
 
     private void showData() {
@@ -165,12 +182,8 @@ public class RedDetailsActivity extends BaseActivity implements View.OnClickList
 
     @Override
     public void onClick(View v) {
-        if (v.getId() == R.id.iv_title_left || v.getId() == R.id.red_back_tv) {
-            finish();
-        } else if (v.getId() == R.id.get_redlist_tv) {
-            Intent intent = new Intent(RedDetailsActivity.this, RedListActivity.class);
-            startActivity(intent);
-        } else if (v.getId() == R.id.reply_red_tv) {
+
+       if (v.getId() == R.id.reply_red_tv) {
             DialogHelper.showLimitSingleInputDialog(this, getString(R.string.replay),
                     getString(R.string.reply_red_thank) + getString(R.string.input_most_length, 10), 1, 1, 10, v1 -> {
                         final String text = ((EditText) v1).getText().toString().trim();

jixin/src/main/res/layout/activity_redpacket_details.xml

@@ -1,71 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="#ededed"
     android:orientation="vertical">
 
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="160dp"
-        android:background="@color/normal_bg">
 
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="120dp"
-            android:background="@drawable/ai2"
-            android:paddingTop="20dp">
-
-            <RelativeLayout
-                android:id="@+id/title_ly"
-                android:layout_width="match_parent"
-                android:layout_height="50dp">
-
-                <ImageView
-                    android:id="@+id/red_back_tv"
-                    android:layout_marginLeft="15dp"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:src="@mipmap/return_icon"
-                    android:tint="@color/white" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:text="@string/title_red_packet"
-                    android:textColor="@color/white"
-                    android:textSize="18sp" />
-
-                <TextView
-                    android:id="@+id/get_redlist_tv"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-                    android:layout_marginRight="10dp"
-                    android:text="@string/red_packet_history"
-                    android:textColor="@color/white"
-                    android:textSize="15sp" />
-
-            </RelativeLayout>
 
-        </RelativeLayout>
+    <ImageView
+        android:id="@+id/iv_bg"
+        android:layout_width="match_parent"
+        android:layout_height="174dp"
+        android:scaleType="fitXY"
+        android:src="@mipmap/red_packet_details_bg" />
 
-        <com.jixin.im.view.CircleImageView
-            android:id="@+id/red_head_iv"
-            android:layout_width="80dp"
-            android:layout_height="80dp"
-            android:layout_gravity="center"
-            android:layout_marginTop="40dp"
-            android:src="@drawable/avatar_normal" />
 
-    </FrameLayout>
+    <include
+        android:id="@+id/mergerStatus"
+        layout="@layout/a_view_actionbar"
+        android:layout_width="match_parent"
+        android:layout_height="72dp" />
+
 
     <LinearLayout
+        android:layout_marginTop="36dp"
+        android:id="@+id/ll_part_center"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_below="@+id/iv_bg"
         android:background="@color/normal_bg"
         android:gravity="center_horizontal"
         android:orientation="vertical"
@@ -75,7 +40,7 @@
             android:id="@+id/red_nickname_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="12dp"
             android:text="@string/someone_s_red_packet"
             android:textColor="@color/black"
             android:textSize="14sp" />
@@ -130,29 +95,52 @@
 
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/red_resultmsg_tv"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:gravity="center_vertical"
-        android:paddingLeft="10dp"
-        android:text="@string/example_red_packet_remain"
-        android:textColor="@color/Grey_600"
-        android:textSize="14sp"
-        android:visibility="visible" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0.1dp"
-        android:background="@color/normal_bg" />
+    <LinearLayout
 
-    <ListView
-        android:id="@+id/red_details_lsv"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:divider="@color/normal_bg"
-        android:dividerHeight="0.1dip"
-        android:footerDividersEnabled="false"
-        android:headerDividersEnabled="false" />
 
-</LinearLayout>
+        android:layout_below="@+id/ll_part_center"
+
+        android:background="@color/white"
+
+        android:orientation="vertical">
+
+
+        <TextView
+            android:id="@+id/red_resultmsg_tv"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:gravity="center_vertical"
+            android:paddingLeft="10dp"
+            android:text="@string/example_red_packet_remain"
+            android:textColor="@color/Grey_600"
+            android:textSize="14sp"
+            android:visibility="visible" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.1dp"
+            android:background="@color/normal_bg" />
+
+        <ListView
+            android:id="@+id/red_details_lsv"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:divider="@color/normal_bg"
+            android:dividerHeight="0.1dip"
+            android:footerDividersEnabled="false"
+            android:headerDividersEnabled="false" />
+    </LinearLayout>
+
+    <com.makeramen.roundedimageview.RoundedImageView
+        android:id="@+id/iv_avatar"
+        android:layout_width="72dp"
+
+        android:layout_height="72dp"
+        android:layout_alignBottom="@+id/iv_bg"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="-36dp"
+        app:riv_oval="true" />
+
+</RelativeLayout>

jixin/src/main/res/layout/reditem_layout.xml

@@ -73,7 +73,7 @@
             android:layout_width="match_parent"
             android:layout_height="30dp"
             android:layout_below="@+id/top_ll"
-            android:gravity="center_vertical"
+            android:gravity="bottom"
             android:text="2016-01-01 14:25"
             android:textSize="12sp" />
 

jixin/src/main/res/values/colors.xml

@@ -85,7 +85,7 @@
     <color name="color_role5">#f23744</color>
     <color name="color_role6">#EBEBEB</color>
 
-    <color name="redpacket_bg_new">#FD7070</color>
+    <color name="redpacket_bg_new">#FF462F</color>
     <color name="redpacket_bg">#D85940</color>
     <color name="color_read_unread_item">#FF9C00</color>