From 086c31a7d4d676583ac9855d56f4f98f7a9c3de7 Mon Sep 17 00:00:00 2001 From: juntao Date: Thu, 27 Aug 2020 23:09:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A4=BC=E5=8C=85?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=87=8D=E5=A4=8D=E8=B7=B3=E8=BD=AC=E4=BC=9A?= =?UTF-8?q?=E5=A4=8D=E7=94=A8=E7=AC=AC=E4=B8=80=E4=B8=AA=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/gh/common/util/DirectUtils.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/com/gh/common/util/DirectUtils.kt b/app/src/main/java/com/gh/common/util/DirectUtils.kt index 37d2cf0553..c9444ec9ee 100644 --- a/app/src/main/java/com/gh/common/util/DirectUtils.kt +++ b/app/src/main/java/com/gh/common/util/DirectUtils.kt @@ -641,6 +641,7 @@ object DirectUtils { bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER) bundle.putString(KEY_TO, LibaoDetailActivity::class.java.simpleName) bundle.putString(EntranceUtils.KEY_ID, giftId) + HaloApp.put(LibaoEntity.TAG, null) jumpActivity(context, bundle) } From 6bd7ced28c57dda8d64325d3bbaafeb433e36fad Mon Sep 17 00:00:00 2001 From: juntao Date: Thu, 27 Aug 2020 23:15:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B8=96=E5=AD=90?= =?UTF-8?q?=E8=AF=A6=E6=83=85UI=E6=B5=8B=E8=AF=950827PM=20https://gitlab.g?= =?UTF-8?q?hzs.com/pm/halo-app-issues/-/issues/967?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/item_article_detail_comment.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/res/layout/item_article_detail_comment.xml b/app/src/main/res/layout/item_article_detail_comment.xml index a3c136d12c..1a30955e6f 100644 --- a/app/src/main/res/layout/item_article_detail_comment.xml +++ b/app/src/main/res/layout/item_article_detail_comment.xml @@ -121,7 +121,6 @@ goneIf="@{comment.user.badge == null}" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="2dp" android:layout_marginRight="11dp" android:gravity="center" android:includeFontPadding="false"