2.6 部分修改

app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java

@@ -727,7 +727,10 @@ public class CommonUtil {
         umWeb.setDescription(activity.getResources().getString(R.string.app_name));
         if(type.equals("all")){
 
-            new ShareAction(activity)
+            ViewUtil.newInstance()
+                    .showShare(activity, url);
+
+            /*new ShareAction(activity)
                     .withText("")
                     .withMedia(umWeb)
                     .setDisplayList(
@@ -741,7 +744,7 @@ public class CommonUtil {
 //
 //                        }
 //                    })
-                    .open();
+                    .open();*/
         }else {
             SHARE_MEDIA share_media = SHARE_MEDIA.QQ;
             if(type.equals("qq")){

app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -509,6 +509,21 @@ public class Jump2View {
         context.startActivity(intent);
 
     }
+    public synchronized void goGameTaskDetailView(Context context, Object o, Object b, int type){
+        Intent intent = new Intent(context, TaskDetailAct.class);
+        if(o instanceof Integer){
+            intent.putExtra("task_id", (Integer) o);
+        }
+        if(b instanceof Integer){
+            intent.putExtra("game_id", (Integer) b);
+        }else
+        if(b instanceof Boolean){
+            intent.putExtra("btn_show", (Boolean) b);
+        }
+        intent.putExtra("game_type", type);
+        context.startActivity(intent);
+
+    }
 
     /**
      * 跳到已做过任务列表页面

app/src/main/java/com/sheep/gamegroup/util/ViewUtil.java

@@ -34,6 +34,7 @@ import com.sheep.gamegroup.view.activity.SplashAct;
 import com.sheep.gamegroup.view.dialog.DialogOrienteeringDetails;
 import com.sheep.gamegroup.view.dialog.DialogPayAccount;
 import com.sheep.gamegroup.view.dialog.DialogPayGame;
+import com.sheep.gamegroup.view.dialog.DialogShare;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
@@ -554,6 +555,15 @@ public class ViewUtil {
         new DialogPayGame(activity, game_account_etStr, game_pay_etStr,gameId).showPayGame();
     }
 
+    /**
+     * 分享
+     * @param activity
+     * @param url
+     */
+    public void showShare(Activity activity, String url){
+        new DialogShare(activity, url).showShare();
+    }
+
     public static void setText(TextView textView) {
         if(textView != null){
             textView.setText("");

app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java

@@ -178,6 +178,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 
     private int taskId = -1;
     private int game_id = -1;
+    private int game_type = -1;
 
     private int type;//-1:开始任务 1：下载 2：安装 3：打开  10：打开H5，101：充值  100:领取奖励
 
@@ -205,6 +206,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         isFromTaskList = taskAcceptedEty != null;
         taskId = getIntent().getIntExtra("task_id", -1);
         game_id = getIntent().getIntExtra("game_id", -1);
+        game_id = getIntent().getIntExtra("game_type", -1);
         DaggerTaskDetailComponent.builder()
                 .netComponent(SheepApp.get(activity).getNetComponent())
                 .taskDetailModule(new TaskDetailModule(this))
@@ -360,7 +362,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             if(taskEty.getTask_type() == 1002 ||taskEty.getTask_type() == 1003){
                 btnTaskItem.setVisibility(View.GONE);
                 //奖励领取是否
-                if(gettaskAcceptedEty != null && gettaskAcceptedEty.getStatus() == 3){
+                if((gettaskAcceptedEty != null && gettaskAcceptedEty.getStatus() == 3) || game_type == 1){
                     btnUpImag.setText("充值游戏");
                     type = 101;
                 }
@@ -383,6 +385,12 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             bottom_btn_layout.setVisibility(View.GONE);
         }
 
+        //h5
+        if(type == 10){
+            btnUpImag.setVisibility(View.VISIBLE);
+            btnUpImag.setText("上传截图");
+        }
+
     }
 
     private void checkAcceptedTask() {

app/src/main/java/com/sheep/gamegroup/view/adapter/TryMakeMoneyAdp.java

@@ -258,7 +258,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                         if(item == null){
                             return;
                         }
-                        Jump2View.getInstance().goTaskDetailView(context,  etyList.get(i).getRelease_task_id(), etyList.get(i).getGame_id());
+                        Jump2View.getInstance().goGameTaskDetailView(context,  etyList.get(i).getRelease_task_id(), etyList.get(i).getGame_id(),1);
                         UMConfigUtils.IdEvent.TASK.commit(item.getId());
 
                     }

app/src/main/java/com/sheep/gamegroup/view/dialog/DialogShare.java

@@ -0,0 +1,99 @@
+package com.sheep.gamegroup.view.dialog;
+
+import android.app.Activity;
+import android.content.DialogInterface;
+import android.support.v7.app.AlertDialog;
+import android.text.TextUtils;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.StringUtils;
+import com.sheep.gamegroup.util.ViewUtil;
+import com.sheep.gamegroup.view.activity.ActWeb;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.utils.G;
+
+/**
+ * Created by ljy on 2018/6/22.
+ */
+
+public class DialogShare {
+    private Activity activity;
+    private String link;
+
+    public DialogShare(Activity activity, String link) {
+        this.activity = activity;
+        this.link = link;
+    }
+    public void showShare(){
+        if(activity == null){
+            return;
+        }
+        View dialog_parent = View.inflate(activity, R.layout.share_panel_layout, null);
+        final AlertDialog dialog = new AlertDialog.Builder(activity, R.style.AppTheme_Dialog_Alert)
+                .setView(dialog_parent)
+                .create();
+        LinearLayout qq_layotu = dialog_parent.findViewById(R.id.qq_layotu);
+        LinearLayout weixin_layotu = dialog_parent.findViewById(R.id.weixin_layotu);
+        TextView withdrawal = dialog_parent.findViewById(R.id.withdrawal);
+        TextView tv_link = dialog_parent.findViewById(R.id.tv_link);
+        TextView cancel_share_tv = dialog_parent.findViewById(R.id.cancel_share_tv);
+        if (!TextUtils.isEmpty(link))
+            tv_link.setText(link);
+
+        withdrawal.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                StringUtils.CopyText(activity, link);
+                G.showToast("复制链接成功");
+            }
+        });
+
+
+        qq_layotu.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                CommonUtil.getInstance().popShare(activity, link, "qq");
+
+                dialog.dismiss();
+            }
+        });
+        weixin_layotu.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                CommonUtil.getInstance().popShare(activity, link, "wx");
+                dialog.dismiss();
+            }
+        });
+
+        cancel_share_tv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dialog.dismiss();
+            }
+        });
+
+        dialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+            @Override
+            public void onDismiss(DialogInterface dialogInterface) {
+            }
+        });
+        try {
+            dialog.show();
+            Window window = dialog.getWindow();
+            window.setGravity(Gravity.BOTTOM);
+            WindowManager.LayoutParams params = dialog.getWindow().getAttributes();
+            params.width = G.WIDTH > G.HEIGHT? G.HEIGHT : G.WIDTH;
+            dialog.getWindow().setAttributes(params);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtTryMakeMoney.java

@@ -139,7 +139,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
                 .inject(FgtTryMakeMoney.this);
         recyclerview.setLayoutManager(new LinearLayoutManager(activity));
         tryMakeMoneyAdp = new TryMakeMoneyAdp(activity);
-        for (int i = 0; i < 2; i++) {
+        for (int i = 0; i < 3; i++) {
             tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.NONE, null));
         }
         recyclerview.setAdapter(tryMakeMoneyAdp);
