yutou/test
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix [调整完善信息UI]

Browse Source 
fix [站内分享 列表下标问题]
This commit is contained in:
zlzw 2024-04-02 17:54:01 +08:00
parent 4685b7979b
commit dc65e2bdd3
11 changed files with 148 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Share/src/main/java/com/yunbao/share/adapters/InternalShareAdapter.java
View File

@ -79,6 +79,10 @@ public class InternalShareAdapter extends RecyclerView.Adapter<InternalShareAdap
return selectPosition; return selectPosition;
} }
public List<SingleConversation> getListData() {
return listData;
}
public class EmptyViewHolder extends ViewHolder { public class EmptyViewHolder extends ViewHolder {
public EmptyViewHolder(@NonNull View itemView) { public EmptyViewHolder(@NonNull View itemView) {

2
Share/src/main/java/com/yunbao/share/ui/AppInternalShareDialog.java
View File

@ -73,7 +73,7 @@ public class AppInternalShareDialog extends AbsDialogFullScreenPopupWindow {
return; return;
} }
if (onItemClickListener != null) { if (onItemClickListener != null) {
onItemClickListener.onItemClick(listData.get(adapter.getSelectPosition()).mCore.getTargetId(), adapter.getSelectPosition()); onItemClickListener.onItemClick(adapter.getListData().get(adapter.getSelectPosition()).mCore.getTargetId(), adapter.getSelectPosition());
} }
dismiss(); dismiss();
}); });

2
common/src/main/java/com/yunbao/common/http/PDLiveApi.java
View File

@ -1227,7 +1227,7 @@ public interface PDLiveApi {
); );
@Multipart @Multipart
@POST("/api/public/?service=Friendappinfos.updateAvatar") @POST("/api/public/?service=Pdlinfos.updateAvatar")
Observable<ResponseModel<AvatarBean>> updateFile(@Part MultipartBody.Part file, @Query("uid") String uid, @Query("token") String token); Observable<ResponseModel<AvatarBean>> updateFile(@Part MultipartBody.Part file, @Query("uid") String uid, @Query("token") String token);
@Multipart @Multipart

9
common/src/main/res/drawable/bg_msg_address_book_user_btn_fan_cuia.xml Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:width="68dp" android:height="37dp">
<shape android:shape="rectangle">
<gradient android:type="linear" android:useLevel="true" android:startColor="#ffff83c6" android:endColor="#ffeb6fff" android:angle="180" />
<corners android:topLeftRadius="39dp" android:topRightRadius="39dp" android:bottomLeftRadius="39dp" android:bottomRightRadius="39dp" />
</shape>
</item>
</selector>

1
common/src/main/res/values/colors.xml
View File

@ -3,6 +3,7 @@
<color name="colorPrimary">@color/global</color> <color name="colorPrimary">@color/global</color>
<color name="colorPrimaryDark">@color/global</color> <color name="colorPrimaryDark">@color/global</color>
<color name="colorAccent">@color/global</color> <color name="colorAccent">@color/global</color>
<color name="colorMainTab">#333333</color>
<color name="color_normalitem">#FF0000</color> <color name="color_normalitem">#FF0000</color>
<color name="color_white">#ffffff</color> <color name="color_white">#ffffff</color>
<color name="color_selectedlitem">#303F9F</color> <color name="color_selectedlitem">#303F9F</color>

2
main/src/main/res/drawable/dialog_bg_chat_status_config_unselect.xml
View File

@ -2,7 +2,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:width="100dp" android:height="100dp"> <item android:width="100dp" android:height="100dp">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="#ffefefef" /> <solid android:color="#F7F7F7" />
<corners android:topLeftRadius="15dp" android:topRightRadius="15dp" android:bottomLeftRadius="15dp" android:bottomRightRadius="15dp" /> <corners android:topLeftRadius="15dp" android:topRightRadius="15dp" android:bottomLeftRadius="15dp" android:bottomRightRadius="15dp" />
</shape> </shape>
</item> </item>

9
main/src/main/res/drawable/dialog_bg_msg_hi_config_unselect_cuia.xml Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:width="345dp" android:height="60dp">
<shape android:shape="rectangle">
<solid android:color="#F7F7F7" />
<corners android:topLeftRadius="15dp" android:topRightRadius="15dp" android:bottomLeftRadius="15dp" android:bottomRightRadius="15dp" />
</shape>
</item>
</selector>

