From add1339f4aaade2136adcf154832cda22a7ee9f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= <1484288157@qq.com> Date: Tue, 8 Sep 2020 14:49:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=B8=96=E5=AD=90=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=9B=B4=E5=A4=9A=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/assets/lottie/tab_forum.json | 2 +- .../java/com/gh/common/util/DialogUtils.java | 89 ++++++++++----- .../gh/gamecenter/entity/MenuItemEntity.kt | 7 ++ .../article/detail/ArticleDetailFragment.kt | 103 ++++++++++++------ .../video/upload/view/UploadVideoActivity.kt | 4 +- .../res/drawable-xxhdpi/ic_ask_select.png | Bin 3684 -> 3570 bytes .../res/drawable-xxhdpi/ic_ask_unselect.png | Bin 2344 -> 2437 bytes .../res/drawable-xxhdpi/menu_more_delete.png | Bin 0 -> 936 bytes .../menu_more_essence_enable.png | Bin 0 -> 2402 bytes .../menu_more_essence_unenable.png | Bin 0 -> 2408 bytes .../res/drawable-xxhdpi/menu_more_fold.png | Bin 0 -> 958 bytes ..._change_label.xml => dialog_new_alert.xml} | 9 +- .../main/res/layout/item_detail_more_menu.xml | 26 +++++ .../layout/menu_answer_detail_more_new.xml | 22 ++++ 14 files changed, 191 insertions(+), 71 deletions(-) create mode 100644 app/src/main/java/com/gh/gamecenter/entity/MenuItemEntity.kt create mode 100644 app/src/main/res/drawable-xxhdpi/menu_more_delete.png create mode 100644 app/src/main/res/drawable-xxhdpi/menu_more_essence_enable.png create mode 100644 app/src/main/res/drawable-xxhdpi/menu_more_essence_unenable.png create mode 100644 app/src/main/res/drawable-xxhdpi/menu_more_fold.png rename app/src/main/res/layout/{dialog_upload_video_change_label.xml => dialog_new_alert.xml} (93%) create mode 100644 app/src/main/res/layout/item_detail_more_menu.xml create mode 100644 app/src/main/res/layout/menu_answer_detail_more_new.xml diff --git a/app/src/main/assets/lottie/tab_forum.json b/app/src/main/assets/lottie/tab_forum.json index 0dcd716e66..d68aaeab1b 100644 --- a/app/src/main/assets/lottie/tab_forum.json +++ b/app/src/main/assets/lottie/tab_forum.json @@ -1 +1 @@ -{"v":"5.6.9","fr":30,"ip":0,"op":20,"w":66,"h":66,"nm":"bottom bar tab/论坛/选中/E","ddd":0,"assets":[{"id":"comp_0","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"矩形","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":4,"s":[80,80,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":9,"s":[110,110,100]},{"t":13,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":1,"y":0},"t":0,"s":[{"i":[[-0.55,0],[0,0],[0,-0.55],[0,0],[1.38,0],[0,1.38],[0,0]],"o":[[0,0],[0.55,0],[0,0],[0,1.38],[-1.38,0],[0,0],[0,-0.55]],"v":[[-1.5,-2.5],[1.5,-2.5],[2.5,-1.5],[2.5,0],[0,2.5],[-2.5,0],[-2.5,-1.5]],"c":true}]},{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"t":4,"s":[{"i":[[-0.55,0],[0,0],[0,-0.55],[0,0],[1.38,0],[0,1.38],[0,0]],"o":[[0,0],[0.55,0],[0,0],[0,1.38],[-1.38,0],[0,0],[0,-0.55]],"v":[[-1.5,-1.25],[1.5,-1.25],[2.5,-0.25],[2.5,0],[0,1.896],[-2.5,0],[-2.5,-0.25]],"c":true}]},{"i":{"x":0.667,"y":1},"o":{"x":1,"y":0},"t":9,"s":[{"i":[[-0.55,0],[0,0],[0,-0.55],[0,0],[1.38,0],[0,1.38],[0,0]],"o":[[0,0],[0.55,0],[0,0],[0,1.38],[-1.38,0],[0,0],[0,-0.55]],"v":[[-1.5,-2.938],[1.5,-2.938],[2.5,-1.938],[2.5,0],[0,2.833],[-2.5,0],[-2.5,-1.938]],"c":true}]},{"t":13,"s":[{"i":[[-0.55,0],[0,0],[0,-0.55],[0,0],[1.38,0],[0,1.38],[0,0]],"o":[[0,0],[0.55,0],[0,0],[0,1.38],[-1.38,0],[0,0],[0,-0.55]],"v":[[-1.5,-2.5],[1.5,-2.5],[2.5,-1.5],[2.5,0],[0,2.5],[-2.5,0],[-2.5,-1.5]],"c":true}]}],"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"矩形","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":20,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"路径 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,34.599,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[2.2,0],[2.19,-0.35],[0,-1.82],[0,0],[0,0],[-1.98,0],[0,0],[0,0],[0,0],[-0.72,0.53],[0,0],[0,0],[0,2.05],[0,0],[1.8,0.28]],"o":[[-2.19,0],[-1.8,0.28],[0,0],[0,0],[0.1,1.96],[0,0],[0,0],[0,0],[0.58,0.65],[0,0],[0,0],[2.05,0],[0,0],[0,-1.82],[-2.2,-0.35]],"v":[[-0.003,-9.745],[-6.583,-9.215],[-9.712,-5.555],[-9.712,3.465],[-9.702,3.665],[-6.003,7.175],[-3.383,7.175],[-2.122,9.065],[-2.023,9.185],[0.277,9.405],[3.238,7.175],[5.997,7.175],[9.717,3.465],[9.717,-5.555],[6.587,-9.215]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.266,0.638,1,0.5,0.242,0.595,1,1,0.217,0.552,1],"ix":9}},"s":{"a":0,"k":[-9.712,-9.745],"ix":5},"e":{"a":0,"k":[9.712,9.745],"ix":6},"t":1,"nm":"color","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"路径","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":150,"st":0,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"预合成 1","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33,0],"ix":2},"a":{"a":0,"k":[33,33,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":0,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":4,"s":[70,70,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":9,"s":[110,110,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":13,"s":[90,90,100]},{"t":16,"s":[100,100,100]}],"ix":6}},"ao":0,"w":66,"h":66,"ip":0,"op":20,"st":0,"bm":0}],"markers":[]} \ No newline at end of file +{"v":"5.6.9","fr":30,"ip":0,"op":20,"w":66,"h":66,"nm":"bottom bar tab/论坛/选中/E","ddd":0,"assets":[{"id":"comp_0","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"矩形 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":4,"s":[80,80,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":9,"s":[110,110,100]},{"t":13,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":1,"y":0},"t":0,"s":[{"i":[[0,0],[0,0],[1.38,0],[0,1.38],[0,0]],"o":[[0,0],[0,1.38],[-1.38,0],[0,0],[0,0]],"v":[[2.5,-2.5],[2.5,0],[0,2.5],[-2.5,0],[-2.5,-2.5]],"c":true}]},{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"t":4,"s":[{"i":[[0,0],[0,0],[1.38,0],[0,1.38],[0,0]],"o":[[0,0],[0,1.38],[-1.38,0],[0,0],[0,0]],"v":[[2.5,-1.276],[2.5,0],[0,2.083],[-2.5,0],[-2.5,-1.276]],"c":true}]},{"i":{"x":0.667,"y":1},"o":{"x":1,"y":0},"t":9,"s":[{"i":[[0,0],[0,0],[1.38,0],[0,1.38],[0,0]],"o":[[0,0],[0,1.38],[-1.38,0],[0,0],[0,0]],"v":[[2.5,-3.037],[2.5,0],[0,2.746],[-2.5,0],[-2.5,-3.037]],"c":true}]},{"t":13,"s":[{"i":[[0,0],[0,0],[1.38,0],[0,1.38],[0,0]],"o":[[0,0],[0,1.38],[-1.38,0],[0,0],[0,0]],"v":[[2.5,-2.5],[2.5,0],[0,2.5],[-2.5,0],[-2.5,-2.5]],"c":true}]}],"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"rd","nm":"圆角 1","r":{"a":0,"k":1.2,"ix":1},"ix":2,"mn":"ADBE Vector Filter - RC","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"矩形","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":150,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"路径 3","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33.76,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.8,0.42],[-3.44,-0.79],[-0.09,-1.71],[0,0],[0,0],[1.98,-0.1],[0,0],[0,0],[0,0],[0.62,0.57],[0,0],[0,0],[0,0],[0,0],[0,0],[0.2,1.89],[0,0],[0,0],[0,0]],"o":[[3.44,-0.79],[1.74,0.41],[0,0],[0,0],[0,2],[0,0],[0,0],[0,0],[-0.69,0.52],[0,0],[0,0],[0,0],[0,0],[0,0],[-1.94,0],[0,0],[0,0],[0,0],[0,-1.8]],"v":[[-6.39,-8.971],[6.39,-8.971],[9.49,-5.471],[9.5,-5.271],[9.5,3.249],[5.95,6.989],[5.75,6.999],[3.25,6.999],[0.3,9.209],[-1.95,9.089],[-2.06,8.969],[-2.17,8.849],[-2.21,8.779],[-3.4,6.999],[-5.75,6.999],[-9.48,3.639],[-9.49,3.449],[-9.5,3.249],[-9.5,-5.271]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.266,0.638,1,0.5,0.242,0.595,1,1,0.217,0.552,1],"ix":9}},"s":{"a":0,"k":[-9.5,-9.561],"ix":5},"e":{"a":0,"k":[9.5,9.561],"ix":6},"t":1,"nm":"color","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"路径","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":150,"st":0,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"预合成 1","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33,0],"ix":2},"a":{"a":0,"k":[33,33,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":0,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":4,"s":[70,70,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":9,"s":[110,110,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":13,"s":[90,90,100]},{"t":16,"s":[100,100,100]}],"ix":6}},"ao":0,"w":66,"h":66,"ip":0,"op":20,"st":0,"bm":0}],"markers":[]} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/util/DialogUtils.java b/app/src/main/java/com/gh/common/util/DialogUtils.java index 825d129e0d..d94ee3ed90 100644 --- a/app/src/main/java/com/gh/common/util/DialogUtils.java +++ b/app/src/main/java/com/gh/common/util/DialogUtils.java @@ -329,6 +329,66 @@ public class DialogUtils { dialog.show(); } + /** + * ios 风格弹窗 + * + * @param context + * @param title 标题 + * @param message 内容 + * @param negative 取消按钮文本 + * @param positive 确认按钮文本 + * @param clListener 取消按钮监听 + * @param cmListener 确认按钮监听 + */ + public static Dialog showNewAlertDialog(Context context, String title, CharSequence message + , String negative, String positive, final CancelListener clListener, final ConfirmListener cmListener) { + context = checkDialogContext(context); + + final Dialog dialog = new Dialog(context, R.style.GhAlertDialog); + + View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_new_alert, null); + + TextView titleTv = contentView.findViewById(R.id.title); + TextView contentTv = contentView.findViewById(R.id.content); + TextView cancelBtn = contentView.findViewById(R.id.cancel); + TextView confirmBtn = contentView.findViewById(R.id.confirm); + View middleLine = contentView.findViewById(R.id.middle_line); + + titleTv.setText(title); + contentTv.setText(message); + cancelBtn.setText(negative); + confirmBtn.setText(positive); + if (negative.isEmpty()) { + cancelBtn.setVisibility(View.GONE); + middleLine.setVisibility(View.GONE); + confirmBtn.setTextColor(ContextCompat.getColor(context, R.color.text_333333)); + } + if (positive.isEmpty()) { + confirmBtn.setVisibility(View.GONE); + middleLine.setVisibility(View.GONE); + } + + cancelBtn.setOnClickListener(v -> { + if (clListener != null) clListener.onCancel(); + dialog.dismiss(); + }); + + confirmBtn.setOnClickListener(v -> { + if (cmListener != null) cmListener.onConfirm(); + dialog.dismiss(); + }); + + Window window = dialog.getWindow(); + if (window != null) { + window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); + } + + dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); + dialog.setContentView(contentView); + dialog.show(); + return dialog; + } + /** * Material Design 风格弹窗 * @@ -1577,35 +1637,6 @@ public class DialogUtils { dialog.show(); } - public static void showUploadVideoChangeLabelDialog(Context context, @NonNull ConfirmListener confirmListener) { - context = checkDialogContext(context); - - final Dialog dialog = new Dialog(context, R.style.GhAlertDialog); - - View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_upload_video_change_label, null); - - View cancelBtn = contentView.findViewById(R.id.cancel); - View confirmBtn = contentView.findViewById(R.id.confirm); - - cancelBtn.setOnClickListener(v -> { - dialog.dismiss(); - }); - - confirmBtn.setOnClickListener(v -> { - confirmListener.onConfirm(); - dialog.dismiss(); - }); - - Window window = dialog.getWindow(); - if (window != null) { - window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); - } - - dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); - dialog.setContentView(contentView); - dialog.show(); - } - public static void showVideoComplaintDialog(Context context, List options, List disabledOptions, diff --git a/app/src/main/java/com/gh/gamecenter/entity/MenuItemEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/MenuItemEntity.kt new file mode 100644 index 0000000000..d741082ecd --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/entity/MenuItemEntity.kt @@ -0,0 +1,7 @@ +package com.gh.gamecenter.entity + +data class MenuItemEntity( + val text: String = "", + val normalIcon: Int = 0, + val disableIcon: Int = 0 +) \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailFragment.kt index a77ba0e27a..c9fed809f8 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailFragment.kt @@ -12,6 +12,7 @@ import android.widget.ImageView import android.widget.LinearLayout import android.widget.PopupWindow import android.widget.TextView +import androidx.core.content.ContextCompat import androidx.core.view.ViewCompat import androidx.lifecycle.Lifecycle import androidx.recyclerview.widget.RecyclerView @@ -25,10 +26,7 @@ import com.gh.gamecenter.R import com.gh.gamecenter.SuggestionActivity import com.gh.gamecenter.baselist.ListAdapter import com.gh.gamecenter.baselist.LoadType -import com.gh.gamecenter.entity.CommentEntity -import com.gh.gamecenter.entity.CommunityEntity -import com.gh.gamecenter.entity.Permissions -import com.gh.gamecenter.entity.SpecialColumn +import com.gh.gamecenter.entity.* import com.gh.gamecenter.eventbus.EBReuse import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.personal.PersonalFragment @@ -43,6 +41,7 @@ import kotlinx.android.synthetic.main.piece_article_input_container.* import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode import java.util.* +import kotlin.collections.ArrayList class ArticleDetailFragment : BaseArticleDetailCommentFragment() { @@ -339,7 +338,7 @@ class ArticleDetailFragment : BaseArticleDetailCommentFragment(R.id.container_home).visibility = View.GONE - val reportContainer = view.findViewById(R.id.container_report) - val shareContainer = view.findViewById(R.id.container_share) - val reportTv = view.findViewById(R.id.tv_report) - val reportIv = view.findViewById(R.id.iv_report) - - if (mViewModel.detailEntity?.me!!.isModerator) { - val controlView = view.findViewById(R.id.container_control) - controlView.visibility = View.VISIBLE - controlView.setOnClickListener { - showControlDialog(mViewModel.detailEntity!!) - popupWindow.dismiss() - } - } - + val container = view.findViewById(R.id.container) + val entities = ArrayList() if (mViewModel.detailEntity?.user?.id == UserManager.getInstance().userId) { - reportTv.text = "编辑帖子" - reportIv.setImageResource(R.drawable.menu_more_edit) + entities.add(MenuItemEntity("编辑", R.drawable.menu_more_edit)) } + if (mViewModel.detailEntity?.user?.id != UserManager.getInstance().userId) { + entities.add(MenuItemEntity("投诉", R.drawable.ic_menu_gamedetail_feedback)) + } + if (mViewModel.detailEntity?.me!!.isModerator) { + entities.add(MenuItemEntity("加精", R.drawable.menu_more_essence_enable, + if (mViewModel.detailEntity?.isHighlighted == true || mViewModel.detailEntity?.user?.id == UserManager.getInstance().userId) + R.drawable.menu_more_essence_unenable else 0)) + } + if (mViewModel.detailEntity?.me!!.isModerator || mViewModel.detailEntity?.user?.id == UserManager.getInstance().userId) { + entities.add(MenuItemEntity("删除", R.drawable.menu_more_delete)) + } + entities.forEachIndexed { index, item -> + val menuItem = createMenuItem(index, item) + container.addView(menuItem) + menuItem.setOnClickListener { + popupWindow.dismiss() + when (item.text) { + "编辑" -> { + startActivityForResult(ArticleEditActivity.getPatchIntent(requireContext(), mViewModel.detailEntity!!), ArticleDetailActivity.ARTICLE_PATCH_REQUEST) + } + "投诉" -> { + SuggestionActivity.startSuggestionActivity(requireContext(), SuggestType.normal, "report", + "帖子投诉（" + mViewModel.articleId + "）：") + } + "加精" -> addEssenceForum(mViewModel.detailEntity!!) + "删除" -> { + DialogUtils.showNewAlertDialog(requireContext(), "提示", "删除帖子后，其中的所有评论及回复都将被删除", "取消", "删除", {}, { - reportContainer.setOnClickListener { - popupWindow.dismiss() - if (mViewModel.detailEntity?.user?.id == UserManager.getInstance().userId) { - startActivityForResult(ArticleEditActivity.getPatchIntent(requireContext(), mViewModel.detailEntity!!), ArticleDetailActivity.ARTICLE_PATCH_REQUEST) - } else { - SuggestionActivity.startSuggestionActivity(requireContext(), SuggestType.normal, "report", - "帖子投诉（" + mViewModel.articleId + "）：") + }) + } + } } } + } + } - shareContainer.visibility = View.VISIBLE - shareContainer.setOnClickListener { - mAdapter?.articleDetailVH?.binding?.shareContainer?.performClick() - popupWindow.dismiss() + private fun createMenuItem(index: Int, item: MenuItemEntity): View { + val view = LayoutInflater.from(requireContext()).inflate(R.layout.item_detail_more_menu, null, false) + val iconIv = view.findViewById(R.id.iconIv) + val actionNameTv = view.findViewById(R.id.actionNameTv) + iconIv.setImageDrawable(ContextCompat.getDrawable(requireContext(), if (item.disableIcon > 0) item.disableIcon else item.normalIcon)) + actionNameTv.setTextColor(ContextCompat.getColor(requireContext(), if (item.disableIcon > 0) R.color.text_999999 else R.color.text_333333)) + view.isEnabled = item.disableIcon == 0 + actionNameTv.text = item.text + if (index > 0) { + val params = LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT) + params.topMargin = 1f.dip2px() + view.layoutParams = params + } + return view + } + + private fun addEssenceForum(article: ArticleDetailEntity) { + var highlightDialogHintContent = "" + val permissions = article.me.moderatorPermissions + if (permissions.highlightCommunityArticle > Permissions.GUEST) { + highlightDialogHintContent = if (permissions.highlightCommunityArticle == Permissions.REPORTER) { + "你的操作将提交给小编审核，确定提交吗？" + } else { + "你的操作将立即生效，确定提交吗？（你的管理权限为：高级）" } } + when { + article.isHighlighted -> toast("帖子已经加精") + + else -> DialogUtils.showAlertDialog(requireContext(), "加精帖子", highlightDialogHintContent, + "确定", "取消", + { mViewModel.doHighlightThisArticle(mViewModel.detailEntity!!.community.id, mViewModel.articleId) }, null) + } } private fun showControlDialog(article: ArticleDetailEntity) { diff --git a/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt b/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt index 77b2c3ca26..ef9967f724 100644 --- a/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt @@ -189,12 +189,12 @@ class UploadVideoActivity : ToolBarActivity() { } mBinding.reprintTv.setOnClickListener { if (mActivityLabelEntity != null) { - DialogUtils.showUploadVideoChangeLabelDialog(this) { + DialogUtils.showNewAlertDialog(this, "温馨提示", "修改的内容将导致取消参与活动哦～", "暂不修改", "确定修改", {}, { switchVideoSource(false) mActivityLabelEntity = null mBinding.activityContainer.visibility = View.GONE mBinding.activityTv.text = "" - } + }) } else { switchVideoSource(false) } diff --git a/app/src/main/res/drawable-xxhdpi/ic_ask_select.png b/app/src/main/res/drawable-xxhdpi/ic_ask_select.png index bfff92e2c9de9130f015e1af3c4100292be0f764..b87acd236e4e134a81cf0377666bc014bce37acf 100644 GIT binary patch delta 3475 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 B!gc@v delta 3589 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 LNkvXXu0mjfJM;sP diff --git a/app/src/main/res/drawable-xxhdpi/ic_ask_unselect.png b/app/src/main/res/drawable-xxhdpi/ic_ask_unselect.png index 10c3aca78deadacdb88541c2b52b3c28f89ad136..48352bc6e67cf53c31a6799ea63fb54a9a75264e 100644 GIT binary patch delta 2333 zcmV+&3F7vs5``0xfq(BwL_t(|0qt9VY#c`wesA~A=Ol9Lpj1_hNFzZig%I3UI8af6 zKm-**gwM@g5?U#3QBzUdBx$NrLg;b52VEdm?NK_DxeW_h3K}rh(QD_jcpba!_ zMO8IPNvgI6J2DBj?{0_ho$q|JvwP?JwU#YzrSs0bdGF18-+#_~GrKb;s$X>k>Il>k zs3R~Z0z4;2i4009j>jLqHc68!*-|&K;+3GSAXdwvVmT>Zu5f2kONcqF6opZ4KwCK5 zMN$z@GgFe3lJb9H+!*A?&^`wFF=ifBtj;Tk&xNV+{NUi@?}7%k)n63>5sQ86YKO11 z!h#k>>L!?R6Mr0AO{5~#n^cYlo&s=hK;mU4#*a>0YUxNKvG-CrT7vH57QvBr_zmh}C$$zklCoaoO@(w{G3NV#+}>Mk02IR}wiN27<^_ z)B+Hji+^du=y+^+udjv6c=c#GF*9Vf6eA9z6)7zx1P0uEJPWdTYD75y?J6atl zeH8X%)aVyR?-KQq;ivolrBkJBnFOgPIl0pV0)O#eme`@zg${z)KQwS)gc}=M5e_3# z&tIyUCkeiJFAos1Faq0lomG;a9iqGX`wzUU(-(4i_~%c&hh%%#Ov27virjKv*2g>% zB@Yns_^uXY?Q3-|B)^_#`g>p3X^WveJka+KfbnCOt?+Hr)^Exp&~ z$$vUw(iTe{3GzA9R?LL!OqvG>a>z9rM8Hy*9vA7=U^l$%G2PEclL_xI%S>7#(eu7Z zTP$_IwTz#S-Vw1_Jgl*ubs(~U)`6%4;f}44yBb_A7Td8h$?1Doshjcj>1wRne3$ol zfx?PTT~f?1g_V6MkvMQZIIHrS=LLvpynpMyq)P3>3sDms#f2B@ybYdGrcJ4@CMmTW zvb%=|dw$|!sxcw(9MKl*+^&>!5Oz0JV0)9u3Xm1ZmL(D>5E2e}`cIT)kq3by{3|lAgBJ@{-=BgraZUI4;Ym)o|+V@?IHLL^*1m5z@mz#+&HGiy1 zB%b_tF&}2WhfJRZ&ny^{WQ)mE+ZJeO$n2mSC?jDm5QJZN%u!?N()HG&94HWlrpQVR zuca=({sRTVufv5(s{@gJGC>0|;Ti!<*SYG&Dqdc20+r2MPpsnScIl7|BYWS3W4b zr5y0kWveL%o+EVQvP1m-SbwbR(G=50gv2M|`1Qgg>jar1Wp)TUG3qwu${rxFNt()- zmE*uY78|q^iMVST)SAmKW*wE;#F$aaRyC)9*q)@{yZB~&bdkK9z}NtO&&`6pPx}SW zHlWF~Q0u<7`}pX|5!f`nU^+FW$oB+_$+r;ela6(pX_w8`KTVnkh<~e=*)L{}=;@pe z?ULh#I%zSK#bz8?wLMwOdJVqqp9Qw=JyZgXqmgB zjY)DgMq?cpaBvi->}bl>Zd72y7O=^t#qi?XEIKFynm)wz=)i za$&u4A>)%c=Mb}lWhByblrXT&gQmw=dk0@ zlhuMCwu=wNKoFzmJYW6V-~V)J-P(tqBJ14S2ou?4aqU%<8HgMX0wR2jOxtT-HNS@cjyefEK81|A&qGPo&4L&MFAg*VP%ZrZwYecDOi zj>;a^bA$fN3}9V7gW_M*X40i{y6^84C{P;OQ&NLOfp-2%}c{K&sRRs`_GlQah3nN_DE?o>+S$6dlxitv-dc}0{* ze?}=gubA>gO8R+LJmc_edRu9oTh(q&A3F3nOg(JPJsE1H1 zQfPCJVzs()=6}`DMCuFxp2qcZOq3(V(*P^SHs#vXyHBRmL$ftT`&glX7#bSVCr_P; z+pHdhhL6MHl|D_&i;xFMM>VMf8$P%?3;XSQ=G6saYjV#<=E6Zt>%Mx*mLnhG^(P|h zOPSR0i?!^l3B=aq;6t{}qljOtmXh#1x`Z5&Cr0cO&3`Z>FDS_aPU$2zsIl5G)&sK=nJIPIHueScH4^S?4ifs_R1_pKfdGPHG1x14{YATw)z5q z+2XYWHqYVrkxXjrB_GdAz;q?dhL=%)$m9VrIBadpriYK3^yS))C-&T-RN-mN&^4xw z2)`4U6(2?oR;B1lbG~(7a`$HgK*(9j+Sn{0h<_(ytJsVim@|D8-^53gCT$-OHuFxe zkkYX|>GbflkG{+aj?J*$Yi5v-E+7(#$rv*Ao#sHq)brWY{-2w)W@?M=;)B~}zH{E! z3e^RKQpc`G;9Ol{0~STknf+#LdwrPq@!0jIFD@X8T3u^0rH!TV6)&yX`awQ;eRTn$ zseg!vBX`j;KI5h|UoXf9udgm3n$N|?S=<7mgk=ke77*^RYS2@qTWL@)p4^2UtNH{n zZ2-UCQ{^QlK8f}JH`&zKksy7IrbP}!{DEEXQ5Wb(Z1X*0JRXL^`M~Pa0PY*{#K14q zO8#>8Cu9E(H}J}&qR$Zmf|>{6N=$UdLVw4VjJ=#Okpkg_!va7kJ0f6+u5v$$I?~XP zoZvMYkH0S=I?j3Nu0E-&@RWF~Nh|4!EMG(lgd|2YCkP1H$|hSereJg z-HsFp=PMX_pA)#FSX4*xF!iVzCVvtRLbHqNnD?6}UcUY?ogVpDqn$VPMY^+;3sJlE zEuNi=V_Utta$)YkUH{I^EPoq2$k&8E$LA#{xWd7a$2kbyZVfr@2>(PnBgF2^Pxt*@ z<5MBNnFbx)z!?+1QGO8hfgodKtmudk14nh_K*&`xlf%yw#XbdB!@m)SY=109pOmpt zgCP1B1qiv2IHcR#Zo!Q|;7y>yFPC{99T3@{O^p1uOpm&bJV%%gl&1JYiNxSz1yY|w zNNk4V*NKem6J&{$)gkJ{Xxdb6FDek_i6t!&gw9q7`L%)yTYL~Hm_sWV2~bc?1D=?Igo(kDR8UG1dsGniS$@@ za%8~IsZH6rb8q*5^M7+VHca;+&V94D_GllMNmDYL8cq8+Am9{Ta5+77{8ZnD&8Ltp z?}kKMuvAzoZ|YmW>8;aKFP;cH;@-sIri+E*v$($8*@fPWJV3a=8VF)jO_XIIY5h@u z&Is#HMGgmg_x1M=IL{RoYH$ljp!X8lM*+gxV2SWlu{~y4TYqYSAlgDB9Z&53j3RqG zKH=RB1Fs2hN<~tZt!#R<>c?COg|qp>k8#-i-pZ&eXknk=Yy+@5Nb(P(Av6$WWpZNv zmDkT+YhSXjvtssDWxBU67WE2N_IN5?$biD~sW{K{^92J zn{Gq%rkY-rLSg*L;Xl`ui+~xt#g5=YZQPzLsJRI_59L=+m$c?bGpW&ie%|6xBF_<~ z8}dIA1vq-{e*6dD7m*)sz(1{?!*k28EpB@vo&MfmP1#nvg}~Ax@IMpH0xdiZjmQ81 N002ovPDHLkV1gzPx#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91HlPCl1ONa40RR91HUIzs0P{mGqyPW|5=lfsRA>e5T0M^vK^O-1vXvb% z5GsutD;pDIdjWrd6^TDULP2css%vPjF__I%*<_fRci)fad1skfhAEZoWixOiGEmNn!t*?5I-T}6n@yX_Bl72_ z^y!z&<#Q@tv)Mdtx7+KKezsg#qN1_pi>Qt*LizZ&Nf_MrK2UwlbBZEqLnSNqBESge>-A%XS8U4cEpO#aNhpy zh~=HpqW#$sOORpSE8#kUNvOg$T!%N(HgX#=-kL_O3nq)LD%OGOhORvLsS@t%>DXtn zRmI6|#8d%H$t^KcnNJ(nj#%2vnX>yYM=U&Nfj_=YWnPXeVF@wHdT}H6gOyjS6%MA{ zh)co}VwAxtiP8SxjFs2xwRr4-#YSooi-=JM6G!a5pxmcT%|oGYq#0o7b8sRiVr22Q zR=!fz>vfL~lpK-PV=4}9YM#-a`KjYLUaeL;$I*p|r-C~8PT}#xND&5*;?qQPU{r-w z{wV>2Uaxo8_x-QbysdIzNdD7x-KWFh@VhF$@==5V4B>#9bCm-F^7(b7fGL(36hMxS z0zILh7BA?T{z#$=D#~dVHaTC2b%EHx04#AMm2+(C&SoHM2L1rLG41|TeDco#0000< KMNUMnLSTY)45BRn literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/menu_more_essence_enable.png b/app/src/main/res/drawable-xxhdpi/menu_more_essence_enable.png new file mode 100644 index 0000000000000000000000000000000000000000..40645ee698e6141101b5495b49152daddf202f8f GIT binary patch literal 2402 zcmV-o37z(dP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91HlPCl1ONa40RR91HUIzs0P{mGqyPX2%t=H+RA>d=ntNzgWgN%nF0#2` zR;D>D3ZewTO3MnZETy8t$Z7=LsLb0ox56v-|d`tD)hj^@Av$k-~Bx2xt)`dafZsoi4${F&ycx{ zUZ>MgadGjGwzjsZr%s)^3p;~6Tfg_})oX2bc6LL3ef{3kW&gAUR#H+@*xK6q3IRQW zBCBEWZZa&n%ltE=1B(*Y(k8p%#oRaNf({rf8rex9Jt2`Fjx+P>jPaQ{M|H*ny< zYUEo2GLf4-7TBaolg1Ow8+dZ5>kW>7MEmtIW5#R~edETBBLGjsd#~C~`5E5IB}Ha zeW6R}z<3X`d5?-QT7|W~W)Vl)!0Yq!@~RdrSa8_r-GSxh<$aGIKVAi|^kzFUhtXTb z`&W-$>F;(46&UZ)9T=`g`(W1s#@9oyAiLkW^sqRiU@*F>(RD{a_B-emynpKh^rX#h z1;%=GIn(!>XwiD)mLF(LC!n=1Fcd59nIU@-UtCPj*w5l!0NO0O^_3X;gQb zK0_W@gr*??4zm#*4lpbi6^mNHlzFL*K2edtVukVEoYC@+` zs6myMmJT9G+o{@O-9WttJ2Pp2!4tU9Y=(jIMLr?ZC^`A+Z4i8Fe1T!?T6%|xgG~I( znsk44b@d^iL^m6(JDDd=ocIv-ixY?p#+gsVlc29ll6;bH^3h`+=J_6%^(iKk*Ts7> zGCruOsrl1sheDg0nzSQPqEuQKE)V0#gTh51(<3|{HA5HAw+~D(;Jbe)(s_w7VtB9N zVIh-GKXlDAIRbixA@m*#>?+|#7ms+Y9TvJiy1q+~?}=eF&y<57H#`D-4Vm*ixu4h) z%{Lt${*%`hk9Z>$*GJcPDYHo;l41#w@f?Pkjv^z;+DHtHB$MZxLfX@Kmtw21WaQhTpoNLXY;o zL)UN|CmqrS{tLls*Acly4opFL!Pt;ZDN>3CL^O~DmBX$|2~)G^RvO9Y9V zL0<#<{!XYQ1u;@!$BrG-wk9S^AiFvC5AW(wnZkz*FA++{3If)>$u|UeCGA|+yPJU@ zr;<<97j-Dccl0>Wo=#9fr!=`hYc@KGYd1U$j2hTZjMz*!j9G4W7^A6prHf?U;PJF` z{@Rg>KUrU-z?h2nlS$o3#R`thVitSM+EJl&NSDcDqdMxHW2C@jn1yyWhS!@Dz-44x zFMg!r$u2Wt>Bh!$)(#6J2gbY5R!~q-gaf-hqdM`fVir3$tP`HhD&(X?8}QxIEgNBV z8Gq!!q+tI1`TyXA?k9d%n_+Z5^?u=Diex0~$>?tXF6j=VBgmUpU{c2B_7A{HQ;dV5 zH?;wom7Y#h840Exm}j-WStr|}FF0Kp@C!^=I4x zJTUOkfdyn-UFK(K7->rtv_i(+jj(ShGUHv(p05O++a<@-{fy&D9owjHOb_itY@Mv> z-XR(-H0+VUaP|m}$BcvD%gym}ZjSE;FU8^Eu2=9q1nnW#tsUUCeA!$>`vK#D)?|1( z&=(j=@NP0$yZh-^f)n;zydG~(DjLC3tlvj&tH&V--f zz$nj&og~EfF8hX}nDm*H?Aab|6es0f1RH<3Jw;~?$QSv91F@jwt9%YR)ai+d0pb7O zM+u9ZiE8dDtsum94mL`$p@XNpXtzSIg+2${M}l(JP8pan=~FGU zrM?Z{X*3W1fDwHgUKgOJ)nxI$6I<0N@qMbr);eatinKq~2ED`J|Lfzr8z86J?0x(8 zl|Xxu+SmHXre@MQKJUzq_&bF3X;10yh7LoU&E;xc*wb{khN3y|Lf!!#C|{yZpk_IJ z2MKZ}ca6)sx|Y)qEc}A>6v1e6a1W^35x+&9!F%M}R6BN3qLBkLt?b^1vV+jK;n7C( z;2yR)Wz1Sz0`ypuS$DMLXbg4xNy-+OMxD$9wc9@^%U9h($wtG%#~P zKVqIddGb}-4^xxb(3xf>i~X}vFGbB>BACo*BHqxnv-#_6XlJ7eXeXf>RX(iTf5E5y U1fudND*ylh07*qoM6N<$f@}nhPXGV_ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/menu_more_essence_unenable.png b/app/src/main/res/drawable-xxhdpi/menu_more_essence_unenable.png new file mode 100644 index 0000000000000000000000000000000000000000..255982cdcc30e263a92a8c4975520f210ee88ca5 GIT binary patch literal 2408 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 + android:background="@drawable/background_shape_white_radius_6"> + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/menu_answer_detail_more_new.xml b/app/src/main/res/layout/menu_answer_detail_more_new.xml new file mode 100644 index 0000000000..8fb1a3aa5a --- /dev/null +++ b/app/src/main/res/layout/menu_answer_detail_more_new.xml @@ -0,0 +1,22 @@ + + + + + + + + + +