diff --git a/common/src/main/assets/icon_noble_chaohuang.svga b/common/src/main/assets/icon_noble_chaohuang.svga index f0d13f774..c213258ef 100644 Binary files a/common/src/main/assets/icon_noble_chaohuang.svga and b/common/src/main/assets/icon_noble_chaohuang.svga differ diff --git a/common/src/main/assets/icon_noble_gongjue.svga b/common/src/main/assets/icon_noble_gongjue.svga index c0a90c61e..d24d908d0 100644 Binary files a/common/src/main/assets/icon_noble_gongjue.svga and b/common/src/main/assets/icon_noble_gongjue.svga differ diff --git a/common/src/main/assets/icon_noble_guowang.svga b/common/src/main/assets/icon_noble_guowang.svga index 5360deb8d..51b12498a 100644 Binary files a/common/src/main/assets/icon_noble_guowang.svga and b/common/src/main/assets/icon_noble_guowang.svga differ diff --git a/common/src/main/assets/icon_noble_houjue.svga b/common/src/main/assets/icon_noble_houjue.svga index 1ffe267a7..67f8b9d11 100644 Binary files a/common/src/main/assets/icon_noble_houjue.svga and b/common/src/main/assets/icon_noble_houjue.svga differ diff --git a/common/src/main/assets/icon_noble_huangdi.svga b/common/src/main/assets/icon_noble_huangdi.svga index 584c7f62d..ba5ac79f9 100644 Binary files a/common/src/main/assets/icon_noble_huangdi.svga and b/common/src/main/assets/icon_noble_huangdi.svga differ diff --git a/common/src/main/assets/icon_noble_nanjue.svga b/common/src/main/assets/icon_noble_nanjue.svga index 49f840673..d2ed83487 100644 Binary files a/common/src/main/assets/icon_noble_nanjue.svga and b/common/src/main/assets/icon_noble_nanjue.svga differ diff --git a/common/src/main/assets/icon_noble_zijue.svga b/common/src/main/assets/icon_noble_zijue.svga index 1a78b5455..7f9ffa985 100644 Binary files a/common/src/main/assets/icon_noble_zijue.svga and b/common/src/main/assets/icon_noble_zijue.svga differ diff --git a/common/src/main/java/com/yunbao/common/views/weight/NobleNoticeView.java b/common/src/main/java/com/yunbao/common/views/weight/NobleNoticeView.java index 371e892b0..efdce665e 100644 --- a/common/src/main/java/com/yunbao/common/views/weight/NobleNoticeView.java +++ b/common/src/main/java/com/yunbao/common/views/weight/NobleNoticeView.java @@ -80,7 +80,7 @@ public class NobleNoticeView extends FrameLayout { rootView = LayoutInflater.from(mContext).inflate(R.layout.view_noble_notice, this, true); svagaBc = rootView.findViewById(R.id.svaga_bc); rootLayout = rootView.findViewById(R.id.root_layout); - gotoRoomView = rootView.findViewById(R.id.goto_room_view); + gotoRoomView = rootView.findViewById(R.id.got_room_view); contextLayout = rootView.findViewById(R.id.context_layout); scrollLayout = rootView.findViewById(R.id.scroll_layout); nobleIcon = rootView.findViewById(R.id.noble_icon); @@ -111,7 +111,6 @@ public class NobleNoticeView extends FrameLayout { findViewById(R.id.anchor_nickname).setVisibility(GONE); openNoble.setText(mContext.getString(R.string.open_noble2)); }else { - gotoRoomView.setVisibility(VISIBLE); findViewById(R.id.in).setVisibility(VISIBLE); findViewById(R.id.anchor_nickname).setVisibility(VISIBLE); openNoble.setText(mContext.getString(R.string.open_noble)); @@ -254,7 +253,7 @@ public class NobleNoticeView extends FrameLayout { @Override public void onStep(int frame, double v) { System.out.println("frame = " + frame); - if (frame == 10) { + if (frame == 20) { setButtonPosition(roleType); observable.observeOn(AndroidSchedulers.mainThread()) .subscribe(bitmap -> { @@ -270,7 +269,7 @@ public class NobleNoticeView extends FrameLayout { }).isDisposed(); } - if (frame == 150) { + if (frame == 135) { contextLayout.setVisibility(GONE); gotoRoomView.setVisibility(GONE); scrollLayout.clearAnimation(); diff --git a/common/src/main/res/anim/in_from_right.xml b/common/src/main/res/anim/in_from_right.xml new file mode 100644 index 000000000..7729bdc16 --- /dev/null +++ b/common/src/main/res/anim/in_from_right.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/common/src/main/res/anim/in_from_right_abit.xml b/common/src/main/res/anim/in_from_right_abit.xml new file mode 100644 index 000000000..0901efc3c --- /dev/null +++ b/common/src/main/res/anim/in_from_right_abit.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/common/src/main/res/anim/out_from_right.xml b/common/src/main/res/anim/out_from_right.xml new file mode 100644 index 000000000..3b2030e82 --- /dev/null +++ b/common/src/main/res/anim/out_from_right.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/common/src/main/res/anim/out_to_right.xml b/common/src/main/res/anim/out_to_right.xml new file mode 100644 index 000000000..4344ae837 --- /dev/null +++ b/common/src/main/res/anim/out_to_right.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/common/src/main/res/anim/out_to_right_abit.xml b/common/src/main/res/anim/out_to_right_abit.xml new file mode 100644 index 000000000..57bffad36 --- /dev/null +++ b/common/src/main/res/anim/out_to_right_abit.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/common/src/main/res/layout/view_noble_notice.xml b/common/src/main/res/layout/view_noble_notice.xml index 0d540e02e..d719d673d 100644 --- a/common/src/main/res/layout/view_noble_notice.xml +++ b/common/src/main/res/layout/view_noble_notice.xml @@ -12,7 +12,7 @@ @color/colorPrimaryDark @color/colorAccent @color/background - @style/Animation + @style/AnimationActivity - @color/colorPrimary + @color/colorPrimary + + + + + + + \ No newline at end of file diff --git a/config.gradle b/config.gradle index d73f7bbfa..9b9ac5933 100644 --- a/config.gradle +++ b/config.gradle @@ -10,9 +10,9 @@ ext { manifestPlaceholders = [ //正式 -// serverHost : "https://napi.yaoulive.com", + serverHost : "https://napi.yaoulive.com", //測試 - serverHost : "https://ceshi.yaoulive.com", +// serverHost : "https://ceshi.yaoulive.com", //腾讯地图 txMapAppKey : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB", diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java index f24723467..4b7acd53c 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java @@ -148,7 +148,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On window.setWindowAnimations(R.style.bottomToTopAnim); WindowManager.LayoutParams params = window.getAttributes(); params.width = WindowManager.LayoutParams.MATCH_PARENT; - params.height = DpUtil.dp2px(350); + params.height = DpUtil.dp2px(355); params.gravity = Gravity.BOTTOM; window.setAttributes(params); } @@ -251,7 +251,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On mVipGoldTitle = mRootView.findViewById(R.id.vipGoldTitle); mVipGoldDesc = mRootView.findViewById(R.id.vipGoldDesc); mVipGold.setOnClickListener(this); - mGiftPackage= mRootView.findViewById(R.id.btn_gift_package); + mGiftPackage = mRootView.findViewById(R.id.btn_gift_package); mGiftPackage.setOnClickListener(this); mRootView.findViewById(R.id.live_gift_download_all).setOnClickListener(this); mHandler = new Handler() { @@ -295,7 +295,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On JSONObject user = JSONObject.parseObject(info[0]); int nobleId = user.getIntValue("noble_id"); int resId = NobleUtil.nobleIdToImageResId(nobleId); - if(resId!=-1){ + if (resId != -1) { mVipGoldIcon.setImageResource(resId); mVipGoldTitle.setText(user.getString("noble_name")); mVipGoldDesc.setText(R.string.live_gift_buy_gold_desc_to); @@ -385,7 +385,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On String giftJson = obj.getString("giftlist"); List list = JSON.parseArray(giftJson, LiveGiftBean.class); GiftCacheUtil.getInstance().addDownloadList(list); - if(!GiftCacheUtil.getInstance().isDownloading()){ + if (!GiftCacheUtil.getInstance().isDownloading()) { GiftCacheUtil.getInstance().downloadAllGift(); } if (list.size() == 0) { @@ -405,7 +405,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On } private void showGiftList(List list) { - if (bean1!=null&&IMLoginManager.get(mContext).isNewUserGif() && (type_name.equals("熱門") || type_name.equals("Hot"))) { + if (bean1 != null && IMLoginManager.get(mContext).isNewUserGif() && (type_name.equals("熱門") || type_name.equals("Hot"))) { list.add(0, bean1); if (mWishGiftId == null) { mWishGiftId = "" + bean1.getId(); @@ -503,11 +503,11 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On } else if (i == R.id.btn_choose) { showGiftCount(); } else if (i == R.id.coin) { - forwardMyCoin(); + forwardMyCoin(0); } else if (i == R.id.goldCoin) { - forwardMyCoin(); + forwardMyCoin(2); } else if (i == R.id.go_charge) { - forwardMyCoin(); + forwardMyCoin(0); } else if (i == R.id.btn_luck_gift_tip) { dismiss(); ((LiveActivity) mContext).openLuckGiftTip(); @@ -556,10 +556,10 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On /** * 跳转到我的钻石 */ - private void forwardMyCoin() { + private void forwardMyCoin(int page) { dismiss(); //我们的 - ARouter.getInstance().build(PATH_COIN).withInt("p", 0).navigation(); + ARouter.getInstance().build(PATH_COIN).withInt("p", page).navigation(); } /** @@ -709,6 +709,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On /** * 收到礼物下载完成的通知 + * * @param status */ @Subscribe(threadMode = ThreadMode.MAIN) diff --git a/live/src/main/java/com/yunbao/live/utils/LiveTextRender.java b/live/src/main/java/com/yunbao/live/utils/LiveTextRender.java index 71892da7f..4cf3ed5e6 100644 --- a/live/src/main/java/com/yunbao/live/utils/LiveTextRender.java +++ b/live/src/main/java/com/yunbao/live/utils/LiveTextRender.java @@ -230,28 +230,28 @@ public class LiveTextRender { int index = 0; if (levelDrawable != null) { - builder.append(" "); + builder.append(" "); levelDrawable.setBounds(0, 0, DpUtil.dp2px(32), DpUtil.dp2px(14)); builder.setSpan(new VerticalImageSpan(levelDrawable), index, index + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); index = builder.length(); } if (gzDrawablesMap.containsKey(bean)) {//贵族 - builder.append(" "); - gzDrawablesMap.get(bean).setBounds(0, 0, DpUtil.dp2px(32), DpUtil.dp2px(18)); + builder.append(" "); + gzDrawablesMap.get(bean).setBounds(0, 0, DpUtil.dp2px(35), DpUtil.dp2px(20)); builder.setSpan(new VerticalImageSpan(gzDrawablesMap.get(bean)), index, index + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); index = builder.length(); } if (ryxzDrawablesMap.containsKey(bean)) {//荣誉勋章 - builder.append(" "); + builder.append(" "); ryxzDrawablesMap.get(bean).setBounds(0, 0, DpUtil.dp2px(18), DpUtil.dp2px(18)); builder.setSpan(new VerticalImageSpan(ryxzDrawablesMap.get(bean)), index, index + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); index = builder.length(); } if (nhDrawablesMap.containsKey(bean)) {//靓号 - builder.append(" "); + builder.append(" "); nhDrawablesMap.get(bean).setBounds(0, 0, DpUtil.dp2px(17), DpUtil.dp2px(17)); builder.setSpan(new VerticalImageSpan(nhDrawablesMap.get(bean)), index, index + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); index = builder.length(); @@ -268,7 +268,7 @@ public class LiveTextRender { } if (drawable != null) { - builder.append(" "); + builder.append(" "); drawable.setBounds(0, 0, DpUtil.dp2px(18), DpUtil.dp2px(16)); builder.setSpan(new VerticalImageSpan(drawable), index, index + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); index = builder.length(); @@ -280,7 +280,7 @@ public class LiveTextRender { && !bean.getMedalNmae().equals("null") && !bean.getMedalNmae().equals("(null)") && !bean.getMedalNmae().equals("")) {//粉丝徽章图标 Drawable drawable = getMedalImage(bean); if (drawable != null) { - builder.append(" "); + builder.append(" "); drawable.setBounds(0, 0, DpUtil.dp2px(44), DpUtil.dp2px(17)); builder.setSpan(new VerticalImageSpan(drawable), index, index + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); index = builder.length(); @@ -291,7 +291,7 @@ public class LiveTextRender { if (bean.isManager()) {//直播间管理员图标 Drawable drawable = ContextCompat.getDrawable(CommonAppContext.sInstance, R.mipmap.icon_live_chat_m); if (drawable != null) { - builder.append(" "); + builder.append(" "); drawable.setBounds(0, 0, DpUtil.dp2px(17), DpUtil.dp2px(14)); builder.setSpan(new VerticalImageSpan(drawable), index, index + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); index = builder.length(); @@ -301,7 +301,7 @@ public class LiveTextRender { if (!TextUtils.isEmpty(bean.getLiangName())) {//靓号图标 Drawable drawable = ContextCompat.getDrawable(CommonAppContext.sInstance, R.mipmap.icon_live_chat_liang); if (drawable != null) { - builder.append(" "); + builder.append(" "); drawable.setBounds(0, 0, DpUtil.dp2px(17), DpUtil.dp2px(14)); builder.setSpan(new VerticalImageSpan(drawable), index, index + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); // new add @@ -528,9 +528,9 @@ public class LiveTextRender { int indexX = 80; //水印的位置坐标 if (level.length() > 2) { - indexX = 75; + indexX = 87; } else { - indexX = 84; + indexX = 95; } mCanvas.drawText(level, indexX, 53, mPaint); mCanvas.save(); diff --git a/live/src/main/res/layout/dialog_live_gift_wrap.xml b/live/src/main/res/layout/dialog_live_gift_wrap.xml index 05570e3d2..bfb498451 100644 --- a/live/src/main/res/layout/dialog_live_gift_wrap.xml +++ b/live/src/main/res/layout/dialog_live_gift_wrap.xml @@ -2,181 +2,196 @@ + - - - - - - - - - - + android:id="@+id/live_gift_download_all" + android:layout_width="155dp" + android:layout_height="32dp" + android:layout_alignParentStart="true" + android:layout_marginStart="12dp" + android:background="@drawable/bg_live_gift_download_all" + android:gravity="center" + android:orientation="horizontal" + android:visibility="invisible"> + + + - + android:gravity="center" + android:text="一鍵下載所有禮物動畫" + android:textSize="10sp" + android:visibility="visible" /> + - + + + + + + + + + + + + + + + android:orientation="horizontal"> + + android:layout_marginEnd="5dp" + android:layout_weight="1" /> - - + + + + android:layout_weight="1" /> - - - + android:layout_height="66dp" + android:layout_weight="0"> + + + + android:layout_height="match_parent" + android:layout_marginStart="10dp" + android:layout_marginEnd="10dp"> + + android:visibility="invisible" + app:tint="@color/global" /> + + android:layout_height="match_parent" + android:layout_marginBottom="5dp" + android:gravity="bottom" + android:layout_marginStart="20dp" + android:orientation="horizontal"> + + android:layout_height="match_parent" + android:orientation="vertical"> + - + app:mfl_ratio="1"> + android:checked="true" /> + android:layout_marginTop="1dp" + android:layout_marginRight="1dp" /> + android:layout_centerHorizontal="true" + android:layout_centerVertical="true" /> - + android:background="#D996cff0" + android:gravity="center" + android:textColor="@color/color_white" + android:textSize="8sp" + android:visibility="gone" /> @@ -56,21 +54,22 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="bottom|center" - android:gravity="center" android:layout_marginBottom="8dp" + android:gravity="center" android:orientation="horizontal"> - + android:layout_height="10dp" /> + android:textColor="@color/gray3" + android:textSize="11sp" /> @@ -78,18 +77,17 @@ android:id="@+id/name" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_gravity="bottom" android:layout_marginBottom="23dp" android:gravity="center" android:textColor="@color/white" - android:textSize="12sp" - android:layout_gravity="bottom" - /> + android:textSize="12sp" /> + + android:textSize="10sp" + android:visibility="gone" /> - \ No newline at end of file + \ No newline at end of file diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml index 5e5490725..8cfdda608 100644 --- a/live/src/main/res/layout/view_live_room.xml +++ b/live/src/main/res/layout/view_live_room.xml @@ -9,6 +9,11 @@ android:paddingTop="15dp"> + - - @@ -525,6 +534,9 @@ android:layout_width="18dp" android:layout_height="18dp" android:layout_marginRight="30dp" + android:clickable="false" + android:focusableInTouchMode="false" + android:focusable="false" android:background="@mipmap/icon_more_gray" />