34
main/src/main/res/layout/activity_user_info.xml
View File

@ -15,6 +15,7 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<ImageView <ImageView
android:id="@+id/imageView11" android:id="@+id/imageView11"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -31,6 +32,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="28dp" android:layout_marginStart="28dp"
android:textStyle="bold"
android:layout_marginTop="100dp" android:layout_marginTop="100dp"
android:text="@string/activity_reg_user_info_title" android:text="@string/activity_reg_user_info_title"
android:textColor="#333333" android:textColor="#333333"
@ -57,8 +59,8 @@
android:background="@drawable/bg_btn_activity_user_info_avatar_change" android:background="@drawable/bg_btn_activity_user_info_avatar_change"
android:maxLines="2" android:maxLines="2"
android:text="@string/activity_reg_user_info_avatar_change" android:text="@string/activity_reg_user_info_avatar_change"
android:textSize="13sp"
android:textAllCaps="false" android:textAllCaps="false"
android:textSize="13sp"
app:autoSizeMaxTextSize="13sp" app:autoSizeMaxTextSize="13sp"
app:autoSizeMinTextSize="5sp" app:autoSizeMinTextSize="5sp"
app:autoSizeStepGranularity="1sp" app:autoSizeStepGranularity="1sp"
@ -105,7 +107,7 @@
<include <include
android:id="@+id/text_1" android:id="@+id/text_1"
layout="@layout/view_message_hi_config_item_edit" layout="@layout/view_message_hi_config_item_edit_cuia"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_marginStart="26dp" android:layout_marginStart="26dp"
@ -118,9 +120,11 @@
<LinearLayout <LinearLayout
android:id="@+id/sex_layout" android:id="@+id/sex_layout"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_marginStart="26dp"
android:layout_marginEnd="26dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/title2"> app:layout_constraintTop_toBottomOf="@+id/title2">
@ -128,21 +132,23 @@
<include <include
android:id="@+id/sex_man" android:id="@+id/sex_man"
layout="@layout/view_user_info_sex" layout="@layout/view_user_info_sex"
android:layout_width="153dp" android:layout_width="0dp"
android:layout_height="72dp" android:layout_height="82dp"
android:layout_marginEnd="17dp" /> android:layout_marginEnd="17dp"
android:layout_weight="1" />
<include <include
android:id="@+id/sex_woman" android:id="@+id/sex_woman"
layout="@layout/view_user_info_sex" layout="@layout/view_user_info_sex"
android:layout_width="153dp" android:layout_width="0dp"
android:layout_height="72dp" /> android:layout_height="82dp"
android:layout_weight="1" />
</LinearLayout> </LinearLayout>
<include <include
android:id="@+id/birthday" android:id="@+id/birthday"
layout="@layout/view_user_info_birthday" layout="@layout/view_user_info_birthday_cuia"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_marginStart="26dp" android:layout_marginStart="26dp"
@ -163,17 +169,17 @@
app:layout_constraintStart_toEndOf="@+id/title2" app:layout_constraintStart_toEndOf="@+id/title2"
app:layout_constraintTop_toTopOf="@+id/title2" /> app:layout_constraintTop_toTopOf="@+id/title2" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<Button <Button
android:id="@+id/submit" android:id="@+id/submit"
android:layout_width="186dp" android:layout_width="186dp"
android:layout_height="54dp" android:layout_height="54dp"
android:layout_gravity="center"
android:layout_marginTop="42dp"
android:layout_marginBottom="32dp" android:layout_marginBottom="32dp"
android:background="@drawable/bg_msg_address_book_user_btn_fan" android:background="@drawable/bg_msg_address_book_user_btn_fan_cuia"
android:text="@string/activity_reg_user_info_submit" android:text="@string/activity_reg_user_info_submit"
android:textAllCaps="false" android:textAllCaps="false"
android:textColor="#FFFFFF" android:textColor="#FFFFFF" />
android:layout_marginTop="42dp"
android:layout_gravity="center"
/>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

8
main/src/main/res/layout/view_homemain.xml
View File

