banner 图片替换，一些bug修改

app/build.gradle

@@ -244,6 +244,7 @@ dependencies {
     compile 'me.iwf.photopicker:PhotoPicker:0.9.12@aar'
     compile 'com.github.bumptech.glide:glide:4.1.1'
 //    compile 'com.github.yalantis:ucrop:2.2.1-native'
+//    compile 'com.google.zxing:core:3.3.0'
     compile project(':ucrop')
     compile project(':kfzslibrary')
 }

app/src/main/java/com/kfzs/duanduan/ActMain.java

@@ -228,6 +228,7 @@ public class ActMain extends BaseCompatActivity{
         super.onNewIntent(intent);
         setIntent(intent);
         if (intent.hasExtra(INTEN_GAME_ID)) {
+            tabsHelper.goToPostion(intent.getIntExtra(INTEN_GAME_ID, 0));
         } else {
             recreate();
             if (gameDialog != null) {

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

@@ -27,6 +27,7 @@ import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.kfzs.duanduan.BaseCompatFragment;
 import com.kfzs.duanduan.event.BigEvent;
+import com.kfzs.duanduan.react.TabsHelper;
 import com.layoutscroll.layoutscrollcontrols.view.EasyLayoutScroll;
 import com.sheep.gamegroup.di.components.DaggerSmallSheepComponent;
 import com.sheep.gamegroup.di.modules.SmallSheepModule;
@@ -402,7 +403,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     private void setBanner(){
         ArrayList<Drawable> imgURL = new ArrayList<>();
         imgURL.add(getResources().getDrawable(R.mipmap.couple_red_packets));
-        imgURL.add(getResources().getDrawable(R.mipmap.couple_red_packets));
+        imgURL.add(getResources().getDrawable(R.mipmap.home_credit_img));
         if (mImageGlarry != null) {
             mImageGlarry.init(imgURL.toArray(new Drawable[]{}), ImageView.ScaleType.CENTER_CROP);
             return;
@@ -418,7 +419,8 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
                         break;
                     case 1:
-
+                        Jump2View.getInstance()
+                                .goHomePageView(activity, 4);
                         break;
                 }
             }

app/src/main/java/com/kfzs/duanduan/react/TabsHelper.java

@@ -185,4 +185,9 @@ public class TabsHelper {
         nativeBack();
     }
 
+    public boolean goToPostion(int postion) {
+        view_pager_container.setCurrentItem(postion);//
+        return true;
+    }
+
 }

app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java

@@ -213,11 +213,11 @@ public interface ApiService {
     /**
      * 修改任务进度
      */
-//    @GET(V1 + "/app/accepted_task/status")
-//    Observable<BaseMessage> taskStatus(@Query("id") int id,@Query("screenshots") String screenshots,
-//        @Query("remark") String remark,@Query("package_name") String package_name,@Query("status") String status);
-    @GET(V1 + "app/accepted_task/status")
-    Observable<BaseMessage> taskStatus(@Body JSONObject jsonObject);
+    @GET(V1 + "/app/accepted_task/status")
+    Observable<BaseMessage> taskStatus(@Query("id") int id,@Query("screenshots") String screenshots,
+        @Query("remark") String remark,@Query("package_name") String package_name,@Query("status") String status);
+//    @GET(V1 + "app/accepted_task/status")
+//    Observable<BaseMessage> taskStatus(@Body JSONObject jsonObject);
 
     @GET(V1 + "loan/userRecord")
     Observable<BaseMessage> userRecord();

app/src/main/java/com/sheep/gamegroup/model/entity/TaskEty.java

@@ -22,6 +22,24 @@ public class TaskEty implements Serializable{
     private String icon;
     private String package_size;
     private int release_task_id;
+    private String bonus;// 0,
+    private String desc;// 任务详情介绍
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    public String getBonus() {
+        return bonus;
+    }
+
+    public void setBonus(String bonus) {
+        this.bonus = bonus;
+    }
 
     public String getName() {
         return name;

app/src/main/java/com/sheep/gamegroup/presenter/TaskDetailPresenter.java

@@ -29,7 +29,8 @@ public class TaskDetailPresenter implements TaskDetailContract.Presenter {
 
     @Override
     public void taskStatus(JSONObject jsonObject) {
-        apiService.taskStatus(jsonObject)
+        apiService.taskStatus(jsonObject.getInteger("id"),jsonObject.getString("screenshots"),
+                jsonObject.getString("remark"),jsonObject.getString("package_name"),jsonObject.getString("status"))
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {

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

@@ -108,6 +108,9 @@ public class Jump2View {
      */
     public void goHomePageView(Context context, Object o){
         Intent intent = new Intent(context, ActMain.class);
+        if(o instanceof Integer){
+            intent.putExtra(ActMain.INTEN_GAME_ID, (Integer) o);
+        }
         context.startActivity(intent);
     }
 

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

@@ -0,0 +1,30 @@
+package com.sheep.gamegroup.view.activity;
+
+import com.sheep.gamegroup.absBase.BaseActivity;
+
+/**
+ * 广告
+ * Created by ljy on 2018/4/3.
+ */
+
+public class AdvertisingWebviewAct extends BaseActivity {
+    @Override
+    protected int getLayoutId() {
+        return 0;
+    }
+
+    @Override
+    public void initView() {
+
+    }
+
+    @Override
+    public void initListener() {
+
+    }
+
+    @Override
+    public void initData() {
+
+    }
+}

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

@@ -32,6 +32,8 @@ import com.sheep.gamegroup.model.entity.UploadResult;
 import com.sheep.gamegroup.presenter.TaskDetailContract;
 import com.sheep.gamegroup.presenter.TaskDetailPresenter;
 import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.MyDbManager;
+import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.gamegroup.view.dialog.DialogShowLoading;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
@@ -110,7 +112,7 @@ public class TaskDetailAct extends BaseActivity implements TaskDetailContract.Vi
     @Override
     public void initView() {
         activity = this;
-        taskEty = (TaskEty) getIntent().getSerializableExtra("task_enty");
+        taskEty = (TaskEty) getIntent().getSerializableExtra("task_entity");
         DaggerTaskDetailComponent.builder()
                 .netComponent(SheepApp.get(activity).getNetComponent())
                 .taskDetailModule(new TaskDetailModule(this))
@@ -145,7 +147,12 @@ public class TaskDetailAct extends BaseActivity implements TaskDetailContract.Vi
                 return true;
             }
         });
-        webText.loadUrl(taskEty.getDownload_link());
+        webText.loadUrl(taskEty.getDesc());
+        nameTv.setText(taskEty.getName()+"");
+        priceTv.setText("+"+ taskEty.getBonus() +"元");
+        dateTv.setText(TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(taskEty.getUpdate_time()))+"");
+
+        taskSchedule();
 
         if (taskEty.getRunTask() == 1){
             detailTaskTv.setVisibility(View.VISIBLE);
@@ -157,7 +164,10 @@ public class TaskDetailAct extends BaseActivity implements TaskDetailContract.Vi
         }
         if (PackageUtil.isAppInstalled(SheepApp.mContext, taskEty.getPackage_names())) {
             btnTaskItem.setText("开始游戏");
-        } else {
+        }else if(!TextUtils.isEmpty(PackageUtil.isExistsFile(activity, taskEty.getPackage_names(), ""))){
+            btnTaskItem.setText("开始安装");
+        }
+        else {
             btnTaskItem.setText("下载游戏");
         }
     }
@@ -173,6 +183,10 @@ public class TaskDetailAct extends BaseActivity implements TaskDetailContract.Vi
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.detail_task_tv://查看任务截图
+                if(TextUtils.isEmpty(taskEty.getScreenshots())){
+                    G.showToast("任务截图为空");
+                    return;
+                }
                 Intent intent = new Intent(activity, WebActivity.class);
                 intent.putExtra(WebActivity.INTENT_URL, taskEty.getScreenshots());
                 intent.putExtra(WebActivity.INTENT_TITLE, "任务提交示意");
@@ -185,7 +199,10 @@ public class TaskDetailAct extends BaseActivity implements TaskDetailContract.Vi
             case R.id.btn_task_item:
                 if (PackageUtil.isAppInstalled(SheepApp.mContext, taskEty.getPackage_names())) {
                     PackageUtil.startApp(SheepApp.mContext, taskEty.getPackage_names());
-                } else {
+                }else if(!TextUtils.isEmpty(PackageUtil.isExistsFile(activity, taskEty.getPackage_names(), ""))){
+                    PackageUtil.installApk(SheepApp.mContext, PackageUtil.isExistsFile(activity, taskEty.getPackage_names(), ""));
+                }
+                else {
                     Jump2View.getInstance().goDialogActivityView(activity, taskEty);
                 }
                 break;
@@ -312,11 +329,18 @@ public class TaskDetailAct extends BaseActivity implements TaskDetailContract.Vi
             dialogShowLoading.getTextView().setText("更新中");
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("id", taskEty.getRelease_task_id());
-            jsonObject.put("screenshots",taskEty.getScreenshots()+"");
+            jsonObject.put("screenshots",data+"");
             jsonObject.put("remark",taskEty.getRemarks()+"");
             jsonObject.put("package_name",taskEty.getPackage_names()+"");
             jsonObject.put("status",7+"");
             presenter.taskStatus(jsonObject);
+            taskEty.setScreenshots(data);
+//            try{
+//                MyDbManager.getInstance()
+//                        .saveOrUpdateUser(taskEty);
+//            }catch (Exception e){
+//                e.printStackTrace();
+//            }
         }
     }
     private void updateError(String msg) {

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

@@ -2,6 +2,7 @@ package com.sheep.gamegroup.view.activity;
 
 import android.app.Activity;
 import android.os.Bundle;
+import android.text.Html;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.AdapterView;
@@ -54,6 +55,8 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
     TextView withdrawalSure;
     @BindView(R.id.weixin_name_tv)
     TextView weixin_name_tv;
+    @BindView(R.id.withdrawal_click_bindname_tv)
+    TextView withdrawal_click_bindname_tv;
 
     Activity activity;
     @Inject
@@ -114,6 +117,8 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
             UserEntity userEntity = MyDbManager.getInstance().dbFindUser();
             if(userEntity != null){
                 weixin_name_tv.setText(userEntity.getWx_nickname() +"");
+                String sr = "可提现金额<font color='#ff2d4b'><small>" + userEntity.getMobile() + "</small></font>元";
+                withdrawal_click_bindname_tv.setText(Html.fromHtml(sr));
             }
         } catch (DbException e) {
             e.printStackTrace();

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

@@ -142,6 +142,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
 //                        }
                         TaskEty taskEty = etyList.get(i).getTask();
                         taskEty.setRunTask(0);
+                        taskEty.setBonus(etyList.get(i).getBonus());
                         taskEty.setRelease_task_id(etyList.get(i).getId());
                         taskEty.setName(etyList.get(i).getName());
                         Jump2View.getInstance().goTaskDetailView(context, taskEty);
@@ -204,6 +205,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
 //                G.showToast("任务详情");
                 TaskEty taskEty = acceptedEty.getRelease_task().getTask();
                 taskEty.setRunTask(1);
+                taskEty.setBonus(acceptedEty.getRelease_task().getBonus());
                 taskEty.setRelease_task_id(acceptedEty.getRelease_task().getId());
                 taskEty.setName(acceptedEty.getRelease_task().getName());
                 Jump2View.getInstance().goTaskDetailView(context, taskEty);

app/src/main/java/com/sheep/gamegroup/view/customview/CustomWebView.java

@@ -0,0 +1,118 @@
+package com.sheep.gamegroup.view.customview;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.view.View;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+
+/**
+ * 自定义webview
+ * 识别二维码
+ * Created by ljy on 2018/4/3.
+ */
+
+public class CustomWebView extends WebView implements View.OnLongClickListener {
+    private Context context;
+    private LongClickCallBack mCallBack;
+    public CustomWebView(Context context, LongClickCallBack mCallBack) {
+        super(context);
+        this.context = context;
+        this.mCallBack = mCallBack;
+        initSettings();
+    }
+
+    private void initSettings() {
+        // 初始化设置
+        WebSettings mSettings = this.getSettings();
+        mSettings.setJavaScriptEnabled(true);//开启javascript
+        mSettings.setDomStorageEnabled(true);//开启DOM
+        mSettings.setDefaultTextEncodingName("utf-8");//设置字符编码
+        //设置web页面
+        mSettings.setAllowFileAccess(true);//设置支持文件流
+        mSettings.setSupportZoom(true);// 支持缩放
+        mSettings.setBuiltInZoomControls(true);// 支持缩放
+        mSettings.setUseWideViewPort(true);// 调整到适合webview大小
+        mSettings.setLoadWithOverviewMode(true);// 调整到适合webview大小
+        mSettings.setDefaultZoom(WebSettings.ZoomDensity.FAR);// 屏幕自适应网页,如果没有这个，在低分辨率的手机上显示可能会异常
+        mSettings.setRenderPriority(WebSettings.RenderPriority.HIGH);
+        //提高网页加载速度，暂时阻塞图片加载，然后网页加载好了，在进行加载图片
+        mSettings.setBlockNetworkImage(true);
+        mSettings.setAppCacheEnabled(true);//开启缓存机制
+
+        setWebViewClient(new MyWebViewClient());
+        setOnLongClickListener(this);
+    }
+
+    @Override
+    public boolean onLongClick(View v) {
+        // 长按事件监听（注意：需要实现LongClickCallBack接口并传入对象）
+        final HitTestResult htr = getHitTestResult();//获取所点击的内容
+        if (htr.getType() == WebView.HitTestResult.IMAGE_TYPE) {//判断被点击的类型为图片
+            mCallBack.onLongClickCallBack(htr.getExtra());
+        }
+        return false;
+    }
+
+    private class MyWebViewClient extends WebViewClient {
+        /**
+         * 加载过程中 拦截加载的地址url
+         * @param view
+         * @param url  被拦截的url
+         * @return
+         */
+        @Override
+        public boolean shouldOverrideUrlLoading(WebView view, String url) {
+            return super.shouldOverrideUrlLoading(view, url);
+        }
+        /**
+         * 页面加载过程中，加载资源回调的方法
+         * @param view
+         * @param url
+         */
+        @Override
+        public void onLoadResource(WebView view, String url) {
+            super.onLoadResource(view, url);
+        }
+        /**
+         * 页面加载完成回调的方法
+         * @param view
+         * @param url
+         */
+        @Override
+        public void onPageFinished(WebView view, String url) {
+            super.onPageFinished(view, url);
+            // 关闭图片加载阻塞
+            view.getSettings().setBlockNetworkImage(false);
+        }
+        /**
+         * 页面开始加载调用的方法
+         * @param view
+         * @param url
+         * @param favicon
+         */
+        @Override
+        public void onPageStarted(WebView view, String url, Bitmap favicon) {
+            super.onPageStarted(view, url, favicon);
+        }
+        @Override
+        public void onReceivedError(WebView view, int errorCode,                            String description, String failingUrl) {
+            super.onReceivedError(view, errorCode, description, failingUrl);
+        }
+        @Override
+        public void onScaleChanged(WebView view, float oldScale, float newScale) {
+            super.onScaleChanged(view, oldScale, newScale);
+            CustomWebView.this.requestFocus();
+            CustomWebView.this.requestFocusFromTouch();
+        }
+    }
+    /**
+     * 长按事件回调接口，传递图片地址
+     * @author LinZhang
+     */
+    public interface LongClickCallBack{
+        /**用于传递图片地址*/
+        void onLongClickCallBack(String imgUrl);
+    }
+}

app/src/main/java/com/sheep/jiuyan/samllsheep/utils/PackageUtil.java

@@ -209,4 +209,17 @@ public class PackageUtil {
 
         return false;
     }
+
+    /**
+     * 通过报名、路径判断是否下载过
+     */
+    public static String isExistsFile(Context context, String packName, String filePath){
+        ClassFileHelper.getInstance().createSDDirection();
+        File mApkPath = new File(ClassFileHelper.DIR, packName + ClassFileHelper.FILE_SUFFIX);
+        if (!mApkPath.exists()) {
+            return null;
+        }else{
+            return mApkPath.getAbsolutePath();
+        }
+    }
 }

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

@@ -40,7 +40,7 @@
                     android:layout_margin="@dimen/content_padding_10"
                     android:layout_toRightOf="@id/dialog_item_icon_iv"
                     android:textSize="13sp"
-                    android:text="无敌大航海"
+                    android:text=""
                     android:textStyle="bold"/>
 
                 <TextView

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

@@ -48,13 +48,13 @@
                                 style="@style/nomal_txt_style"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="完成试玩任务无敌大航海"/>
+                                android:text=""/>
 
                             <TextView
                                 android:id="@+id/date_tv"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="2018/02/14 14:41"
+                                android:text=""
                                 android:layout_below="@+id/name_tv"
                                 android:textSize="@dimen/text_size_3"
                                 android:textColor="@color/txt_black_818181"
@@ -65,7 +65,7 @@
                             android:id="@+id/price_tv"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="+1.5元"
+                            android:text=""
                             android:textColor="@color/txt_red"
                             android:textSize="@dimen/text_size_15"
                             android:layout_centerVertical="true"

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

@@ -105,14 +105,14 @@
                     android:id="@+id/withdrawal_click_bindname_tv"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="点我进行实名认证，以后提现都不用验证啦!"
+                    android:text="可提现金额20元"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintLeft_toLeftOf="parent"
                     android:textColor="@color/txt_gray_929292"
                     android:textSize="@dimen/text_size_12"
                     app:layout_constraintTop_toBottomOf="@+id/line_two"
                     android:layout_marginTop="@dimen/content_padding_20"
-                    android:visibility="gone"/>
+                    android:visibility="visible"/>
                 <com.sheep.gamegroup.util.MyGridview
                     android:id="@+id/withdrawal_greidview"
                     android:layout_height="wrap_content"