From cb345f49ebdd516d8edd76530c69cd74a86cb565 Mon Sep 17 00:00:00 2001
From: lyr <15622190878@163.com>
Date: Mon, 22 Mar 2021 15:26:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=89=E7=8E=AF=E5=89=8D=E7=AB=AF=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E6=B1=87=E6=80=BB=EF=BC=882021=E5=B9=B42=E6=9C=88?=
 =?UTF-8?q?=EF=BC=89=E7=AC=AC5=E3=80=8111=E7=82=B9=20https://git.ghzs.com/?=
 =?UTF-8?q?pm/halo-app-issues/-/issues/1154?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gh/gamecenter/SuggestionActivity.java |  41 ++++++++++++++-
 .../res/drawable-xxhdpi/ic_type_selected.webp | Bin 0 -> 1436 bytes
 .../res/drawable-xxhdpi/ic_type_unselect.webp | Bin 0 -> 1210 bytes
 .../res/drawable/selector_ic_crash_type.xml   |   7 +++
 app/src/main/res/layout/activity_suggest.xml  |  49 ++++++++++++++++++
 app/src/main/res/values/strings.xml           |   4 +-
 6 files changed, 97 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_type_selected.webp
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_type_unselect.webp
 create mode 100644 app/src/main/res/drawable/selector_ic_crash_type.xml

diff --git a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java
index fc891ec6e2..0a6556231c 100644
--- a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java
@@ -77,6 +77,7 @@ import com.gh.gamecenter.suggest.SuggestType;
 import com.halo.assistant.HaloApp;
 import com.lightgame.utils.Util_System_Keyboard;
 import com.lightgame.utils.Utils;
+import com.lightgame.view.CheckableImageView;
 import com.walkud.rom.checker.RomIdentifier;
 
 import org.jetbrains.annotations.NotNull;
@@ -197,6 +198,12 @@ public class SuggestionActivity extends ToolBarActivity implements OnRequestCall
     EditText mContactMethodEt;
     @BindView(R.id.lookDetailDesTv)
     TextView mLookDetailDesTv;
+    @BindView(R.id.suggest_crash_type_container)
+    View mCrashTypeContainer;
+    @BindView(R.id.appCrashTypeIv)
+    CheckableImageView mAppCrashTypeIv;
+    @BindView(R.id.gameCrashTypeIv)
+    CheckableImageView mGameCrashTypeIv;
 
     public static final int MEDIA_STORE_REQUEST = 1;
     public static final int MEDIA_STORE_CREDENTIALS_REQUEST = 2;
@@ -376,7 +383,7 @@ public class SuggestionActivity extends ToolBarActivity implements OnRequestCall
         mSuggestContent = extras.getString(EntranceUtils.KEY_CONTENT);
         mSuggestHintType = extras.getString(EntranceUtils.KEY_SUGGEST_HINT_TYPE);
         mHideHint = extras.getString(EntranceUtils.KEY_HIDE_SUGGEST_HINT, "");
-        String gamePlatform = mHideHint = extras.getString(EntranceUtils.KEY_PLATFORM, "");
+        String gamePlatform = extras.getString(EntranceUtils.KEY_PLATFORM, "");
         mFunctionTypeName = getResources().getStringArray(R.array.suggest_function_type);
         mGameEntity = extras.getParcelable(SimpleGameEntity.class.getSimpleName());
         fromRating = extras.getBoolean(FROM_RATING_KEY, false);
@@ -596,6 +603,11 @@ public class SuggestionActivity extends ToolBarActivity implements OnRequestCall
             mSuggestTypeContainer.setVisibility(View.GONE);
             mSuggestGameLl.setVisibility(View.GONE);
             mCopyrightContainer.setVisibility(View.GONE);
+            mCrashTypeContainer.setVisibility(View.VISIBLE);
+            // 通过提示弹窗点击进入的意见反馈-发生闪退，[闪退类型]需要自动选择App闪退
+            if (mHideHint.equals("APP闪退：")) {
+                mAppCrashTypeIv.setChecked(true);
+            }
         } else if (type == SuggestType.gameQuestion) {
             mSuggestTypeContainer.setVisibility(View.GONE);
             mCopyrightContainer.setVisibility(View.GONE);
@@ -724,7 +736,7 @@ public class SuggestionActivity extends ToolBarActivity implements OnRequestCall
     }
 
     @OnClick({R.id.suggest_post_btn, R.id.suggest_game_container, R.id.type_accelerate, R.id.type_material,
-            R.id.type_other, R.id.type_standalone, R.id.lookDetailDesTv})
+            R.id.type_other, R.id.type_standalone, R.id.lookDetailDesTv, R.id.appCrashTypeIv, R.id.gameCrashTypeIv})
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.suggest_post_btn:
@@ -739,6 +751,13 @@ public class SuggestionActivity extends ToolBarActivity implements OnRequestCall
                         return;
                     }
 
