2.6.1版本修改

app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -926,7 +926,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                         break;
                     case 11://游戏任务
                         Jump2View.getInstance()
-                                .goGameMakeMoney(activity);
+                                .goGameMakeMoney(activity, 0);
                         break;
                     default:
                         G.showToast(R.string.coming_soon);

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

@@ -421,7 +421,7 @@ public class CommonUtil {
                 break;
             case 11://游戏任务
                 Jump2View.getInstance()
-                        .goGameMakeMoney(context);
+                        .goGameMakeMoney(context, 0);
                 break;
             default:
                 G.showToast(R.string.coming_soon);

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

@@ -1228,8 +1228,9 @@ public class Jump2View {
     /**
      * 任务游戏列表
      */
-    public void goGameMakeMoney(Context activity){
+    public void goGameMakeMoney(Context activity, int o){
         Intent intent = new Intent(activity, GamemakeMoneyAct.class);
+        intent.putExtra("current_item", o);
         activity.startActivity(intent);
     }
     /**

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

@@ -311,7 +311,7 @@ public class TestUtil {
                                 copyUrl("world_cup_url");
                                 break;
                             case "任务游戏列表":
-                                Jump2View.getInstance().goGameMakeMoney(activity);
+                                Jump2View.getInstance().goGameMakeMoney(activity, 0);
                                 break;
                             case "世界杯活动":
                                 Jump2View.getInstance().goWeb(activity, SheepApp.getInstance().getConnectAddress().getWorldCupUrl(), "测试世界杯活动");

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

@@ -0,0 +1,128 @@
+package com.sheep.gamegroup.util;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.net.Uri;
+import android.text.TextUtils;
+import android.webkit.JavascriptInterface;
+
+import com.sheep.gamegroup.model.entity.UserEntity;
+import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
+import com.sheep.jiuyan.samllsheep.utils.G;
+import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
+import com.zhy.http.okhttp.OkHttpUtils;
+import com.zhy.http.okhttp.callback.FileCallBack;
+
+import java.io.File;
+
+import okhttp3.Call;
+
+/**
+ * Created by ljy on 2018/6/25.
+ */
+
+public class WebviewJs {
+    private Activity activity;
+    private int taskId;
+
+    public WebviewJs(Activity activity) {
+        this.activity = activity;
+    }
+
+    public WebviewJs(Activity activity, int taskId) {
+        this.activity = activity;
+        this.taskId = taskId;
+    }
+
+    @JavascriptInterface
+    public void setTitle(final String title) {
+
+    }
+
+    @JavascriptInterface
+    public void setCanGoBack() {
+    }
+
+    @JavascriptInterface
+    public void downloadFile(final String url, final String name) {
+        OkHttpUtils.get()
+                .url(url)
+                .build()
+                .execute(new FileCallBack(ClassFileHelper.DIR, name) {
+                    @Override
+                    public void onError(Call call, Exception e, int id) {
+                        G.showToast("下载文件失败");
+                    }
+
+                    @Override
+                    public void onResponse(File response, int id) {
+                        if (name.endsWith(".png") || name.endsWith(".jpg")) {//图片
+                            Intent intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
+                            Uri uri = Uri.fromFile(response);
+                            intent.setData(uri);
+                            activity.sendBroadcast(intent); // 发送广播通知相册
+                        }
+                        G.showToast("下载文件成功");
+                    }
+                });
+    }
+
+    @JavascriptInterface
+    public void startApp(String pkg, String cls) {
+        PackageUtil.startApp(activity, pkg);
+    }
+
+    @JavascriptInterface
+    public void gotoLogin() {
+        Jump2View.getInstance().gotoLoginAgain();
+    }
+    @JavascriptInterface
+    public void gotoWeb(String url, String title) {
+        if(!TextUtils.isEmpty(url)) {
+            if (TextUtils.isEmpty(title)) {
+                Jump2View.getInstance().goWeb(activity, url);//启动浏览器h5
+            } else {
+                Jump2View.getInstance().goWeb(activity, url, title);//进入小绵羊h5界面
+            }
+        }
+    }
+    @JavascriptInterface
+    public void gotoRecharge() {
+        Jump2View.getInstance().goRechargeAct(activity, null);//进入充值绵羊币界面
+    }
+
+    @JavascriptInterface
+    public String getInvitationCode(){
+        String invitationCode = "";
+        try{
+            UserEntity userEntity = MyDbManager.getInstance().dbFindUser();
+            invitationCode = userEntity.getInvitation_code();
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return invitationCode;
+    }
+    @JavascriptInterface
+    public String popShare(String url, String type) {
+        CommonUtil.getInstance().popShare(activity, url, type);
+        return "";
+    }
+    @JavascriptInterface
+    public String getHeader() {
+        return SpUtils.getOpenId(activity);
+    }
+
+    @JavascriptInterface
+    public String getWcUrl(String url) {
+        if(!TextUtils.isEmpty(url)){
+            Jump2View.getInstance().goWeb(activity, url);
+        }
+        return "";
+    }
+
+    @JavascriptInterface
+    public int getTaskId(){
+        return taskId;
+    }
+}

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

@@ -11,6 +11,7 @@ import android.widget.TextView;
 
 import com.kfzs.duanduan.BaseCompatActivity;
 import com.sheep.gamegroup.model.entity.CreditCard;
+import com.sheep.gamegroup.util.WebviewJs;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
@@ -116,6 +117,7 @@ public class ActCreditCardWeb extends BaseCompatActivity {
             }
         });
         webViewSettings.setJavaScriptEnabled(true);
+        mWebView.addJavascriptInterface(new WebviewJs(ActCreditCardWeb.this, 0), "kfzsjs");
         mWebView.loadUrl(creditCard.getLoadUrl());
     }
 

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

@@ -67,6 +67,8 @@ public class GamemakeMoneyAct extends BaseActivity {
 
     private String title = "游戏任务";
 
+    private int currentItem;
+
     @Override
     protected int getLayoutId() {
         return R.layout.try_makemoney_act_layout;
@@ -79,6 +81,8 @@ public class GamemakeMoneyAct extends BaseActivity {
         is_succession = getIntent()
                 .getIntExtra(
                         "is_succession", 0);
+        currentItem = getIntent()
+                .getIntExtra("current_item", 0);
         TitleBarUtils
                 .getInstance()
                 .setTitle(activity, title).setTitleFinish(activity)
@@ -120,6 +124,7 @@ public class GamemakeMoneyAct extends BaseActivity {
 
             }
         });
+        pager.setCurrentItem(currentItem);
     }
 
     @Override

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

@@ -79,6 +79,8 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
     LinearLayout detail_item_layout_2;
     @BindView(R.id.detail_item_layout_3)
     LinearLayout detail_item_layout_3;
+    @BindView(R.id.detail_shrae_friend_layout)
+    LinearLayout detail_shrae_friend_layout;
     @BindView(R.id.detail_task_listview)
     MyListview detail_task_listview;
     @BindView(R.id.item_layout)
@@ -122,6 +124,7 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
         });
         detail_item_layout_2.setVisibility(View.VISIBLE);
         detail_item_layout_3.setVisibility(View.VISIBLE);
