From 2a2f5b089dec3a2c4561e9d0cd2986c22d2e5336 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= <1484288157@qq.com>
Date: Wed, 9 Oct 2019 17:06:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B920191008=E6=B5=8B=E8=AF=95bug?=
 =?UTF-8?q?=20https://gitlab.ghzs.com/pm/halo-app-issues/issues/652?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../game/upload/GameUploadFragment.kt         | 10 +--
 .../gamecenter/suggest/SuggestPicAdapter.java |  3 +-
 .../main/res/layout/dialog_suggest_game.xml   |  1 +
 .../main/res/layout/fragment_game_upload.xml  | 76 +++++++------------
 4 files changed, 35 insertions(+), 55 deletions(-)

diff --git a/app/src/main/java/com/gh/gamecenter/game/upload/GameUploadFragment.kt b/app/src/main/java/com/gh/gamecenter/game/upload/GameUploadFragment.kt
index 4080810e6c..51bd568fb2 100644
--- a/app/src/main/java/com/gh/gamecenter/game/upload/GameUploadFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/game/upload/GameUploadFragment.kt
@@ -84,7 +84,7 @@ class GameUploadFragment : NormalFragment() {
             adapter = mAdapter
         }
 
-        val privacyContent = SpannableStringBuilder("登录游戏即表示，您已阅读并同意：《光环助手用户协议》与《游戏上传服务准则》")
+        val privacyContent = SpannableStringBuilder("登录游戏即表示，您已阅读并同意《光环助手用户协议》与《游戏上传服务准则》")
         privacyContent.setSpan(object : ClickableSpan() {
 
             override fun updateDrawState(ds: TextPaint) {
@@ -94,7 +94,7 @@ class GameUploadFragment : NormalFragment() {
             }
 
             override fun onClick(widget: View) {
-                val intent = WebActivity.getPrivacyPolicyIntent(context!!)
+                val intent = WebActivity.getUploadPolicyIntent(context!!)
                 startActivity(intent)
             }
         }, privacyContent.length - 10, privacyContent.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
@@ -108,7 +108,7 @@ class GameUploadFragment : NormalFragment() {
             }
 
             override fun onClick(widget: View) {
-                startActivity(WebActivity.getUploadPolicyIntent(context!!))
+                startActivity(WebActivity.getWebIntent(context!!))
             }
         }, privacyContent.length - 21, privacyContent.length - 11, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
         tv_protocol.text = privacyContent
@@ -164,7 +164,7 @@ class GameUploadFragment : NormalFragment() {
                         activity?.finish()
                     }
                     2 -> {
-                        DirectUtils.directToQqConversation(context!!)
+                        DirectUtils.directToQqConversation(context!!,qqNumber = "3467475980")
                     }
                 }
             }
@@ -214,7 +214,7 @@ class GameUploadFragment : NormalFragment() {
         }
         val requestMap = HashMap<String, Any>()
         requestMap["package_name"] = tv_choose.text.toString()
-        requestMap["size"] = gameEntity.gameSize / 1024
+        requestMap["size"] = gameEntity.gameSize
         requestMap["name"] = et_game_name.text.toString()
         requestMap["des"] = et_game_intro.text.toString()
         requestMap["images"] = imageList
