diff --git a/Share/src/main/java/com/yunbao/share/adapters/InternalShareAdapter.java b/Share/src/main/java/com/yunbao/share/adapters/InternalShareAdapter.java index a4de042..58f6a2d 100644 --- a/Share/src/main/java/com/yunbao/share/adapters/InternalShareAdapter.java +++ b/Share/src/main/java/com/yunbao/share/adapters/InternalShareAdapter.java @@ -79,6 +79,10 @@ public class InternalShareAdapter extends RecyclerView.Adapter getListData() { + return listData; + } + public class EmptyViewHolder extends ViewHolder { public EmptyViewHolder(@NonNull View itemView) { diff --git a/Share/src/main/java/com/yunbao/share/ui/AppInternalShareDialog.java b/Share/src/main/java/com/yunbao/share/ui/AppInternalShareDialog.java index ce2af7c..abb2963 100644 --- a/Share/src/main/java/com/yunbao/share/ui/AppInternalShareDialog.java +++ b/Share/src/main/java/com/yunbao/share/ui/AppInternalShareDialog.java @@ -73,7 +73,7 @@ public class AppInternalShareDialog extends AbsDialogFullScreenPopupWindow { return; } 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(); }); diff --git a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java index 8361570..de489d0 100644 --- a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java +++ b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java @@ -1227,7 +1227,7 @@ public interface PDLiveApi { ); @Multipart - @POST("/api/public/?service=Friendappinfos.updateAvatar") + @POST("/api/public/?service=Pdlinfos.updateAvatar") Observable> updateFile(@Part MultipartBody.Part file, @Query("uid") String uid, @Query("token") String token); @Multipart diff --git a/common/src/main/res/drawable/bg_msg_address_book_user_btn_fan_cuia.xml b/common/src/main/res/drawable/bg_msg_address_book_user_btn_fan_cuia.xml new file mode 100644 index 0000000..6b60d77 --- /dev/null +++ b/common/src/main/res/drawable/bg_msg_address_book_user_btn_fan_cuia.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/common/src/main/res/values/colors.xml b/common/src/main/res/values/colors.xml index d7a566e..df0ac59 100644 --- a/common/src/main/res/values/colors.xml +++ b/common/src/main/res/values/colors.xml @@ -3,6 +3,7 @@ @color/global @color/global @color/global + #333333 #FF0000 #ffffff #303F9F diff --git a/main/src/main/res/drawable/dialog_bg_chat_status_config_unselect.xml b/main/src/main/res/drawable/dialog_bg_chat_status_config_unselect.xml index 2d081c6..a78348e 100644 --- a/main/src/main/res/drawable/dialog_bg_chat_status_config_unselect.xml +++ b/main/src/main/res/drawable/dialog_bg_chat_status_config_unselect.xml @@ -2,7 +2,7 @@ - + diff --git a/main/src/main/res/drawable/dialog_bg_msg_hi_config_unselect_cuia.xml b/main/src/main/res/drawable/dialog_bg_msg_hi_config_unselect_cuia.xml new file mode 100644 index 0000000..0fd16d8 --- /dev/null +++ b/main/src/main/res/drawable/dialog_bg_msg_hi_config_unselect_cuia.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/main/src/main/res/layout/activity_user_info.xml b/main/src/main/res/layout/activity_user_info.xml index 80ad5e8..14966bb 100644 --- a/main/src/main/res/layout/activity_user_info.xml +++ b/main/src/main/res/layout/activity_user_info.xml @@ -15,6 +15,7 @@ + @@ -128,21 +132,23 @@ + android:layout_width="0dp" + android:layout_height="82dp" + android:layout_marginEnd="17dp" + android:layout_weight="1" /> + android:layout_width="0dp" + android:layout_height="82dp" + android:layout_weight="1" /> +