+        detail_shrae_friend_layout.setVisibility(View.GONE);
         webText.getSettings().setJavaScriptEnabled(true);
 // 1、LayoutAlgorithm.NARROW_COLUMNS ： 适应内容大小
 // 2、LayoutAlgorithm.SINGLE_COLUMN:适应屏幕，内容将自动缩放
@@ -241,11 +244,12 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
                 break;
             case R.id.btn_task_item:
                 showProgress();
-                if (taskReleaseEty == null || taskReleaseEty.getAccepted_task_id() == 0) {
-                    acceptTask();
-                } else {
-                    goWeb();
-                }
+                acceptTask();
+//                if (taskReleaseEty == null || taskReleaseEty.getAccepted_task_id() == 0) {
+//                    acceptTask();
+//                } else {
+//                    goWeb();
+//                }
                 break;
             case R.id.btn_up_imag:
                 showChooseDialog(false, true, DEFAULT_MAX_COUNT);

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

@@ -20,6 +20,7 @@ import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.ViewUtil;
+import com.sheep.gamegroup.view.activity.ActMyMoney;
 import com.sheep.gamegroup.view.adapter.ArrayAdapter;
 import com.sheep.gamegroup.view.customview.RefreshLayout;
 import com.sheep.jiuyan.samllsheep.R;
@@ -119,7 +120,10 @@ public class DialogOrienteeringDetails {
             dialog_btn_right.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    Jump2View.getInstance().goRechargeAct(activity, null);
+//                    Jump2View.getInstance().goRechargeAct(activity, null);
+
+                    Jump2View.getInstance()
+                            .goGameMakeMoney(activity, 1);
                     dialog.dismiss();
                 }
             });

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

@@ -136,8 +136,9 @@ public class DialogPayGame {
                         LogUtil.println("baseMessage onNext "+ JSON.toJSONString(baseMessage));
                         try{
                             String balances = baseMessage.getData() +"";
-                            balance = MathUtil.add(TextUtils.isEmpty(balances) ? "0" : balances,
-                                    TextUtils.isEmpty(MyDbManager.getInstance().dbFindValueBalance()) ? "0" : MyDbManager.getInstance().dbFindValueBalance());
+                            balance = TextUtils.isEmpty(balances) ? "0" : balances;
+//                            balance = MathUtil.add(TextUtils.isEmpty(balances) ? "0" : balances,
+//                                    TextUtils.isEmpty(MyDbManager.getInstance().dbFindValueBalance()) ? "0" : MyDbManager.getInstance().dbFindValueBalance());
 
 
                         }catch (Exception e){

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

@@ -3,7 +3,8 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:paddingBottom="@dimen/content_padding_small">
+    android:paddingBottom="@dimen/content_padding_small"
+    android:paddingTop="@dimen/content_padding_small">
 
     <ImageView
         android:id="@+id/pay_game_dialog_item_img"

gradle.properties

@@ -17,8 +17,8 @@
 # org.gradle.parallel=true
 #android.injected.build.model.only.versioned = 3
 
-VERSION_NAME=2.6.0
-VERSION_CODE=2006000
+VERSION_NAME=2.6.1
+VERSION_CODE=2006001
 ANDROID_COMPILE_SDK_VERSION=27
 ANDROID_BUILD_TOOLS_VERSION=27.0.2
 ANDROID_MIN_SDK_VERSION=18