diff --git a/app/src/main/java/com/gh/gamecenter/suggest/SuggestPicAdapter.java b/app/src/main/java/com/gh/gamecenter/suggest/SuggestPicAdapter.java
index 1c14c633d2..6bb37fec77 100644
--- a/app/src/main/java/com/gh/gamecenter/suggest/SuggestPicAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/suggest/SuggestPicAdapter.java
@@ -57,7 +57,8 @@ public class SuggestPicAdapter extends BaseRecyclerAdapter<ViewHolder> {
 
     @Override
     public int getItemCount() {
-        return picList.size() + 1;
+//        return picList.size() + 1;
+        return picList.size()<5?picList.size()+1:picList.size();
     }
 
     public void addFileList(String picPath) {
diff --git a/app/src/main/res/layout/dialog_suggest_game.xml b/app/src/main/res/layout/dialog_suggest_game.xml
index 0bbe68f4c8..f0e5c4d505 100644
--- a/app/src/main/res/layout/dialog_suggest_game.xml
+++ b/app/src/main/res/layout/dialog_suggest_game.xml
@@ -59,6 +59,7 @@
         android:layout_height = "wrap_content"
         android:layout_marginLeft = "25dp"
         android:layout_marginRight = "25dp"
+        android:visibility="gone"
         android:layout_marginTop = "20dp" >
 
         <TextView
diff --git a/app/src/main/res/layout/fragment_game_upload.xml b/app/src/main/res/layout/fragment_game_upload.xml
index 3281a9ca22..f63a058824 100644
--- a/app/src/main/res/layout/fragment_game_upload.xml
+++ b/app/src/main/res/layout/fragment_game_upload.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white"
+    android:background="@color/cutting_line"
     android:orientation="vertical">
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -15,16 +15,12 @@
             android:focusable="true"
             android:focusableInTouchMode="true"
             android:orientation="vertical">
-            <View
-                android:layout_width = "match_parent"
-                android:layout_height = "@dimen/cutting_line"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
-                android:background = "@color/cutting_line" />
+
             <LinearLayout
                 android:layout_width = "match_parent"
                 android:layout_height = "wrap_content"
                 android:background = "@android:color/white"
+                android:layout_marginTop="0.5dp"
                 android:gravity = "center_vertical" >
 
                 <TextView
@@ -52,18 +48,14 @@
                     android:textColor = "@color/text_666666"
                     android:textColorHint = "@color/text_666666"
                     android:textCursorDrawable = "@drawable/cursor_color"
-                    android:textSize = "14sp" />
+                    android:textSize = "12sp" />
             </LinearLayout >
-            <View
-                android:layout_width = "match_parent"
-                android:layout_height = "8dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
-                android:background = "@color/cutting_line" />
+
             <LinearLayout
                 android:layout_width = "match_parent"
                 android:layout_height = "wrap_content"
                 android:background = "@android:color/white"
+                android:layout_marginTop="8dp"
                 android:gravity = "center_vertical" >
 
                 <TextView
@@ -94,23 +86,19 @@
                     android:textColor = "@color/content"
                     android:textColorHint = "@color/content"
                     android:textCursorDrawable = "@drawable/cursor_color"
-                    android:textSize = "14sp" />
+                    android:textSize = "12sp" />
             </LinearLayout >
-            <View
-                android:layout_width = "match_parent"
-                android:layout_height = "8dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
-                android:background = "@color/cutting_line" />
 
             <TextView
                 android:id = "@+id/tv_game_intro"
-                android:layout_width = "wrap_content"
+                android:layout_width = "match_parent"
                 android:layout_height = "wrap_content"
                 android:paddingLeft = "20dp"
                 android:paddingTop="16dp"
+                android:layout_marginTop="8dp"
                 android:paddingBottom="16dp"
                 android:paddingRight="20dp"
+                android:background="@color/white"
                 android:text = "游戏介绍*"
                 android:textColor = "@color/text_333333"
                 android:textSize = "15sp" />
@@ -123,25 +111,21 @@
                 android:paddingLeft="20dp"
                 android:paddingRight="20dp"
                 android:lineSpacingMultiplier="1.2"
-                android:textSize="14sp"
+                android:textSize="12sp"
                 android:gravity="top"
                 android:maxLength="1000"
                 android:textColor="@color/text_666666"
                 android:textColorHint="@color/text_cccccc"
                 android:hint="请填写游戏介绍"
-                android:background="@null"/>
+                android:background="@color/white"/>
 
-            <View
-                android:layout_width = "match_parent"
-                android:layout_height = "8dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
-                android:background = "@color/cutting_line" />
             <TextView
                 android:id = "@+id/tv_screenshot"
-                android:layout_width = "wrap_content"
+                android:layout_width = "match_parent"
                 android:layout_height = "wrap_content"
                 android:paddingLeft = "20dp"
+                android:layout_marginTop="8dp"
+                android:background="@color/white"
                 android:paddingTop="16dp"
                 android:paddingBottom="16dp"
                 android:paddingRight="20dp"
@@ -151,27 +135,21 @@
             <androidx.recyclerview.widget.RecyclerView
                 android:id = "@+id/rv_screenshot"
                 android:layout_width = "match_parent"
-                android:layout_height = "60dp"
+                android:layout_height = "wrap_content"
                 android:layout_marginBottom = "24dp"
-                android:paddingLeft = "20dp" />
+                android:background="@color/white"
+                android:paddingLeft = "20dp"
+                android:paddingBottom="24dp"/>
 
-            <RelativeLayout
+            <TextView
+                android:id="@+id/tv_protocol"
                 android:layout_width="match_parent"
-                android:layout_height="150dp">
-                <View
-                    android:layout_width = "match_parent"
-                    android:layout_height = "match_parent"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
-                    android:background = "@color/cutting_line" />
-                <TextView
-                    android:id="@+id/tv_protocol"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textSize="14sp"
-                    android:layout_alignParentBottom="true"
-                    android:layout_margin="20dp"/>
-            </RelativeLayout>
+                android:layout_height="wrap_content"
+                android:textSize="12sp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginBottom="20dp"
+                android:layout_marginTop="120dp"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>