hanjing лет назад: 6
Родитель
Сommit
b4368478ff
18 измененных файлов с 125 добавлено и 81 удалено
  1. 14 1
      app/src/main/java/cn/finalteam/rxgalleryfinal/utils/CameraUtil.java
  2. 33 20
      app/src/main/java/com/sheep/gamegroup/absBase/AbsChooseImageActivity.java
  3. 3 0
      app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java
  4. 2 0
      app/src/main/java/com/sheep/gamegroup/module/login/fragments/EditUserInfoFgt.java
  5. 2 0
      app/src/main/java/com/sheep/gamegroup/module/webview/fragment/FgtWeb.java
  6. 2 0
      app/src/main/java/com/sheep/gamegroup/module/webview/fragment/FgtWebX5.java
  7. 15 0
      app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java
  8. 2 0
      app/src/main/java/com/sheep/gamegroup/util/Jump2View.java
  9. 14 2
      app/src/main/java/com/sheep/gamegroup/util/js/KFZSJs.java
  10. 24 13
      app/src/main/java/com/sheep/gamegroup/util/viewHelper/WebViewVideoHelper.java
  11. 0 12
      app/src/main/java/com/sheep/gamegroup/view/activity/ActArticle.java
  12. 1 11
      app/src/main/java/com/sheep/gamegroup/view/activity/ActArticleComment.java
  13. 6 6
      app/src/main/java/com/sheep/gamegroup/view/activity/ActPay.java
  14. 3 1
      app/src/main/java/com/sheep/gamegroup/view/activity/ActWebX5.java
  15. 1 0
      app/src/main/java/com/sheep/gamegroup/view/activity/RechargeAct.java
  16. 0 8
      app/src/main/java/com/sheep/gamegroup/view/activity/SplashAct.java
  17. 0 6
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtArticleComment.java
  18. 3 1
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtSmallSheep.java

+ 14 - 1
app/src/main/java/cn/finalteam/rxgalleryfinal/utils/CameraUtil.java

@@ -1,11 +1,15 @@
 package cn.finalteam.rxgalleryfinal.utils;
 
+import android.Manifest;
 import android.app.Activity;
 import android.content.ContentValues;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 import android.provider.MediaStore;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
 import android.util.Log;
 
 import com.sheep.jiuyan.samllsheep.SheepApp;