+                    if (mSuggestType == SuggestType.crash
+                            && !mAppCrashTypeIv.isChecked()
+                            && !mGameCrashTypeIv.isChecked()) {
+                        toast("请选择闪退类型");
+                        return;
+                    }
+
                     if (mSuggestGameLl.getVisibility() == View.VISIBLE &&
                             TextUtils.isEmpty(mSuggestGameName.getText().toString())) {
                         toast("请选择游戏");
@@ -833,6 +852,18 @@ public class SuggestionActivity extends ToolBarActivity implements OnRequestCall
             case R.id.lookDetailDesTv:
                 startActivity(WebActivity.getCopyrighyRulesIntent(this));
                 break;
+            case R.id.appCrashTypeIv:
+                if (!mAppCrashTypeIv.isChecked()) {
+                    mAppCrashTypeIv.setChecked(!mAppCrashTypeIv.isChecked());
+                    mGameCrashTypeIv.setChecked(!mAppCrashTypeIv.isChecked());
+                }
+                break;
+            case R.id.gameCrashTypeIv:
+                if (!mGameCrashTypeIv.isChecked()) {
+                    mGameCrashTypeIv.setChecked(!mGameCrashTypeIv.isChecked());
+                    mAppCrashTypeIv.setChecked(!mGameCrashTypeIv.isChecked());
+                }
+                break;
         }
     }
 
@@ -1102,6 +1133,12 @@ public class SuggestionActivity extends ToolBarActivity implements OnRequestCall
             params.put("suggestion_type", mSuggestType.getType() + "（评论）");
         } else if (!mDiagnosisResult.isEmpty()) {
             params.put("suggestion_type", "网络诊断");
+        } else if (mSuggestType == SuggestType.crash) {
+            if (mAppCrashTypeIv.isChecked()) {
+                params.put("suggestion_type", "APP闪退");
+            } else {
+                params.put("suggestion_type", "游戏闪退");
+            }
         } else {
             params.put("suggestion_type", mSuggestType.getType());
         }