@ -47,7 +47,7 @@
app:tbn_checked="true" app:tbn_checked="true"
app:tbn_icon_array_id="@array/main_tab_home" app:tbn_icon_array_id="@array/main_tab_home"
app:tbn_icon_size="28dp" app:tbn_icon_size="28dp"
app:tbn_text_color_checked="@color/colorAccent" app:tbn_text_color_checked="@color/colorMainTab"
app:tbn_text_color_unchecked="@color/gray1" app:tbn_text_color_unchecked="@color/gray1"
app:tbn_text_size="11sp" app:tbn_text_size="11sp"
app:tbn_tip="@string/main_home" /> app:tbn_tip="@string/main_home" />
@ -59,7 +59,7 @@
android:layout_weight="1" android:layout_weight="1"
app:tbn_icon_array_id="@array/main_tab_video" app:tbn_icon_array_id="@array/main_tab_video"
app:tbn_icon_size="28dp" app:tbn_icon_size="28dp"
app:tbn_text_color_checked="@color/colorAccent" app:tbn_text_color_checked="@color/colorMainTab"
app:tbn_text_color_unchecked="@color/gray1" app:tbn_text_color_unchecked="@color/gray1"
app:tbn_text_size="11sp" app:tbn_text_size="11sp"
app:tbn_tip="@string/live" /> app:tbn_tip="@string/live" />
@ -70,7 +70,7 @@
android:layout_weight="1" android:layout_weight="1"
app:tbn_icon_array_id="@array/main_tab_list" app:tbn_icon_array_id="@array/main_tab_list"
app:tbn_icon_size="28dp" app:tbn_icon_size="28dp"
app:tbn_text_color_checked="@color/colorAccent" app:tbn_text_color_checked="@color/colorMainTab"
app:tbn_text_color_unchecked="@color/gray1" app:tbn_text_color_unchecked="@color/gray1"
app:tbn_text_size="11sp" app:tbn_text_size="11sp"
app:tbn_tip="@string/chat" /> app:tbn_tip="@string/chat" />
@ -81,7 +81,7 @@
android:layout_weight="1" android:layout_weight="1"
app:tbn_icon_array_id="@array/main_tab_chat" app:tbn_icon_array_id="@array/main_tab_chat"
app:tbn_icon_size="28dp" app:tbn_icon_size="28dp"
app:tbn_text_color_checked="@color/colorAccent" app:tbn_text_color_checked="@color/colorMainTab"
app:tbn_text_color_unchecked="@color/gray1" app:tbn_text_color_unchecked="@color/gray1"
app:tbn_text_size="11sp" app:tbn_text_size="11sp"
app:tbn_tip="@string/main_me" /> app:tbn_tip="@string/main_me" />

44
main/src/main/res/layout/view_message_hi_config_item_edit_cuia.xml Normal file
View File

@ -0,0 +1,44 @@
<?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="match_parent"
android:layout_height="60dp"
android:background="@drawable/dialog_bg_msg_hi_config_unselect_cuia">
<EditText
android:id="@+id/edit_text"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="15dp"
android:background="@null"
android:hint="@string/dialog_msg_hi_config_text_hint"
android:textColor="#333333"
android:textSize="13sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/edit_edit"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/edit_del"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="15dp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@mipmap/ic_message_hi_config_del" />
<ImageView
android:id="@+id/edit_edit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="10dp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/edit_del"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@mipmap/ic_message_hi_config_edit" />
</androidx.constraintlayout.widget.ConstraintLayout>

54
main/src/main/res/layout/view_user_info_birthday_cuia.xml Normal file
View File

@ -0,0 +1,54 @@
<?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"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/birthday_layout"
android:layout_width="match_parent"
android:layout_height="60dp"
android:background="@drawable/dialog_bg_msg_hi_config_unselect_cuia">
<TextView
android:id="@+id/audio_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:text="@string/activity_reg_user_info_birthday_text"
android:textColor="#333333"
android:textSize="13sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/audio_image"
android:layout_width="8dp"
android:layout_height="10dp"
android:layout_marginEnd="10dp"
android:src="@mipmap/icon_arrow_right"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:tint="#777777" />
<ImageView
android:id="@+id/audio_del"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="15dp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@mipmap/ic_message_hi_config_del" />
<ImageView
android:id="@+id/audio_play"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="10dp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/audio_del"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@mipmap/ic_message_hi_config_play" />
</androidx.constraintlayout.widget.ConstraintLayout>