游戏详情增加上传图片。

app/src/main/java/com/sheep/jiuyan/samllsheep/page/GameDetailActivity.java

@@ -61,6 +61,7 @@ public class GameDetailActivity extends BaseActivity {
     private LinearLayout mLlInfos;
     private AlertDialog mDialog;
     private AlertDialog mReDialog;
+    private View mPb;
 
     @Override
     protected int getLayoutId() {
@@ -86,6 +87,7 @@ public class GameDetailActivity extends BaseActivity {
         mBtnUpImag = (Button) findViewById(R.id.btn_up_imag);
         mWebText = (WebView) findViewById(R.id.web_text);
         mLlInfos = (LinearLayout) findViewById(R.id.ll_infos);
+        mPb = findViewById(R.id.pb_commit);
 
         TitleBarUtils.getInstance().setTitle(this, "任务详情")
                 .setTitleFinish(this);
@@ -134,7 +136,7 @@ public class GameDetailActivity extends BaseActivity {
                 if (TextUtils.equals(ok, "ok")) {
                     uploadImag();
                 } else {
-                    showRecommitDialog("用户同时只能领取一个任务，是否此领取任务？");
+                    showRecommitDialog("用户同时只能领取一个任务，是否领取此任务？");
                 }
             }
         });
@@ -212,6 +214,7 @@ public class GameDetailActivity extends BaseActivity {
     }
 
     private void commitTask(String path) {
+        mPb.setVisibility(View.VISIBLE);
         String topApp = "";
         Intent intent = getIntent();
         if (intent != null) {
@@ -219,24 +222,18 @@ public class GameDetailActivity extends BaseActivity {
         }
         HashMap<String, String> parma = new HashMap<>();
         parma.put("task_pkg", topApp);
-        parma.put("task_pkg", topApp);
+        parma.put("publish_id", mTask.getId() + "");
         parma.put("wx_open_id", SpUtils.getOpenId(this));
         NetManager.upload(Url.UPLOAD_IMG, parma, new File(path), getApplicationContext(), new SheepCallback<String>(this) {
             @Override
             public void success(String s) {
                 Toast.makeText(GameDetailActivity.this, s, Toast.LENGTH_SHORT).show();
-                finish();
-            }
-
-            @Override
-            public void otherCode(int code, String string) {
-                super.otherCode(code, string);
-                finish();
+                mPb.setVisibility(View.GONE);
             }
 
             @Override
             public void failure(IOException e) {
-                finish();
+                mPb.setVisibility(View.GONE);
             }
         });
     }

app/src/main/java/com/sheep/jiuyan/samllsheep/page/LoginActivity.java

@@ -23,6 +23,7 @@ import com.sheep.jiuyan.samllsheep.page.entry.BindUserEntiey;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
+import java.io.IOException;
 import java.util.HashMap;
 
 /**
@@ -163,6 +164,12 @@ public class LoginActivity extends BaseActivity {
                         startActivity(intent);
                         finish();
                     }
+
+                    @Override
+                    public void failure(IOException e) {
+                        Toast.makeText(LoginActivity.this, e.getMessage(), Toast.LENGTH_SHORT).show();
+
+                    }
                 });
             }
         });

app/src/main/res/layout/game_detail_activity.xml

@@ -1,205 +1,219 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:orientation="vertical">
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+    >
 
-    <include
-        layout="@layout/title"/>
-
-    <ScrollView
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-        <LinearLayout
+        <include
+            layout="@layout/title"/>
+
+        <ScrollView
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:layout_height="0dp"
+            android:layout_weight="1">
 
-            <RelativeLayout
-                android:id="@+id/dingwei1"
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="80dp"
-                android:layout_margin="@dimen/content_padding"
-                android:background="@color/backgroud">
-
-                <ImageView
-                    android:id="@+id/img_icon"
-                    android:layout_width="60dp"
-                    android:layout_height="60dp"
-                    android:layout_alignParentStart="true"
-                    android:layout_centerVertical="true"
-                    android:layout_marginLeft="@dimen/content_padding"
-                    android:src="@drawable/icon"/>
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <RelativeLayout
+                    android:id="@+id/dingwei1"
+                    android:layout_width="match_parent"
+                    android:layout_height="80dp"
+                    android:layout_margin="@dimen/content_padding"
+                    android:background="@color/backgroud">
+
+                    <ImageView
+                        android:id="@+id/img_icon"
+                        android:layout_width="60dp"
+                        android:layout_height="60dp"
+                        android:layout_alignParentStart="true"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="@dimen/content_padding"
+                        android:src="@drawable/icon"/>
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="@dimen/content_padding_small"
+                        android:layout_marginLeft="@dimen/content_padding_small"
+                        android:layout_marginTop="@dimen/content_padding_small"
+                        android:layout_toRightOf="@id/img_icon"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:id="@+id/tv_game_name"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:gravity="center_vertical"
+                            android:textColor="@color/black_text_deep"
+                            android:textSize="@dimen/text_size_3"/>
+
+
+                        <TextView
+                            android:id="@+id/tv_count"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/content_padding_small"
+                            android:gravity="center_vertical"
+                            android:textColor="@color/black_text_gray"
+                            android:textSize="@dimen/text_size_2"/>
+
+                        <TextView
+                            android:id="@+id/tv_time"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/content_padding_small"
+                            android:gravity="center_vertical"
+                            android:textColor="@color/black_text_gray"
+                            android:textSize="@dimen/text_size_2"/>
+                    </LinearLayout>
 
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="@dimen/content_padding_small"
-                    android:layout_marginLeft="@dimen/content_padding_small"
-                    android:layout_marginTop="@dimen/content_padding_small"
-                    android:layout_toRightOf="@id/img_icon"
-                    android:orientation="vertical">
 
                     <TextView
-                        android:id="@+id/tv_game_name"
+                        android:id="@+id/tv_bouns"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:gravity="center_vertical"
-                        android:textColor="@color/black_text_deep"
-                        android:textSize="@dimen/text_size_3"/>
+                        android:layout_alignParentBottom="true"
+                        android:layout_alignParentRight="true"
+                        android:layout_marginBottom="@dimen/content_padding"
+                        android:layout_marginRight="10dp"
+                        android:textColor="@color/orange_text_light"
+                        android:textSize="@dimen/text_size_5"
+                        android:textStyle="bold"
+                        />
 
+                    <TextView
+                        android:id="@+id/tv_text1"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignBottom="@+id/tv_money"
+                        android:layout_centerVertical="true"
+                        android:layout_marginBottom="3dp"
+                        android:layout_marginLeft="10dp"
+                        android:layout_marginRight="3dp"
+                        android:layout_toLeftOf="@id/tv_bouns"
+                        android:gravity="bottom"
+                        android:text="+"
+                        android:textColor="@color/orange_text_light"
+                        android:textSize="@dimen/text_size_4"/>
 
                     <TextView
-                        android:id="@+id/tv_count"
+                        android:id="@+id/tv_money"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/content_padding_small"
-                        android:gravity="center_vertical"
+                        android:layout_alignParentBottom="true"
+                        android:layout_centerVertical="true"
+                        android:layout_marginBottom="@dimen/content_padding"
+                        android:layout_toStartOf="@+id/tv_text1"
+                        android:textColor="@color/orange_text_light"
+                        android:textSize="@dimen/text_size_5"
+                        android:textStyle="bold"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_above="@id/tv_money"
+                        android:layout_alignRight="@id/tv_money"
+                        android:text="任务\n奖励"
                         android:textColor="@color/black_text_gray"
                         android:textSize="@dimen/text_size_2"/>
 
                     <TextView
-                        android:id="@+id/tv_time"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/content_padding_small"
-                        android:gravity="center_vertical"
+                        android:layout_above="@id/tv_money"
+                        android:layout_alignRight="@id/tv_bouns"
+                        android:text="邀请\n奖励"
                         android:textColor="@color/black_text_gray"
                         android:textSize="@dimen/text_size_2"/>
-                </LinearLayout>
 
+                </RelativeLayout>
 
-                <TextView
-                    android:id="@+id/tv_bouns"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentBottom="true"
-                    android:layout_alignParentRight="true"
-                    android:layout_marginBottom="@dimen/content_padding"
-                    android:layout_marginRight="10dp"
-                    android:textColor="@color/orange_text_light"
-                    android:textSize="@dimen/text_size_5"
-                    android:textStyle="bold"
-                    />
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/content_padding"
+                    android:background="@color/background_light_gray"/>
 
                 <TextView
-                    android:id="@+id/tv_text1"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_alignBottom="@+id/tv_money"
-                    android:layout_centerVertical="true"
-                    android:layout_marginBottom="3dp"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginRight="3dp"
-                    android:layout_toLeftOf="@id/tv_bouns"
-                    android:gravity="bottom"
-                    android:text="+"
-                    android:textColor="@color/orange_text_light"
+                    android:layout_margin="@dimen/content_padding"
+                    android:text="任务说明"
+                    android:textColor="@color/black_text_deep"
                     android:textSize="@dimen/text_size_4"/>
 
-                <TextView
-                    android:id="@+id/tv_money"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentBottom="true"
-                    android:layout_centerVertical="true"
-                    android:layout_marginBottom="@dimen/content_padding"
-                    android:layout_toStartOf="@+id/tv_text1"
-                    android:textColor="@color/orange_text_light"
-                    android:textSize="@dimen/text_size_5"
-                    android:textStyle="bold"/>
+                <WebView
+                    android:id="@+id/web_text"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_above="@id/tv_money"
-                    android:layout_alignRight="@id/tv_money"
-                    android:text="任务\n奖励"
-                    android:textColor="@color/black_text_gray"
-                    android:textSize="@dimen/text_size_2"/>
+                </WebView>
 
                 <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_above="@id/tv_money"
-                    android:layout_alignRight="@id/tv_bouns"
-                    android:text="邀请\n奖励"
-                    android:textColor="@color/black_text_gray"
-                    android:textSize="@dimen/text_size_2"/>
-
-            </RelativeLayout>
-
+                    android:layout_margin="@dimen/content_padding"
+                    android:text="任务进度"
+                    android:textColor="@color/black_text_deep"
+                    android:textSize="@dimen/text_size_4"/>
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/content_padding"
-                android:background="@color/background_light_gray"/>
+                <LinearLayout
+                    android:id="@+id/ll_infos"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical">
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/content_padding"
-                android:text="任务说明"
-                android:textColor="@color/black_text_deep"
-                android:textSize="@dimen/text_size_4"/>
-
-            <WebView
-                android:id="@+id/web_text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                </LinearLayout>
 
-            </WebView>
+            </LinearLayout>
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/content_padding"
-                android:text="任务进度"
-                android:textColor="@color/black_text_deep"
-                android:textSize="@dimen/text_size_4"/>
+        </ScrollView>
 
-            <LinearLayout
-                android:id="@+id/ll_infos"
-                android:layout_width="match_parent"
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/layout_heigh_default"
+            android:background="@color/background_light_gray"
+            android:orientation="horizontal"
+            android:padding="@dimen/content_padding_small">
+
+            <Button
+                android:id="@+id/btn_task_item"
+                style="@style/style_btn"
+                android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:orientation="vertical">
-
-            </LinearLayout>
-
+                android:layout_gravity="right"
+                android:layout_marginLeft="@dimen/content_padding_small"
+                android:layout_marginRight="@dimen/content_padding_small"
+                android:layout_weight="1"
+                android:text="下载游戏"/>
+
+            <Button
+                android:id="@+id/btn_up_imag"
+                style="@style/style_btn"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_gravity="right"
+                android:layout_marginLeft="@dimen/content_padding_small"
+                android:layout_marginRight="@dimen/content_padding_small"
+                android:layout_weight="1"
+                android:text="上传截图"/>
         </LinearLayout>
+    </LinearLayout>
 
-    </ScrollView>
-
-    <LinearLayout
-        android:layout_width="match_parent"
+    <ProgressBar
+        android:id="@+id/pb_commit"
+        android:visibility="gone"
+        android:layout_width="@dimen/layout_heigh_default"
         android:layout_height="@dimen/layout_heigh_default"
-        android:background="@color/background_light_gray"
-        android:orientation="horizontal"
-        android:padding="@dimen/content_padding_small">
-
-        <Button
-            android:id="@+id/btn_task_item"
-            style="@style/style_btn"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_gravity="right"
-            android:layout_marginLeft="@dimen/content_padding_small"
-            android:layout_marginRight="@dimen/content_padding_small"
-            android:layout_weight="1"
-            android:text="下载游戏"/>
-
-        <Button
-            android:id="@+id/btn_up_imag"
-            style="@style/style_btn"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_gravity="right"
-            android:layout_marginLeft="@dimen/content_padding_small"
-            android:layout_marginRight="@dimen/content_padding_small"
-            android:layout_weight="1"
-            android:text="上传截图"/>
-    </LinearLayout>
+        android:layout_gravity="center"/>
+
 
-</LinearLayout>
+</FrameLayout>