@@ -185,7 +185,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         releaseEtyLists.clear();
         tryMakeMoneyAdp.clear();
         tryMakeMoneyAdp.addType(type);
-        for (int i = 0; i < 2; i++) {
+        for (int i = 0; i < 3; i++) {
             tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.NONE, null));
         }
         tryMakeMoneyAdp.setTaskAcceptedEty(null);

app/src/main/res/drawable/sp_bg_transparent_radius_transparent.xml

@@ -3,7 +3,7 @@
     android:shape="rectangle">
 
     <solid
-        android:color="@color/transparent"/>
+        android:color="@color/white"/>
 
     <corners
         android:radius="@dimen/radius_25"/>

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

@@ -27,6 +27,7 @@
             android:layout_marginBottom="@dimen/content_padding_15">
 
             <LinearLayout
+                android:id="@+id/qq_layotu"
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
@@ -36,7 +37,7 @@
                 <ImageView
                     android:layout_width="35dp"
                     android:layout_height="35dp"
-                    android:src="@mipmap/icon" />
+                    android:src="@drawable/umeng_socialize_qq" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -48,6 +49,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/weixin_layotu"
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
@@ -55,9 +57,10 @@
                 android:orientation="vertical">
 
                 <ImageView
-                    android:layout_width="35dp"
-                    android:layout_height="35dp"
-                    android:src="@mipmap/icon" />
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:scaleType="fitXY"
+                    android:src="@drawable/umeng_socialize_wechat"  />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -77,9 +80,9 @@
                 android:visibility="invisible">
 
                 <ImageView