@@ -26,7 +30,16 @@ import cn.finalteam.rxgalleryfinal.api.CameraCallBack;
  */
 public class CameraUtil {
 
+    public static boolean checkCameraPermission(Activity activity) {
+        if (ContextCompat.checkSelfPermission(activity, Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) {
+            ActivityCompat.requestPermissions(activity, new String[]{Manifest.permission.CAMERA}, 1001);
+            return false;
+        }
+        return true;
+    }
+
     public static String openCamera(Activity activity, boolean isImage) {
+        if (!checkCameraPermission(activity)) return null;
         Intent captureIntent = isImage ? new Intent(MediaStore.ACTION_IMAGE_CAPTURE) : new Intent(MediaStore.ACTION_VIDEO_CAPTURE);
         if (captureIntent.resolveActivity(activity.getPackageManager()) == null) {
             G.shortToast("相机不可用");
@@ -56,7 +69,7 @@ public class CameraUtil {
 
     public static void onActivityResult(Activity activity, int requestCode, String path, CameraCallBack cameraCallBack) {
         Log.i(MediaUtils.class.getSimpleName(), "onActivityResult: requestCode=" + requestCode);
-        if(path != null){
+        if (path != null) {
             activity.sendBroadcast(new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, Uri.parse("file://" + path)));
         }
         switch (requestCode) {

+ 33 - 20
app/src/main/java/com/sheep/gamegroup/absBase/AbsChooseImageActivity.java

@@ -20,6 +20,7 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
+import cn.finalteam.rxgalleryfinal.utils.CameraUtil;
 import me.iwf.photopicker.PhotoPicker;
 
 /**
@@ -40,11 +41,12 @@ public abstract class AbsChooseImageActivity extends BaseActivity implements UpF
     public static final int DEFAULT_MAX_COUNT = 7;//上传任务截图的最大个数
 
     public void showChooseDialog() {
-        showChooseDialog(true, true,1);
+        showChooseDialog(true, true, 1);
     }
 
     public void showChooseDialog(boolean isCrop, boolean isUpload, int photoCount) {
-        photoCount = Math.max(1,photoCount);
+        if (!CameraUtil.checkCameraPermission(this)) return;
+        photoCount = Math.max(1, photoCount);
         this.isUpload = isUpload;
         this.isCrop = isCrop && photoCount == 1;
         this.photoCount = photoCount;
@@ -58,10 +60,12 @@ public abstract class AbsChooseImageActivity extends BaseActivity implements UpF
                 .setPreviewEnabled(true)
                 .start(this, PhotoPicker.REQUEST_CODE);
     }
+
     public void showChooseDialog(boolean isCrop, boolean isUpload, int photoCount, File dir) {
+        if (!CameraUtil.checkCameraPermission(this)) return;
         LogUtil.println("showChooseDialog", dir.getAbsolutePath(), dir.exists());
         File[] files = dir.listFiles();
-        if(dir.exists() && files != null && files.length > 0) {
+        if (dir.exists() && files != null && files.length > 0) {
             photoCount = Math.max(1, photoCount);
             this.isUpload = isUpload;
             this.isCrop = isCrop && photoCount == 1;
@@ -85,8 +89,10 @@ public abstract class AbsChooseImageActivity extends BaseActivity implements UpF
             G.showToast("暂无截图(若您已经截图,请查看是否开启查看应用使用情况等权限!)");
         }
     }
+
     public void showChooseListDialog(boolean isCrop, boolean isUpload, int photoCount, ArrayList<String> imageUriList) {
-        if(!ListUtil.isEmpty(imageUriList)) {
+        if (!CameraUtil.checkCameraPermission(this)) return;
+        if (!ListUtil.isEmpty(imageUriList)) {
             photoCount = Math.max(1, photoCount);
             this.isUpload = isUpload;
             this.isCrop = isCrop && photoCount == 1;
@@ -105,8 +111,10 @@ public abstract class AbsChooseImageActivity extends BaseActivity implements UpF
             G.showToast("暂无截图(若您已经截图,请查看是否开启查看应用使用情况等权限!)");
         }
     }
+
     public void showChooseDialog(boolean isCrop, boolean isUpload, int photoCount, ArrayList<String> imageUriList) {
-        photoCount = Math.max(1,photoCount);
+        if (showCamera && !CameraUtil.checkCameraPermission(this)) return;
+        photoCount = Math.max(1, photoCount);
         this.isUpload = isUpload;
         this.isCrop = isCrop && photoCount == 1;
         this.photoCount = photoCount;
@@ -123,6 +131,7 @@ public abstract class AbsChooseImageActivity extends BaseActivity implements UpF
                 .setPicker(imageUriList)
                 .start(this, PhotoPicker.REQUEST_CODE);
     }
+
     private boolean showCamera = false;
 
     public void setShowCamera(boolean showCamera) {
@@ -151,34 +160,34 @@ public abstract class AbsChooseImageActivity extends BaseActivity implements UpF
                 onNotGetImage("没有数据");
             } else if (requestCode == UCrop.REQUEST_CROP) {//裁剪
                 Uri resultUri;
-                if (data != null && (resultUri = UCrop.getOutput(data))!=null) {
+                if (data != null && (resultUri = UCrop.getOutput(data)) != null) {
                     String cropPath;
-                    if(!TextUtils.isEmpty(cropPath = resultUri.getPath())){
+                    if (!TextUtils.isEmpty(cropPath = resultUri.getPath())) {
                         path = cropPath;
                         notCrop();
                     }
 
-                } else if(!TextUtils.isEmpty(path)){
-                        notCrop();
+                } else if (!TextUtils.isEmpty(path)) {
+                    notCrop();
                 }
             }
         } else if (resultCode == UCrop.RESULT_ERROR) {//裁剪出错
-            if(!TextUtils.isEmpty(path))
+            if (!TextUtils.isEmpty(path))
                 notCrop();
         }
     }
 
     private void notCrop() {
-        if(photoCount == 1) {
+        if (photoCount == 1) {
             onGetImage(path);
             if (isUpload) {
                 AbsChooseImageActivity.this.dialogShowLoading = DialogProgress.showDialog(AbsChooseImageActivity.this);
                 UpFileUtils.upImage(new File(path), AbsChooseImageActivity.this);
             }
-        } else if(photos != null && !photos.isEmpty()){
+        } else if (photos != null && !photos.isEmpty()) {
             StringBuilder sb = new StringBuilder();
             for (int i = 0; i < photos.size(); i++) {
-                if(i != 0)
+                if (i != 0)
                     sb.append(";");
                 sb.append(photos.get(i));
             }
@@ -200,18 +209,19 @@ public abstract class AbsChooseImageActivity extends BaseActivity implements UpF
 
     /**
      * 上传图片前的回调
+     *
      * @return
      */
-    protected ICallBack<Boolean> getCallBack(){
+    protected ICallBack<Boolean> getCallBack() {
         return null;
     }
 
     @Override
     public void Success(String msg, int index) {
-        if(index == -1 && !urls.isEmpty()) {//多图
+        if (index == -1 && !urls.isEmpty()) {//多图
             StringBuilder sb = new StringBuilder();
             for (int i = 0; i < urls.size(); i++) {
-                if(i != 0)
+                if (i != 0)
                     sb.append(";");
                 sb.append(urls.get(i));
             }
@@ -223,14 +233,15 @@ public abstract class AbsChooseImageActivity extends BaseActivity implements UpF
                 updateError("失败");
                 return;
             }
-            if(photoCount == 1) {
+            if (photoCount == 1) {
                 onSetNetImageUrl(data);
             } else {
                 urls.add(data);
             }
         }
     }
-    protected String parseMsg(String msg){
+
+    protected String parseMsg(String msg) {
         String json;
         if (TextUtils.isEmpty(msg)) {
             return null;
@@ -255,6 +266,7 @@ public abstract class AbsChooseImageActivity extends BaseActivity implements UpF
     protected void setLoaddingText(String msg) {
         dialogShowLoading.getTextView().setText(msg);
     }
+
     protected void dismissLoaddingDialog() {
         dialogShowLoading.getAlertDialog().dismiss();
     }
@@ -269,14 +281,15 @@ public abstract class AbsChooseImageActivity extends BaseActivity implements UpF
     public void Progress(String progress, int index) {
         dialogShowLoading.getTextView().setText(progress);
         dialogShowLoading.getTextView().append("%");
-        if(index != -1 && photos != null && photos.size() != 1)
-            dialogShowLoading.getTextView().append(" "+(index+1)+"/"+photos.size());
+        if (index != -1 && photos != null && photos.size() != 1)
+            dialogShowLoading.getTextView().append(" " + (index + 1) + "/" + photos.size());
     }
 
     @Override
     public void Failure(String err) {
         onNotGetImage(err);
     }
+
     //流程:获取图片、裁剪图片、上传图片、设置或者更新图片
     protected abstract void onNotGetImage(String msg);//失败后回调
 

+ 3 - 0
app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java

@@ -59,6 +59,9 @@ public interface ApiService {
     @PUT("app/user/change_password/")
     Observable<BaseMessage> changePassword(@Body JSONObject jsonObject);
 
+    @POST("app/user/sign_out/")
+    Observable<BaseMessage> logout(@Body JSONObject jsonObject);
+
     /**
      * @param page     页数
      * @param per_page 每页显示条数

+ 2 - 0
app/src/main/java/com/sheep/gamegroup/module/login/fragments/EditUserInfoFgt.java

@@ -34,6 +34,7 @@ import java.util.List;
 
 import butterknife.BindView;
 import butterknife.OnClick;
+import cn.finalteam.rxgalleryfinal.utils.CameraUtil;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
 import me.iwf.photopicker.PhotoPicker;
@@ -197,6 +198,7 @@ public class EditUserInfoFgt extends BaseFragment {
 
     @OnClick(R.id.avatar_view)
     public void doSelectAvatar(View v) {
+        if (!CameraUtil.checkCameraPermission(getActivity())) return;
         PhotoPicker.builder()
                 .setPhotoCount(1)
                 .setShowCamera(true)

+ 2 - 0
app/src/main/java/com/sheep/gamegroup/module/webview/fragment/FgtWeb.java

@@ -57,6 +57,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import butterknife.BindView;
+import cn.finalteam.rxgalleryfinal.utils.CameraUtil;
 import cn.modificator.waterwave_progress.WidgetUtil;
 import okhttp3.Call;
 
@@ -261,6 +262,7 @@ public class FgtWeb extends BaseFgtWeb {
 
             @Override
             public boolean onShowFileChooser(WebView webView, ValueCallback<Uri[]> filePathCallback, FileChooserParams fileChooserParams) {
+                if (!CameraUtil.checkCameraPermission(getActivity())) return true;
                 if (mFilePathCallback != null) {
                     mFilePathCallback.onReceiveValue(null);
                 }

+ 2 - 0
app/src/main/java/com/sheep/gamegroup/module/webview/fragment/FgtWebX5.java

@@ -61,6 +61,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import butterknife.BindView;
+import cn.finalteam.rxgalleryfinal.utils.CameraUtil;
 import cn.modificator.waterwave_progress.WidgetUtil;
 import okhttp3.Call;
 import ren.yale.android.cachewebviewlib.WebViewCacheInterceptorInst;
@@ -266,6 +267,7 @@ public class FgtWebX5 extends BaseFgtWebX5 {
 
             @Override
             public boolean onShowFileChooser(WebView webView, ValueCallback<Uri[]> filePathCallback, FileChooserParams fileChooserParams) {
+                if (!CameraUtil.checkCameraPermission(getActivity())) return true;
                 if (mFilePathCallback != null) {
                     mFilePathCallback.onReceiveValue(null);
                 }

+ 15 - 0
app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java

@@ -118,6 +118,7 @@ import io.reactivex.ObservableOnSubscribe;
 import io.reactivex.Observer;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
+import io.reactivex.subjects.Subject;
 import okhttp3.Call;
 import rx.functions.Action1;
 
@@ -645,6 +646,20 @@ public class CommonUtil {
         DataUtil.getInstance().clearData();
         //删除自动审核任务中保存的数据,防止用户切换账号后直接提交
         DDProviderHelper.getInstance().deleteTaskRecord();
+        SheepApp.getInstance().getNetComponent().getApiService().logout(new JSONObject())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>() {
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+
+                    }
+
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+
+                    }
+                });
         Intent intent = new Intent(activity, ActMain.class).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         intent.putExtra("INTENT_ACTION", "LOGOUT");
         activity.startActivity(intent);

+ 2 - 0
app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -196,6 +196,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
+import cn.finalteam.rxgalleryfinal.utils.CameraUtil;
 import io.reactivex.Observable;
 import io.reactivex.ObservableOnSubscribe;
 import io.reactivex.ObservableSource;
@@ -1279,6 +1280,7 @@ public class Jump2View {
      * @param files
      */
     public void selectImgFiles(Activity activity, int photoCount, File... files) {
+        if (!CameraUtil.checkCameraPermission(activity)) return;
         PhotoPicker.builder()
                 .setPhotoCount(photoCount)
                 .setShowCamera(false)

+ 14 - 2
app/src/main/java/com/sheep/gamegroup/util/js/KFZSJs.java

@@ -1,8 +1,12 @@
 package com.sheep.gamegroup.util.js;
 
+import android.Manifest;
 import android.app.Activity;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.provider.MediaStore;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.view.View;
 import android.webkit.JavascriptInterface;
@@ -435,12 +439,20 @@ public class KFZSJs {
 
     @JavascriptInterface
     public void getAllContact() {
-        ContactUtil.getAllContactList(result -> iWeb.loadJs(String.format(Locale.CHINA, "onGetAllContact('%s')", result)));
+        if (ContextCompat.checkSelfPermission(activity, Manifest.permission.READ_CONTACTS) == PackageManager.PERMISSION_GRANTED) {
+            ContactUtil.getAllContactList(result -> iWeb.loadJs(String.format(Locale.CHINA, "onGetAllContact('%s')", result)));
+        } else {
+            ActivityCompat.requestPermissions(activity, new String[]{Manifest.permission.READ_CONTACTS}, 1001);
+        }
     }
 
     @JavascriptInterface
     public void getAllCallLog() {
-        SMSUtil.getCallLog(result -> iWeb.loadJs(String.format(Locale.CHINA, "onGetAllCallLog('%s')", result)));
+        if (ContextCompat.checkSelfPermission(activity, Manifest.permission.READ_CALL_LOG) == PackageManager.PERMISSION_GRANTED) {
+            SMSUtil.getCallLog(result -> iWeb.loadJs(String.format(Locale.CHINA, "onGetAllCallLog('%s')", result)));
+        } else {
+            ActivityCompat.requestPermissions(activity, new String[]{Manifest.permission.READ_CALL_LOG}, 1001);
+        }
     }
 
     @JavascriptInterface

+ 24 - 13
app/src/main/java/com/sheep/gamegroup/util/viewHelper/WebViewVideoHelper.java

@@ -97,9 +97,16 @@ public class WebViewVideoHelper {
             }
         });
         webView.setWebViewClient(new WebViewClient() {
+
+            @Override
+            public void onPageFinished(WebView webView, String url){
+                super.onPageFinished(webView, url);
+                LogUtil.println(getClass().getSimpleName(), "page loaded: " + url);
+            }
+
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                LogUtil.println(getClass().getSimpleName(), "shouldOverrideUrlLoading", url);
+                LogUtil.println(getClass().getSimpleName(), "shouldOverrideUrlLoading: " + url);
                 //Android8.0以下的需要返回true 并且需要loadUrl;8.0之后效果相反
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                     return false;
@@ -156,26 +163,29 @@ public class WebViewVideoHelper {
         webView.setVisibility(View.VISIBLE);
     }
 
-    public void onBackUp() {
-/**回退键 事件处理 优先级:
- 视频播放全屏 - 网页回退 - 关闭页面*/
+//    public void onBackUp() {
+///**回退键 事件处理 优先级:
+// 视频播放全屏 - 网页回退 - 关闭页面*/
+////        if (customView != null) {
+////            hideCustomView();
+////        } else if (webView != null && webView.canGoBack()) {
+////            webView.goBack();
+////        } else {
+////            activity.finish();
+////        }
+//    }
+
+    public boolean onBackPressed() {
         if (customView != null) {
             hideCustomView();
         } else if (webView != null && webView.canGoBack()) {
             webView.goBack();
-        } else {
-            activity.finish();
-        }
-    }
-
-    public boolean onBackPressed() {
-        if (webView != null && webView.canGoBack()) {
-            webView.goBack();
             return true;
         }
         return false;
     }
-    public void onResume(){
+
+    public void onResume() {
         try {
             if (webView != null) {
 //                webView.resumeTimers();
@@ -199,6 +209,7 @@ public class WebViewVideoHelper {
             }
         }
     }
+
     public void onDestroy() {
         if (webView != null) {
 //            webView.onPause();

+ 0 - 12
app/src/main/java/com/sheep/gamegroup/view/activity/ActArticle.java

@@ -495,18 +495,6 @@ public class ActArticle extends BaseActivity implements Action1<Integer> {
         webViewVideoHelper.onResume();
     }
 
-
-
-    @Override
-    public boolean onKeyUp(int keyCode, KeyEvent event) {
-        switch (keyCode) {
-            case KeyEvent.KEYCODE_BACK:
-                webViewVideoHelper.onBackUp();
-                return true;
-            default:
-                return super.onKeyUp(keyCode, event);
-        }
-    }
     @Override
     public void onBackPressed() {
         if(webViewVideoHelper.onBackPressed()){

+ 1 - 11
app/src/main/java/com/sheep/gamegroup/view/activity/ActArticleComment.java

@@ -22,17 +22,7 @@ public class ActArticleComment extends BaseContainerActivity {
         fragment.setArticle_id(article_id);
         return fragment;
     }
-    @Override
-    public boolean onKeyUp(int keyCode, KeyEvent event) {
-        switch (keyCode) {
-            case KeyEvent.KEYCODE_BACK:
-                if(fragment instanceof FgtArticleComment)
-                    ((FgtArticleComment) fragment).onBackUp();
-                return true;
-            default:
-                return super.onKeyUp(keyCode, event);
-        }
-    }
+
     @Override
     public void onBackPressed() {
         if(fragment instanceof FgtArticleComment && ((FgtArticleComment) fragment).onBackPressed()){

+ 6 - 6
app/src/main/java/com/sheep/gamegroup/view/activity/ActPay.java

@@ -96,12 +96,6 @@ public class ActPay extends BaseActivity {
 
     @Override
     public void initData() {
-        UserEntity user = DataUtil.getInstance().getUserEntity();
-        if (user == null) {
-            Jump2View.getInstance().goRechargeResult(this, "9001", from_package, null, "请先登录");
-            finish();
-            return;
-        }
         Intent intent = getIntent();
         Bundle bundle = intent.getExtras();
         if (bundle != null) {
@@ -109,6 +103,12 @@ public class ActPay extends BaseActivity {
             pay_type = bundle.getString("pay_type");
             from_package = bundle.getString("from_package");
             token = bundle.getString("token");
+            UserEntity user = DataUtil.getInstance().getUserEntity();
+            if (user == null) {
+                Jump2View.getInstance().goRechargeResult(this, "9001", from_package, null, "请先登录");
+                finish();
+                return;
+            }
             String tokenPrev = user.getId() + "@";
             if (token.startsWith(tokenPrev)) {
                 token = SpUtils.getToken(this);

+ 3 - 1
app/src/main/java/com/sheep/gamegroup/view/activity/ActWebX5.java

@@ -104,7 +104,9 @@ public class ActWebX5 extends BaseContainerActivity {
 
     @Override
     public void onBackPressed() {
-        fragment.onBackPressed();
+        if (!fragment.onBackPressed()) {
+            finish();
+        }
     }
 
     @Override

+ 1 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/RechargeAct.java

@@ -196,6 +196,7 @@ public class RechargeAct extends BaseActivity {
             } else {
                 String result = "9001";
                 Jump2View.getInstance().goRechargeResult(RechargeAct.this, result, fromPackage, null, "用户信息不一致,请再次确认用户信息");
+                finish();
             }
         } else {
             showProgress();

+ 0 - 8
app/src/main/java/com/sheep/gamegroup/view/activity/SplashAct.java

@@ -98,14 +98,6 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
     protected String[] needPermissions = {
             Manifest.permission.WRITE_EXTERNAL_STORAGE,
             Manifest.permission.READ_EXTERNAL_STORAGE,
-            Manifest.permission.ACCESS_COARSE_LOCATION,
-            Manifest.permission.ACCESS_FINE_LOCATION,
-            Manifest.permission.CAMERA,
-            Manifest.permission.READ_CONTACTS,
-            Manifest.permission.WRITE_CONTACTS,
-            Manifest.permission.READ_CALL_LOG,
-            Manifest.permission.WRITE_CALL_LOG,
-            Manifest.permission.READ_PHONE_STATE
     };
     private RxjavaCountDownTimer timer;
 

+ 0 - 6
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtArticleComment.java

@@ -560,12 +560,6 @@ public class FgtArticleComment extends BaseListFragment3<UserComment> implements
         }
     }
 
-
-    public boolean onBackUp() {
-        webViewVideoHelper.onBackUp();
-        return true;
-    }
-
     public boolean onBackPressed() {
         return webViewVideoHelper.onBackPressed();
     }

+ 3 - 1
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtSmallSheep.java

@@ -66,6 +66,7 @@ import com.sheep.gamegroup.model.entity.RequestParamEty;
 import com.sheep.gamegroup.model.entity.SlideshowEty;
 import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
 import com.sheep.gamegroup.model.entity.UserEntity;
+import com.sheep.gamegroup.model.entity.WebParams;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.model.util.ShowRedDot;
 import com.sheep.gamegroup.module.game.util.HpRefreshWelfareHelper;
@@ -102,6 +103,7 @@ import com.sheep.gamegroup.view.adapter.AdbCommonRecycler;
 import com.sheep.gamegroup.view.adapter.AdpTryMakemoney;
 import com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp;
 import com.sheep.gamegroup.view.dialog.DialogNotificationOfArrival;
+import com.sheep.jiuyan.samllsheep.Config;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;
@@ -319,7 +321,7 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
 
     @OnClick(R.id.home_search_sbd_iv)
     public void toActWebX5Sbd() {
-        startActivity(new Intent(activity, ActWebX5SBD.class));
+        Jump2View.getInstance().goWeb(activity, new WebParams(Config.getUrlByPath(Config.PATH_SBD_HOME), Config.SBD_NAME));
     }
     @OnClick(R.id.home_search_msg_iv)
     public void toActMsg() {