From 1d66a9b7fbd3dde8fd49f6ab33458aec561277f3 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Mon, 20 Feb 2023 16:43:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E6=92=AD=E7=94=A8=E6=88=B7=E5=8D=8F?= =?UTF-8?q?=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/drawable/selector_protocol_check.xml | 5 +++ .../res/mipmap-xxhdpi/icon_protocol_check.png | Bin 0 -> 1595 bytes .../mipmap-xxhdpi/icon_protocol_uncheck.png | Bin 0 -> 1147 bytes common/src/main/res/values-en/strings.xml | 3 ++ common/src/main/res/values/strings.xml | 3 ++ config.gradle | 4 +-- .../live/views/LiveNewReadyRyViewHolder.java | 22 ++++++++++-- .../main/res/layout/view_new_live_ready.xml | 33 ++++++++++++++++-- 8 files changed, 63 insertions(+), 7 deletions(-) create mode 100644 common/src/main/res/drawable/selector_protocol_check.xml create mode 100644 common/src/main/res/mipmap-xxhdpi/icon_protocol_check.png create mode 100644 common/src/main/res/mipmap-xxhdpi/icon_protocol_uncheck.png diff --git a/common/src/main/res/drawable/selector_protocol_check.xml b/common/src/main/res/drawable/selector_protocol_check.xml new file mode 100644 index 000000000..a4042e2f1 --- /dev/null +++ b/common/src/main/res/drawable/selector_protocol_check.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/common/src/main/res/mipmap-xxhdpi/icon_protocol_check.png b/common/src/main/res/mipmap-xxhdpi/icon_protocol_check.png new file mode 100644 index 0000000000000000000000000000000000000000..07d294e380824694152ae79cdb7261ba425c749b GIT binary patch literal 1595 zcmV-B2E_S^P)Px)^+`lQRA@upn`>+oRTO}~OUtvAVu31w1_Vq&QvxmEBgJ51f5;CI-$slW(EiW_ z0>%W?7#~1FMET(#1OibLA0Z;f;15VNmY|3fBjHgHEz}B>hZKaq*j{tkyUXm%&dkns zwvf5W{Mos4&iUq^x%ZrN?r zt?aA-jT_Db-U3Est31Q!nt(TfP1(3_U_h<)L%@5$ovsGP+Ms18T>J@Ik3rjUxY`1- z%kf9@3Lw7-`i+AAV`0#}P*eqZ{k)hD0Ve4xzDDIJp6u)N;i`Cxw&gvKr^9i0aCxYGh5);QqUbeFl=d5s6H@u zB@CNmzbW73oOBb98{l%sY$upaVNkqDgtBkO&F7l-*Cnnx`3HN%vrH+qQo3FPH2K`gl$7W1525k>+`j!x zr1u>O`Geug5%)>1bTN#4*(yy^t>KbSCIDr<`#RY}0_VL|;l-AjfY|%=8UW)~!4S!# zf%Yb-e+e$j9B6BK1EHeU9-u$0l-imA+zdRLe5`ph9D6kzv%+~s;3jN@K~q!ZwVi-{ z4~Wk>^^9EwC68Hu->j5+T$!aohV*)Va<~TmmCC^lXl`%`Q|e|w`w6FEw^YOUwbtLI z{4qoTrvVaB$D1Upzg7g#=fZdwesH=A_Dq6Unk-53$tiXAqdqh zm>W!nADl@0XFVLhKG8cAlzjxn4_bd-B7p0F1<79<-hq=F{f(3CdvFzWo`ut2KGP`dDXhmK}A^c-BN z4-Od?oM;|=KTOzUwV_r3{{kdyk2jg6q)6n}@{3{0ZfAzwc@7TF4F(w|oY*TxtjXV7 zEpHIOvndPwo(i~n!5vWIzloB5rD+0r;2CH=;y;pM!-+--2&UFqb)OT!cA!u4*PqKk zdlZz#u*zMKKPY?1T)>GnsyEz|@|ko52NXd=XTi7+K)F;ryhbuta2|lcTr@FmB~QYb z6~Q2L3FqOW!6q52V+MiDHJryJ6MUHn3VHYi7`4px|=Ts zQjUp4bNeju`D?ACy8&uOQ8L-+ZebfpIU5trLkJdEm10vX+-To%aa z9>%jqkC8o2X@iuACz=OhZJ^OS(riz7EQivc1!RM+JBQMD0H53xhtkt!c4kYw5~u1cdvEP)Px(HAzH4RA@uxn_H-rMHI(>3(X4{A%Y+(^q{0cVu~7~4}w9R2h$`7GY~JmM0h(d zUO)sdFI|aVJQhJJJ&0xxDkuagp@JF(rYLwoBM3#ppsS4hbw%+uL)_9v6HM z=i4)D=KrlV>o)5cZ6@d3AYd9W7ntOq@xasm(TcbIa}BuYpA*12GrQByEm=F5Ip>}N zx`3s?%fK@g`ThYM1NH!i&FsI5d>%||37~UsIIsp-4~%McGs*m$zz4v`X7*QA-jx7) zHCzU41;$ogyuo?D0$YGDtEg|&0G)HM0`CLQmu&DK;78ym;5zUd@Fx%?A<2&b#sK4h zDZo@z(QbH!N5Z@XlAC5T1s^RI_I7R zz6D-LILVyL;_U-&)my0I?<0XF-ZIPm#Pl<;z|4Bfc$Wh7;G}Y+3oM+}^-9H!H#=>D z)Uv=*|1Om-16dQGSIZv?BzFne{urfJ3%sPc33#qRlCx{6Yau{yP!1NHx$l5aftDR` zvm*546;Qkf%uD9$OfD)iJhcEyLaDVBxDP9CtliVr6@c7fW|Htj^aw!j=ME?1q?Q}{ zQF7_NCCQxy>e`k1$%g>?2u030cH#<|*7n1ht0#4x$&V7lqhMf49Py+8R{*;s&T<9a zeP}J~fl7aubyZXqyO5P;_IVii0H6aHZ>*=S}uqxWM`pU){Ej#HkmfxUe!jjGGN1-uzemfaYmd@=x3 zjH!4skYc>$ZHz6eZoJWXie0}*0`!Gub|?Vc4=j$j9S1&Xl=}b~w;Grq?Pb52y+g@Dd{QMuebD;GC*aNJLUg~e7Sy^+b@P2}w8d!C3;Z3b{AGOgJK+bY=Pn=VOm&bfROUJo$)l7%Y8`4*kL z6!R?`dVs1-kT?UV^fMLc;n#3n%VY-vu*`cYH*+x{B4 zm8NuEpMNzVn$nBzFZ`AGbYKoJ*|%Gj{ab Broadcast Click To View Anchor Task + I have read and agreed to the + Please read and agree to the PDLIVE Host Agreement + PDLIVE Host Agreement diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 9fc8b1987..0d846e4e7 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -1027,4 +1027,7 @@ 開播數據 點擊查看 主播任務 + 我已閱讀並同意 + 請閱讀並同意《PDLIVE主播協議》 + 《PDLIVE主播協議》 diff --git a/config.gradle b/config.gradle index 00ea7a5b8..d755abbee 100644 --- a/config.gradle +++ b/config.gradle @@ -9,9 +9,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/views/LiveNewReadyRyViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveNewReadyRyViewHolder.java index 9312232bc..71f803ca0 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveNewReadyRyViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveNewReadyRyViewHolder.java @@ -8,6 +8,7 @@ import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.Handler; import android.os.Looper; +import android.text.Html; import android.text.TextUtils; import android.util.Log; import android.view.View; @@ -76,7 +77,7 @@ public class LiveNewReadyRyViewHolder extends AbsViewHolder implements View.OnCl private EditText mEditTitle; private ProcessImageUtil mImageUtil; private File mAvatarFile; - private TextView mLiveClass; + private TextView mLiveClass, anchorAgreement; private TextView mLiveTypeTextView, liveClarity;//房间类型TextView private TextView mLiveWishListTextView;//心愿单TextView private int mLiveClassID;//直播频道id @@ -88,9 +89,10 @@ public class LiveNewReadyRyViewHolder extends AbsViewHolder implements View.OnCl private LiveClassBean classBean; private FaceManager manager; private TextView faceTextView;//提示人脸未检测到的TextView - private ImageView imgClarity; + private ImageView imgClarity, selectorProtocol; private int selectClarity = 1; private LiveOpenCustomPopup liveOpenCustomPopup; + private boolean selector = false; public LiveNewReadyRyViewHolder(Context context, ViewGroup parentView, int liveSdk) { super(context, parentView, liveSdk); @@ -112,7 +114,9 @@ public class LiveNewReadyRyViewHolder extends AbsViewHolder implements View.OnCl public void init() { mRootView = (ConstraintLayout) findViewById(R.id.traceroute_rootview); imgClarity = (ImageView) findViewById(R.id.img_clarity); + selectorProtocol = (ImageView) findViewById(R.id.selector_protocol); liveClarity = (TextView) findViewById(R.id.live_clarity); + anchorAgreement = (TextView) findViewById(R.id.anchor_agreement); mRootView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { @@ -121,6 +125,7 @@ public class LiveNewReadyRyViewHolder extends AbsViewHolder implements View.OnCl imm.hideSoftInputFromWindow(view.getWindowToken(), 0); } }); + mAvatar = (ConstraintLayout) findViewById(R.id.avatar); mAvatar.setOnClickListener(this); UserBean u = CommonAppConfig.getInstance().getUserBean(); @@ -271,6 +276,19 @@ public class LiveNewReadyRyViewHolder extends AbsViewHolder implements View.OnCl .asCustom(liveClarityCustomPopup) .show(); }); + String keywordHtml2 = "" + mContext.getString(R.string.anchor_hint) + ""; + String contextHtml = "" + mContext.getString(R.string.anchor_agreement) + ""; + anchorAgreement.setText(Html.fromHtml(contextHtml + keywordHtml2)); + selectorProtocol.setPressed(true); + selectorProtocol.setSelected(true); + selector = selectorProtocol.isSelected(); + selectorProtocol.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + selector = !selector; + selectorProtocol.setSelected(selector); + } + }); } private void setSelectClarity(int selectClarity) { diff --git a/live/src/main/res/layout/view_new_live_ready.xml b/live/src/main/res/layout/view_new_live_ready.xml index eadb2a80c..43961a227 100644 --- a/live/src/main/res/layout/view_new_live_ready.xml +++ b/live/src/main/res/layout/view_new_live_ready.xml @@ -267,7 +267,7 @@ android:layout_width="30dp" android:layout_height="30dp" android:layout_marginStart="50dp" - android:layout_marginBottom="53dp" + android:layout_marginBottom="83dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:srcCompat="@mipmap/icon_beauty" /> @@ -276,7 +276,7 @@ android:id="@+id/btn_start_live" android:layout_width="189dp" android:layout_height="42dp" - android:layout_marginBottom="47dp" + android:layout_marginBottom="77dp" android:background="@drawable/bg_live_ready_btn" android:text="@string/live_start" android:textColor="@color/white" @@ -303,9 +303,36 @@ android:layout_width="30dp" android:layout_height="30dp" android:layout_marginEnd="50dp" - android:layout_marginBottom="53dp" + android:layout_marginBottom="83dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:srcCompat="@mipmap/icon_robot" /> + + + + + + + \ No newline at end of file