-                    android:layout_width="35dp"
-                    android:layout_height="35dp"
-                    android:src="@mipmap/icon" />
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:src="@drawable/umeng_socialize_qq" />
 
                 <TextView
                     android:layout_width="wrap_content"

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

@@ -78,7 +78,7 @@
                     android:layout_marginTop="@dimen/content_padding_10"
                     android:layout_marginLeft="@dimen/content_padding_10"
                     android:layout_marginRight="@dimen/content_padding_10"
-                    android:layout_marginBottom="@dimen/content_padding_22">
+                    android:layout_marginBottom="@dimen/content_padding_10">
                     <RelativeLayout
                         android:id="@+id/item_layout"
                         android:layout_width="match_parent"
@@ -231,7 +231,6 @@
                     android:divider="@null"
                     android:layout_marginStart="@dimen/content_padding_10"
                     android:layout_marginEnd="@dimen/content_padding_10"
-                    android:layout_marginBottom="@dimen/content_padding_10"
                     android:visibility="visible"/>
 
                 <com.sheep.gamegroup.util.MyListview
@@ -252,7 +251,9 @@
                     android:layout_height="match_parent"
                     android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
                     android:padding="@dimen/content_padding_20"
-                    android:layout_margin="@dimen/content_padding_10"
+                    android:layout_marginLeft="@dimen/content_padding_10"
+                    android:layout_marginRight="@dimen/content_padding_10"
+                    android:layout_marginTop="@dimen/content_padding_10"
                     android:orientation="vertical"
                     android:visibility="gone">
 
@@ -277,7 +278,9 @@
                     android:layout_height="match_parent"
                     android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
                     android:padding="@dimen/content_padding_20"
-                    android:layout_margin="@dimen/content_padding_10"
+                    android:layout_marginLeft="@dimen/content_padding_10"
+                    android:layout_marginRight="@dimen/content_padding_10"
+                    android:layout_marginTop="@dimen/content_padding_10"
                     android:orientation="vertical"
                     android:visibility="gone">
 

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

@@ -5,7 +5,9 @@
     android:layout_height="wrap_content"
     android:layout_gravity="center_vertical"
     android:orientation="vertical"
-    android:layout_margin="@dimen/content_padding_10"
+    android:layout_marginLeft="@dimen/content_padding_10"
+    android:layout_marginRight="@dimen/content_padding_10"
+    android:layout_marginTop="@dimen/content_padding_10"
     android:visibility="gone">
 
     <LinearLayout

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

@@ -61,6 +61,7 @@
             android:orientation="horizontal"
             android:layout_gravity="center_vertical"
             android:background="@drawable/sp_bg_white_solid_bottom"
+            android:paddingTop="@dimen/content_padding_3"
             android:paddingBottom="@dimen/content_padding_15">
             <TextView
                 android:layout_width="4dp"