diff --git a/gradle.properties b/gradle.properties index 43532e7..519b76a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -30,7 +30,7 @@ isBuildModule=false android.injected.testOnly=false APP_VERSION_NAME=1.0.0 -APP_VERSION_CODE=115 +APP_VERSION_CODE=117 org.gradle.jvm.toolchain.useLegacyAdapters=false #org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15 diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryDialog.java b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryDialog.java index 3ed5a71..403d247 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryDialog.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryDialog.java @@ -218,6 +218,7 @@ public class GiftLotteryDialog extends BaseMvpDialogFragment data) { - if (data != null){ + if (data != null) { // 取消之前可能存在的任务 clearPendingTasks(); - // 抽奖完成后执行动画滚动 - pendingLotteryRunnable = new Runnable() { + // 抽奖完成后执行动画滚动 + pendingLotteryRunnable = new Runnable() { @Override public void run() { // 清理之前的状态 @@ -487,8 +512,6 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment data) { + isDrawing=false; // 创建并显示对话框 XlhObtainDialog dialog = new XlhObtainDialog(getActivity()); dialog.setOnGiftItemClickListener(new XlhObtainDialog.OnGiftItemClickListener() { @Override public void onPlayAgainClick() { + isDrawing=true; // 处理再玩一次点击事件 MvpPre.xlhChou(roomId, num); } @@ -791,8 +821,10 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment>> getCategories(); @GET(Constants.GET_CIRCLE_LIST) - Observable>> getCircleList(@Query("page") String page, @Query("page_limit") String page_limit); + Call>> getCircleList(@Query("page") String page, @Query("page_limit") String page_limit); @FormUrlEncoded @POST(Constants.GET_USER_HOME_ZONE) diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java b/moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java index 01b62a4..1ae21b3 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java @@ -933,7 +933,25 @@ public class RetrofitClient { } public void getCircleList(String page, String page_limit, BaseObserver> observer) {//动态列表 - sApiServer.getCircleList(page, page_limit).compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.getCircleList(page, page_limit).enqueue(new Callback>>() { + + @Override + public void onResponse(Call>> call, Response>> response) { + if (response.code() == 200){ + BaseModel> listBaseModel = response.body(); + if (listBaseModel != null) { + observer.onNext(listBaseModel.getData()); + } else { + observer.onNext(null); + } + } + } + + @Override + public void onFailure(Call>> call, Throwable t) { + t.printStackTrace(); + } + }); } public void getCircleUserList(String user_id, String page, String page_limit, BaseObserver> observer) {//用户主页动态列表 diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/AvatarFrameView.java b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/AvatarFrameView.java index 49eeeee..87d97b8 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/AvatarFrameView.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/AvatarFrameView.java @@ -406,7 +406,8 @@ public class AvatarFrameView extends FrameLayout implements IAnimListener { Logger.d("AvatarFrameView", "Added to queue, queue size: " + playQueue.size() + ", url: " + url); if (type2==3){ - playNextFromQueue(); +// playNextFromQueue(); + loadSVGA(url); }else { // 如果当前没有在播放，则开始播放 diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomFriendshipWheatView.java b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomFriendshipWheatView.java index d9fec59..d872710 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomFriendshipWheatView.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomFriendshipWheatView.java @@ -111,6 +111,7 @@ public class RoomFriendshipWheatView extends BaseWheatView { if (isMute()) { ImageUtils.loadRes(R.mipmap.room_microphone_off, mIvSex); } + mIvFrame.stopSvga(); mIvFrame.setVisibility(INVISIBLE); mIvFace.remove(); //停止声浪 diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomMakeWheatView.java b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomMakeWheatView.java index bd23ab7..2e808d8 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomMakeWheatView.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomMakeWheatView.java @@ -94,6 +94,7 @@ public class RoomMakeWheatView extends BaseWheatView { if (isMute()){ ImageUtils.loadRes(R.mipmap.room_microphone_off, mIvSex); } + mIvFrame.stopSvga(); mIvFrame.setVisibility(INVISIBLE); mIvFace.remove(); //停止声浪 diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheatView.java b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheatView.java index 9b681cf..f29c4af 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheatView.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheatView.java @@ -109,7 +109,7 @@ public class RoomSingSongWheatView extends BaseWheatView { if (isMute()) { ImageUtils.loadRes(R.mipmap.room_microphone_off, mIvSex); } - + mIvFrame.stopSvga(); mIvFrame.setVisibility(INVISIBLE); mIvFace.remove(); mIvRipple.setVisibility(GONE); diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/dialog/ShareDialog.java b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/dialog/ShareDialog.java index 724029d..cc5ce7e 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/dialog/ShareDialog.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/dialog/ShareDialog.java @@ -73,6 +73,9 @@ public class ShareDialog extends BaseBottomSheetDialog { mBinding.tvQq.setVisibility(GONE); mBinding.tvQqq.setVisibility(GONE); mBinding.rl.setVisibility(GONE); + }else if (types == 4){ + mBinding.tvJub.setVisibility(GONE); + mBinding.tvCopy.setVisibility(GONE); } if (mUserId.equals(SpUtil.getUserId()+"")){ mBinding.shanc.setVisibility(VISIBLE); diff --git a/moduleUtil/src/main/res/layout/fragment_tour_club_dialog.xml b/moduleUtil/src/main/res/layout/fragment_tour_club_dialog.xml index cb8eb8e..2c49058 100644 --- a/moduleUtil/src/main/res/layout/fragment_tour_club_dialog.xml +++ b/moduleUtil/src/main/res/layout/fragment_tour_club_dialog.xml @@ -312,6 +312,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@+id/exchange_layout" app:layout_constraintBottom_toBottomOf="@+id/exchange_layout" + android:visibility="gone" /> - + android:orientation="horizontal" + > - + @@ -20,23 +20,40 @@ android:layout_height="0dp" android:layout_marginTop="@dimen/dp_12" app:layout_constraintDimensionRatio="1:1" - app:layout_constraintWidth_percent="1" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.0" android:src="@mipmap/jiaoy"/> + + + @@ -50,19 +67,7 @@ - - + - + tools:visibility="visible" /> + + + + tools:visibility="visible" /> - - - - - - - - - - - - + + + + + + + + + + + + - - + tools:visibility="visible" /> + + tools:visibility="visible" /> + + app:layout_constraintStart_toStartOf="@id/riv" /> - + tools:visibility="visible" /> + + tools:visibility="visible" /> + app:layout_constraintWidth_percent="0.018" + tools:visibility="visible" /> - \ No newline at end of file diff --git a/moduleUtil/src/main/res/layout/room_view_sing_wheat.xml b/moduleUtil/src/main/res/layout/room_view_sing_wheat.xml index b63e706..edfdaee 100644 --- a/moduleUtil/src/main/res/layout/room_view_sing_wheat.xml +++ b/moduleUtil/src/main/res/layout/room_view_sing_wheat.xml @@ -24,7 +24,7 @@ android:scaleType="fitCenter" android:src="@mipmap/room_ic_wheat_default" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintDimensionRatio="1:1" + app:layout_constraintDimensionRatio="0.99:0.99" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -41,6 +41,23 @@ + + + - + 0) { + // 点击的是"+"'号，启动图片选择 + startChoosePhoto(1, PictureConfig.CHOOSE_REQUEST, false, maxSelectable); + } else { + ToastUtils.showShort("最多只能选择9张图片"); + } // 点击的是“+”号，启动图片选择 - startChoosePhoto(1, PictureConfig.CHOOSE_REQUEST, false, 9); +// startChoosePhoto(1, PictureConfig.CHOOSE_REQUEST, false, 9); } else { // 查看大图或其他操作 // 查看大图或其他操作 diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomGiftDialogFragment.java b/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomGiftDialogFragment.java index 28b83b7..eea3bc4 100644 --- a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomGiftDialogFragment.java +++ b/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomGiftDialogFragment.java @@ -380,7 +380,9 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment { + mBinding.getRoot().post(() -> { + RoomUserInfoFragment.show(roomId, item.getUser_id() + "", pit_number, getHostUser(hostUser), false, 4, isNumberWhether(), getParentFragmentManager()); + }); + dismiss(); + }); } }); diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/AlbumDetailActivity.java b/modulevocal/src/main/java/com/example/modulevocal/activity/AlbumDetailActivity.java index 07227a0..5d08aea 100644 --- a/modulevocal/src/main/java/com/example/modulevocal/activity/AlbumDetailActivity.java +++ b/modulevocal/src/main/java/com/example/modulevocal/activity/AlbumDetailActivity.java @@ -47,10 +47,11 @@ import java.util.Date; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; + /** - *@author qx - *@data 2025/6/6 - *@description: 相册详情 + * @author qx + * @data 2025/6/6 + * @description: 相册详情 */ @Route(path = ARouteConstants.USER_ALBUM_DETAIL) public class AlbumDetailActivity extends BaseMvpActivity implements AlbumDetailConacts.View { @@ -208,6 +209,9 @@ public class AlbumDetailActivity extends BaseMvpActivity= 0 && index < uploadedUrls.size()) { - uploadedUrls.add(index, url); // 插入到对应位置 - } else { - uploadedUrls.add(url); // 添加到最后 - } - -// if (uploadedUrls.size() == total) { - updateAdapterData(); // 所有图片上传完成，更新适配器数据 + // 增加已上传计数 + uploadedCount++; + uploadedUrls.add(url); +// if (index >= 0 && index < uploadedUrls.size()) { +// uploadedUrls.add(index, url); // 插入到对应位置 +// } else { +// uploadedUrls.add(url); // 添加到最后 // } + + // 当所有图片都上传完成时，更新适配器数据 + if (uploadedCount == totalUploadCount) { + updateAdapterData(); + // 重置计数器 + uploadedCount = 0; + totalUploadCount = 0; + } } @Override public void upAddAlbum() { uploadedUrls.clear(); + // 添加图片后应该重置分页状态并重新加载第一页 + page = 1; MvpPre.getAlbumDetail(albumId, pwd, page + "", "10"); } @@ -263,7 +278,7 @@ public class AlbumDetailActivity extends BaseMvpActivity allImages = albumBean.getImage_list(); List groupedPhotos = groupPhotos(allImages); - if (page==1) { + if (page == 1) { adapter.setNewData(groupedPhotos); - }else { + } else { adapter.addData(groupedPhotos); } - }else { - page=1; - if (albumBean.getCount()==null || albumBean.getCount().equals("0")){ - adapter.setNewData( new ArrayList<>()); + } else { + if (page == 1) { + adapter.setNewData(new ArrayList<>()); } +// page=1; +// if (albumBean.getCount()==null || albumBean.getCount().equals("0")){ +// adapter.setNewData( new ArrayList<>()); +// } } diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/EditUserInfoActivity.java b/modulevocal/src/main/java/com/example/modulevocal/activity/EditUserInfoActivity.java index 95d2bfd..5c86287 100644 --- a/modulevocal/src/main/java/com/example/modulevocal/activity/EditUserInfoActivity.java +++ b/modulevocal/src/main/java/com/example/modulevocal/activity/EditUserInfoActivity.java @@ -39,6 +39,7 @@ import com.xscm.moduleutil.utils.DateSelectDialog; import com.xscm.moduleutil.utils.GlideEngine; import com.xscm.moduleutil.utils.ImageUtils; import com.xscm.moduleutil.utils.SpUtil; +import com.xscm.moduleutil.widget.Constants; import com.xscm.moduleutil.widget.img.FullScreenUtil; import com.xscm.moduleutil.widget.picker.PictureSelectorUtil; import com.stx.xhb.xbanner.XBanner; @@ -98,8 +99,14 @@ public class EditUserInfoActivity extends BaseMvpActivity 0) { + // 点击的是"+"'号，启动图片选择 + startChoosePhoto(1, PictureConfig.REQUEST_CAMERA, false, maxSelectable, false); + } else { + ToastUtils.showShort("最多只能选择6张图片"); + } } else { // 查看大图或其他操作 FullScreenUtil.showFullScreenDialog(EditUserInfoActivity.this, position, list); @@ -131,7 +138,7 @@ public class EditUserInfoActivity extends BaseMvpActivity dataSource, int requestCode) { - UCrop.Options options = pictureSelectorUtil.buildOptions(); - UCrop uCrop = UCrop.of(srcUri, destinationUri, dataSource); - uCrop.withOptions(options); - uCrop.setImageEngine(new UCropImageEngine() { - @Override - public void loadImage(Context context, String url, ImageView imageView) { -// if (!ImageLoaderUtils.assertValidRequest(context)) { -// return; -// } - Glide.with(context).load(url).override(180, 180).into(imageView); - } + if (!isCq) { - @Override - public void loadImage(Context context, Uri url, int maxWidth, int maxHeight, OnCallbackListener call) { - Glide.with(context).asBitmap().load(url).override(maxWidth, maxHeight).into(new CustomTarget() { - @Override - public void onResourceReady(@NonNull Bitmap resource, @org.jetbrains.annotations.Nullable Transition transition) { - if (call != null) { - call.onCall(resource); + PictureSelector.create(this) + .openGallery(mimeType) + .isGif(isVideo) + .setImageEngine(GlideEngine.createGlideEngine()) + .setMaxSelectNum(type) + .isPreviewImage(true) + .isDisplayCamera(true) + .setOutputCameraDir(Constants.FILE_PATH) + .isOriginalSkipCompress(true) + + .forResult(requestCode); //结果回调onActivityResult code + } else { + + PictureSelectorUtil pictureSelectorUtil = new PictureSelectorUtil(); + + PictureSelector.create(this) + .openGallery(mimeType) + .isGif(isVideo) + .setMaxSelectNum(type) + .isPreviewImage(false) + .setImageEngine(GlideEngine.createGlideEngine()) + .setImageEngine(GlideEngine.createGlideEngine()) // 选择器展示不出图片则添加 + .setCropEngine(new CropFileEngine() { + @Override + public void onStartCrop(Fragment fragment, Uri srcUri, Uri destinationUri, ArrayList dataSource, int requestCode) { + UCrop.Options options = pictureSelectorUtil.buildOptions(); + UCrop uCrop = UCrop.of(srcUri, destinationUri, dataSource); + uCrop.withOptions(options); + uCrop.setImageEngine(new UCropImageEngine() { + @Override + public void loadImage(Context context, String url, ImageView imageView) { + Glide.with(context).load(url).override(180, 180).into(imageView); + } + + @Override + public void loadImage(Context context, Uri url, int maxWidth, int maxHeight, OnCallbackListener call) { + Glide.with(context).asBitmap().load(url).override(maxWidth, maxHeight).into(new CustomTarget() { + @Override + public void onResourceReady(@NonNull Bitmap resource, @org.jetbrains.annotations.Nullable Transition transition) { + if (call != null) { + call.onCall(resource); + } } - } - @Override - public void onLoadCleared(@org.jetbrains.annotations.Nullable Drawable placeholder) { - if (call != null) { - call.onCall(null); + @Override + public void onLoadCleared(@org.jetbrains.annotations.Nullable Drawable placeholder) { + if (call != null) { + call.onCall(null); + } } - } - }); - } - }); - uCrop.start(fragment.requireActivity(), fragment, requestCode); - } - }) - .forResult(requestCode); + }); + } + }); + uCrop.start(fragment.requireActivity(), fragment, requestCode); + } + }) + .forResult(requestCode); + } } - + private int totalUploadCount;//需要上传的数据的总数 + private int uploadedCount;//已经上传的数据的个数 @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); + if (resultCode == RESULT_OK && data != null) { switch (requestCode) { case PictureConfig.REQUEST_GO_SETTING: PictureSelector.create(EditUserInfoActivity.this) - .openPreview() ; + .openPreview(); List localMedia1 = PictureSelector.obtainSelectorList(data); if (localMedia1 != null && localMedia1.size() != 0) { LocalMedia imgMedia = localMedia1.get(0); String url; - if (imgMedia.isCompressed()) { - url = imgMedia.getCompressPath(); - } else { - url = imgMedia.getRealPath(); - } +// if (imgMedia.isCompressed()) { +// url = imgMedia.getCompressPath(); +// } else { +// url = imgMedia.getRealPath(); +// } + url=imgMedia.getCutPath(); MvpPre.uploadFile(new File(url), 1, 1, 1); } break; case PictureConfig.CHOOSE_REQUEST: PictureSelector.create(EditUserInfoActivity.this) - .openPreview() ; + .openPreview(); List localMedia = PictureSelector.obtainSelectorList(data); if (localMedia != null && localMedia.size() != 0) { @@ -258,7 +282,7 @@ public class EditUserInfoActivity extends BaseMvpActivity localMediaList = PictureSelector.obtainSelectorList(data); if (localMediaList != null && !localMediaList.isEmpty()) { @@ -267,7 +291,9 @@ public class EditUserInfoActivity extends BaseMvpActivity s = new ArrayList<>(); @@ -344,8 +372,8 @@ public class EditUserInfoActivity extends BaseMvpActivity= 0 && index <= uploadedUrls.size()) { - uploadedUrls.add(index, url); - LogUtils.d("EditUserInfoActivity", "图片已插入到位置 "+index); - } else { - uploadedUrls.add(url); - LogUtils.d("EditUserInfoActivity", "图片已添加到末尾"); - } - } catch (Exception e) { - LogUtils.e("EditUserInfoActivity", "处理图片URL时出错: " + e.getMessage()); - uploadedUrls.add(url); + // 增加已上传计数 + uploadedCount++; + uploadedUrls.add(url); + LogUtils.d("EditUserInfoActivity", "图片已插入到位置 " + uploadedUrls.size()); + // 当所有图片都上传完成时，更新适配器数据 + if (uploadedCount == totalUploadCount) { + updateAdapterData(); + // 重置计数器 + uploadedCount = 0; + totalUploadCount = 0; } -// if (uploadedUrls.size() == total) { - updateAdapterData(); // 所有图片上传完成，更新适配器数据 -// } } } private void updateAdapterData() { + LogUtils.d("EditUserInfoActivity", "图片已添加到末尾"+uploadedUrls.size()); list.clear(); list.addAll(uploadedUrls); // 添加真实图片 - list.add(UserPhotoWallAdapter.ADD_PHOTO); // 最后加上 ADD_PHOTO + if (list.size() < 6) { + list.add(UserPhotoWallAdapter.ADD_PHOTO); // 最后加上 ADD_PHOTO + } mUserPhotoWallAdapter.setNewData(list); String imageUrlsString = TextUtils.join(",", uploadedUrls); // MvpPre.editUserInfo("", "", "", "", imageUrlsString, "", ""); diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/RoomDetailsActivity.java b/modulevocal/src/main/java/com/example/modulevocal/activity/RoomDetailsActivity.java index d20abfb..707bf56 100644 --- a/modulevocal/src/main/java/com/example/modulevocal/activity/RoomDetailsActivity.java +++ b/modulevocal/src/main/java/com/example/modulevocal/activity/RoomDetailsActivity.java @@ -58,12 +58,12 @@ public class RoomDetailsActivity extends BaseMvpActivity { // 处理选择的时间范围 - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:mm", Locale.getDefault()); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()); Log.d("SelectedTime", "开始时间：" + sdf.format(startDate)); -// mBinding.tv2.setText(sdf.format(startDate)); + mBinding.tv2.setText(sdf.format(startDate)); Log.d("SelectedTime", "结束时间：" + sdf.format(endDate)); -// mBinding.tv22.setText(sdf.format(endDate)); - + mBinding.tv22.setText(sdf.format(endDate)); + currentPage=1; stime = sdf.format(startDate); etime = sdf.format(endDate); diff --git a/modulevocal/src/main/java/com/example/modulevocal/adapter/MyCreateAdapter.java b/modulevocal/src/main/java/com/example/modulevocal/adapter/MyCreateAdapter.java index f8efed3..0b111d0 100644 --- a/modulevocal/src/main/java/com/example/modulevocal/adapter/MyCreateAdapter.java +++ b/modulevocal/src/main/java/com/example/modulevocal/adapter/MyCreateAdapter.java @@ -468,7 +468,7 @@ public class MyCreateAdapter extends RecyclerView.Adapter { // 处理选择的时间范围 - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:mm", Locale.getDefault()); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()); Log.d("SelectedTime", "开始时间：" + sdf.format(startDate)); mBinding.tv2.setText(sdf.format(startDate)); Log.d("SelectedTime", "结束时间：" + sdf.format(endDate)); @@ -113,6 +113,8 @@ public class RevenueFragment extends BaseMvpFragment + + android:layout_height="wrap_content"> + + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + android:orientation="vertical" + app:layout_constraintTop_toBottomOf="@+id/top_bar"> + android:textSize="@dimen/sp_12" /> + android:gravity="center|center_vertical"> + android:layout_centerInParent="true" + android:gravity="center|left" + android:text="@string/nickname" + android:textColor="@color/color_FF999999" + android:textSize="@dimen/sp_14" /> + + android:gravity="center" + android:textColor="@color/color_FF333333" + android:textSize="@dimen/sp_16" + tools:text="姓名" /> + android:src="@drawable/detail_icon_go" /> @@ -91,32 +91,31 @@ + android:gravity="center|center_vertical"> + android:layout_centerInParent="true" + android:gravity="center|left" + android:text="@string/gender" + android:textColor="@color/color_FF999999" + android:textSize="@dimen/sp_14" /> + + android:gravity="center" + android:textColor="@color/color_FF333333" + android:textSize="@dimen/sp_16" + tools:text="男" /> + android:src="@drawable/detail_icon_go" /> @@ -133,32 +132,31 @@ android:id="@+id/rl_3" android:layout_width="match_parent" android:layout_height="@dimen/dp_36" - android:gravity="center|center_vertical" android:layout_marginStart="@dimen/dp_16" + android:layout_marginTop="@dimen/dp_10" android:layout_marginEnd="@dimen/dp_16" - android:layout_marginTop="@dimen/dp_10"> + android:gravity="center|center_vertical"> + android:layout_centerInParent="true" + android:gravity="center|left" + android:text="@string/birthday" + android:textColor="@color/color_FF999999" + android:textSize="@dimen/sp_14" /> + + android:gravity="center" + android:textColor="@color/color_FF333333" + android:textSize="@dimen/sp_16" + tools:text="2020-11-09" /> + android:src="@drawable/detail_icon_go" /> @@ -175,32 +173,31 @@ android:id="@+id/rl_4" android:layout_width="match_parent" android:layout_height="@dimen/dp_36" - android:gravity="center|center_vertical" android:layout_marginStart="@dimen/dp_16" + android:layout_marginTop="@dimen/dp_10" android:layout_marginEnd="@dimen/dp_16" - android:layout_marginTop="@dimen/dp_10"> + android:gravity="center|center_vertical"> + android:layout_centerInParent="true" + android:gravity="center|left" + android:text="@string/introduction" + android:textColor="@color/color_FF999999" + android:textSize="@dimen/sp_14" /> + + android:gravity="center" + android:textColor="@color/color_FF333333" + android:textSize="@dimen/sp_16" + tools:text="测试数据" /> + android:src="@drawable/detail_icon_go" /> @@ -223,36 +220,41 @@ android:id="@+id/tv_5" android:layout_width="wrap_content" android:layout_height="@dimen/dp_24" - android:text="@string/background_image" - android:gravity="center" - android:layout_centerInParent="true" - android:textSize="@dimen/sp_16" - android:textColor="@color/color_FF333333" android:layout_alignParentStart="true" + android:layout_centerInParent="true" + android:gravity="center" + android:text="@string/background_image" + android:textColor="@color/color_FF333333" + android:textSize="@dimen/sp_16" /> + + android:textSize="@dimen/sp_12" /> - + android:layout_height="wrap_content"> + + + diff --git a/modulevocal/src/main/res/layout/activity_room_details.xml b/modulevocal/src/main/res/layout/activity_room_details.xml index c1e6028..41b9bfe 100644 --- a/modulevocal/src/main/res/layout/activity_room_details.xml +++ b/modulevocal/src/main/res/layout/activity_room_details.xml @@ -58,7 +58,7 @@ android:layout_height="wrap_content" android:layout_alignParentStart="true" android:layout_marginStart="@dimen/dp_14" - android:layout_marginTop="@dimen/dp_10" + android:layout_marginTop="@dimen/dp_5" android:text="累计收益" android:textColor="@color/color_FF999999" android:textSize="12sp" /> @@ -70,7 +70,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerHorizontal="true" - android:layout_marginTop="@dimen/dp_10" + android:layout_marginTop="@dimen/dp_5" android:layout_marginEnd="@dimen/dp_16" android:gravity="center"> @@ -119,7 +119,7 @@ android:layout_below="@+id/tv1" android:layout_alignParentStart="true" android:layout_marginStart="@dimen/dp_16" - android:layout_marginTop="@dimen/dp_10" + android:layout_marginTop="@dimen/dp_5" android:drawableLeft="@mipmap/im_zs" android:drawablePadding="@dimen/dp_5" android:text="10000" @@ -133,7 +133,6 @@ android:layout_below="@+id/tv3" android:layout_alignParentStart="true" android:layout_marginStart="@dimen/dp_14" - android:layout_marginTop="@dimen/dp_5" android:text="累计流水" android:textColor="@color/color_FF999999" android:textSize="12sp" /> @@ -145,6 +144,7 @@ android:layout_below="@+id/tv4" android:layout_marginStart="@dimen/dp_16" android:layout_marginTop="@dimen/dp_3" + android:paddingBottom="@dimen/dp_3" android:drawableLeft="@mipmap/jinb" android:text="10000" android:textColor="@color/color_FF333333" diff --git a/modulevocal/src/main/res/layout/fragment_revenue.xml b/modulevocal/src/main/res/layout/fragment_revenue.xml index b75a07c..470d758 100644 --- a/modulevocal/src/main/res/layout/fragment_revenue.xml +++ b/modulevocal/src/main/res/layout/fragment_revenue.xml @@ -1,7 +1,7 @@ @@ -11,35 +11,36 @@ + android:layout_height="match_parent" + android:orientation="vertical"> + @@ -47,42 +48,51 @@ + - + + + \ No newline at end of file diff --git a/modulevoice/src/main/res/layout/ranking_list.xml b/modulevoice/src/main/res/layout/ranking_list.xml index 956652b..8963d48 100644 --- a/modulevoice/src/main/res/layout/ranking_list.xml +++ b/modulevoice/src/main/res/layout/ranking_list.xml @@ -168,7 +168,6 @@ android:layout_marginBottom="@dimen/dp_60" android:ellipsize="end" android:gravity="center" - android:maxLength="3" android:text="" android:textColor="#ff333333" android:textSize="10sp" /> @@ -304,7 +303,6 @@ android:layout_marginBottom="@dimen/dp_60" android:ellipsize="end" android:gravity="center" - android:maxLength="3" android:text="" android:textColor="#ff333333" android:textSize="10sp" /> @@ -440,7 +438,6 @@ android:layout_marginBottom="@dimen/dp_60" android:ellipsize="end" android:gravity="center" - android:maxLength="3" android:text="" android:textColor="#ff333333" android:textSize="10sp" />