diff --git a/app/src/main/res/drawable-xxhdpi/ic_type_selected.webp b/app/src/main/res/drawable-xxhdpi/ic_type_selected.webp
new file mode 100644
index 0000000000000000000000000000000000000000..6b428b5168408c148b6ea5fa7547fbb026240b7a
GIT binary patch
literal 1436
zcmV;N1!MYBNk&GL1pok7MM6+kP&il$0000G0000l001ul06|PpNbvyx00H;HxRE3$
z)EYee$v@OPa)^jr(!2+9Gd3vQHgSK|g?5-$HmiKo+<u{CR@^}t1_-w8rj6Vw^Dr|r
zGcz-jwf}X*8ClkB;3uO03f#6)F2{`9y}@`%ReQ%aZ(l!?S8R^;R#PUB^3d!fv0!$n
zYyv2bo|Ay{Q5YfV;hSF)@q2@`kx*K&B*vm7a2*E}1UkH~|A7K|==Zq37YgPDtZRQH
z1<=m8;y$T>zvHIoNs0M%+zkJa5*Uu>-6m?F=*;Lhse#eRRW3;pR1AiGDU_#YW(vPU
zCOt=?thKalGn1H0SAws|blRZ%{qHOuE4>tkopfhC$Zb{cSQ5rkE^<vr+(gE<k`U}n
zCUPBT>{PZqm&Er{?Sw0B@yLeTS8fjXqa%035-V-oBc9h!W(r>e2K8fR8g@GEFOB%*
z%v%?~3_IRnfYuB0@yRCE3kIm|#^zuroa?+MFRyGByPP#Z{lv{-#+7!RlAl{oM=Q=Y
z?U7wf%St1*eD`EER=6|e2I{yb31i-S7%MD`OCx&y_k7h^04<`@Bzdd|-qA|lx%MlP
zF_)IS)8(jAv#`{?Q;{6l=ovU9A*dLL<jjXyL&W6FKgcnCIr$HASYOUVUyndvPeES~
zLSN59Uynoop8%-;Ljb7%a{ws(qW}O_P&gob0{{Rp7XY0BDlh;r06sAiheDzu3yRDT
z0fJi%z(1M(0Cs>~0Dn3B0K+BGE4ViJpZ6a?AHjc?|5f1t8o(dNe*iBIV|7P|pG5p_
z`~asH{;OyMa0ly`>7NJ(^<VHFsNSF+fF4o5seb^Uw12RF|NcNfWk3JkX#KPBz6P!{
zwjc+9H^n@ndW8O~{+s#Vn7^5QfIp9aHv7Q%Rr5gh0R0ylLg=?u_8G63(nkTmcrM*g
zNh_HI@Ovv{+kC8?kR$Hi0092~*t+bJ<`<pw$#S0uwu>e`n)`>QQtc85!ml?FM-8O<
zBXr|@F$k@!kX&;j@_l)^-YV0(Y;d*2dba1K!gjeA{$f*b_02vw78j9%n1AvBQf^x8
zQm1$tTOm)5#_oQ6eGmWthbOj9$v+n`8!Nl{zrQ4CmrBBggQZTo{b}QbYBJb`-yaty
zvlS?4cXhf<kAjwOQX?Vbxf`|;1E9?ab&=)!S(Z$^!NFk&aS`<$mJ~h2PwIPx<(@YL
z4-W_bW&rU?z7xs)su1u50SY0EcXA8(vp4h;IAdo`eC9W9?I=#0`=_yei!5WnpTkwC
z50sx${JD235@*l$%psiE+DzH~-=Sdt^XH1v%P0&K1lvcMX07&m=ZDP5oH0V3=xZP3
z`x`dkIv$^@dAlQcXY;981DCp`7nz0fU(e;m2W#>CU-`76NsxejKtu1+3b48$*I|6m
z8MI%OL;f27T$D!|Q~v)GuYJq^!boAh{Mu0@$Ur{2Ww}3EAK~qcmgi8;h%}Ml62@Er
zL<qv2Q3e>}geM=D(vQl&rZ?O08Tns0SE}&QTjT~VboS;JW$=cHqyQG+O4{#t>Fsa(
zQ~%bA>Ebo;AnW_HdUGd>e*S<|SE%8nPa0-17!SRydmndsF=z=OSrnmBZes1#Ynr8i
ze{T8vKagA@=kM-{UX9#3j6CT7yG-x1tMYoge5Zt${K!X7QZCP&yvwH4Iz9HbS$+lh
zs|VHw9HHvxf8jJ2r~HpmUDdiP+>VK}2n4Y-rYhyEv@rkw%c@htUyP^SOKg#V!WIad
z{+#^2$C^Sjc!<)fiGV7CZ0tOtE^PDvf8ze4k+I=HDcpjy@5mji&i0?hZFRa|_C_uN
q8nHmPI8qSn=l=B$u_I-Ms+Nx9CrWYQ;o4C(mJJ{CiSMt7j%Wbi-pNk@

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_type_unselect.webp b/app/src/main/res/drawable-xxhdpi/ic_type_unselect.webp
new file mode 100644
index 0000000000000000000000000000000000000000..a98441d7b36a46974333fd3714f626dd74e8216e
GIT binary patch
literal 1210
zcmV;r1V#H&Nk&Gp1ONb6MM6+kP&il$0000G0000l001ul06|PpNU8w<00BqBpphg+
zSM$vL{>7e%h{&Q^gI-79$lMZ*X1z3q?nfij?6;&*#T*@d8UVydwoO~><Jq>2?`OZy
z$v>p$yMF=^{b%I1jicddwpS-_&{YqCRP$-H{`y*vo|>t^gB<deT1zfkwn{!Z;Ay;Z
zgSUo9H*%Fnzrc1ftQV4zNU~5LPPV}BN7<!Yc)NeVw3mL=1&^8D6!`0UbzR~WST{nt
zD%4m5uL)g~UBFjAs+&anU$DsPvdjv072T||gH=YC#FsG3%Ypn1mT{f)yudsrM`Ck$
zIX|zfb6A^`L%GAs&e=)JKYUi@SoM>ivW`4s7~IRT`vHtj7B#-vL}ehl;kzNp{|=2i
z8Mte}yI(5(G7HK?aK>**t~T^!qz7%6f5|>ABk4U$e+nip8F5b_)r6tU459f9HJPcw
z^9YJEQ-skPk}{Ko^%sO?CJbNp!+v7FiS2>vhXdJvC&%y5Eh8u2q5XGm{~y`^r~i-x
z_BkWZ2;&^H&&hwtVf&nyeI1c~osxYWlzp9*eI1uv<&U#Ip?2CQ)ExE+l6fC;VBY5(
z81zwAP&gps0ssK869An7Dlh;r06r}eh(e*EAr}`g7y`t!fC}Ia%73Ku<#|;4AI0#4
zyaV{J#0MTNIq^;T$M-+V593@$zpDAA{#AP;{FnR(@DC>b>+@0m1K4-;|MB0D9;v?x
z{^|bj`giSD&<F7^<Ui&AuKw(P|NsB{0QI%{yX*n_5HrW@ADO4B80r02O2&4UyKLF(
zh%aB31cD<&=lX*Z;tp~hXVzP8tN{N1LYD_)j8c7c({gKAw(vW|Mn|$PJ4+hyI|2*q
zhLjSErij9k)_zN0|8|~@e`!xJk_RPHb~h0sWRwp{)p+n+pZ7GdS|)_esn$SqzH)tu
zNf?QLXjPiy2*$?q`3yO;@sRSa4TN#WpI+G+eqwcMRbIUG$8MIh326fF4J?1|gZWKs
zYRP0RmRLvR5R0feHNCY?I*JA-5cd9ru$Y|fwj}%Hbr`M@K`Zd3)TEz1`>q<Fs+XsD
z)44qdhy;J_PSYN^t)io3WBo|HigSs>{7f*uwYQq^^RPbu!K|L8{`X(-uare`MMr+|
zyMPdQw@1{c+I_^UTE4i8jDv;RCeKC>zWx@Cmtef!4MFS%C~&s6ersNvwOVIH0SJBx
zfI2CoidC%i9-)S+D$nMwMEEuE)(&eCPbj=U-H&CHz~f0f{l5!|QXh_`tca0?)qM7Y
zJB3WZOJn&?C&d1EQp?%nMMKB1^v?<80Y8;x)R2_bA|&-%7gDV^aS+^8xTvN$=HXgl
z{<{SRXS?wDjd5G58WEIF`>KNnLFf`wxU$WhqsRCx-o%1p_o(4aO6uPK%RLR~0P_x*
z66EP{53fiidke!n-g`)qO|XCIMF`cCd@Wx5h0z!9|Lp{g2UAetCoZ{|WA*rUQm)NX
zBEU!$LZJ|Z_QBKgHx2Hi1&)!MZ^2p&4T`X>!PulluojPi+=8F$fAz;;w7!1JF7>hD
YEvJtJ>;1EJ+Y*=I=bK}W(L?|M0FbL_WdHyG

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/selector_ic_crash_type.xml b/app/src/main/res/drawable/selector_ic_crash_type.xml
new file mode 100644
index 0000000000..33dfa3abef
--- /dev/null
+++ b/app/src/main/res/drawable/selector_ic_crash_type.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/ic_type_selected" android:state_checked="true" />
+    <item android:drawable="@drawable/ic_type_unselect" />
+
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_suggest.xml b/app/src/main/res/layout/activity_suggest.xml
index 49a897726c..1fe0ea1451 100644
--- a/app/src/main/res/layout/activity_suggest.xml
+++ b/app/src/main/res/layout/activity_suggest.xml
@@ -238,6 +238,55 @@
                 </LinearLayout >
             </LinearLayout >
 
+            <LinearLayout
+                android:visibility="gone"
+                android:id="@+id/suggest_crash_type_container"
+                android:layout_width="match_parent"
+                android:layout_height="54dp"
+                android:layout_marginTop="8dp"
+                android:background="@color/white"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="16dp"
+                    android:textColor="@color/text_333333"
+                    android:textSize="14sp"
+                    android:text="闪退类型" />
+
+                <com.lightgame.view.CheckableImageView
+                    android:id="@+id/appCrashTypeIv"
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
+                    android:layout_marginLeft="20dp"
+                    android:src="@drawable/selector_ic_crash_type" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="4dp"
+                    android:textColor="@color/text_333333"
+                    android:textSize="14sp"
+                    android:text="APP闪退" />
+
+                <com.lightgame.view.CheckableImageView
+                    android:id="@+id/gameCrashTypeIv"
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
+                    android:layout_marginLeft="32dp"
+                    android:src="@drawable/selector_ic_crash_type" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="4dp"
+                    android:textColor="@color/text_333333"
+                    android:textSize="14sp"
+                    android:text="游戏闪退" />
+            </LinearLayout>
+
             <LinearLayout
                 android:id="@+id/picContainer"
                 android:layout_width = "match_parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cd0f9242c6..415d192863 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -185,11 +185,11 @@
     <string name="suggest_type_function">功能收录</string>
     <string name="suggest_function_hint">游戏加速、单机功能订制收录</string>
     <string name="suggest_type_crash">发生闪退</string>
-    <string name="suggest_hint_crash">出现App自动退出或重启的情况请及时反馈</string>
+    <string name="suggest_hint_crash">游戏/助手自动退出或重启，点击这里反馈</string>
     <string name="suggest_type_game">游戏问题</string>
     <string name="suggest_hint_game">玩游戏过程中遇到的问题</string>
     <string name="suggest_type_collect">收录更新</string>
-    <string name="suggest_hint_collect">游戏版本太低，点击这里提交更新</string>
+    <string name="suggest_hint_collect">游戏版本太低、没有想要的游戏，点击这里提交</string>
     <string name="suggest_type_post">帖子投稿</string>
     <string name="suggest_type_copyright">版权申诉</string>
     <string name="suggest_hint_post">原创或转发，我们都欢迎</string>