Merge remote-tracking branch 'origin/sheep_develop' into sheep_develop

app/src/main/java/cn/finalteam/rxgalleryfinal/utils/MediaUtils.java

@@ -21,6 +21,7 @@ import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
 import com.sheep.jiuyan.samllsheep.utils.FileUtil;
+import com.sheep.jiuyan.samllsheep.utils.G;
 import com.yalantis.ucrop.UCrop;
 
 import java.io.File;
@@ -481,7 +482,7 @@ public class MediaUtils {
     public static String openCamera(Activity activity, boolean isImage) {
         Intent captureIntent = isImage ? new Intent(MediaStore.ACTION_IMAGE_CAPTURE) : new Intent(MediaStore.ACTION_VIDEO_CAPTURE);
         if (captureIntent.resolveActivity(activity.getPackageManager()) == null) {
-            Toast.makeText(SheepApp.getInstance(), "相机不可用", Toast.LENGTH_SHORT).show();
+            G.shortToast("相机不可用");
             return null;
         }
 

app/src/main/java/com/sheep/gamegroup/model/util/SheepSubscriber.java

@@ -14,6 +14,7 @@ import com.sheep.gamegroup.util.NetUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
 import io.reactivex.Observer;
@@ -29,17 +30,13 @@ public abstract class SheepSubscriber<T> implements Observer<T> {
     private Context context;
 
     public SheepSubscriber(Context context) {
-        this.context = context;
+        this.context = SheepApp.getInstance();
     }
 
     @Override
     public void onSubscribe(Disposable d) {
-        //接下来可以检查网络连接等操作
-        if(context == null)
-            context = SheepApp.getInstance();
         if (!NetUtil.isConnected(context)) {
-
-            Toast.makeText(context, "当前网络不可用，请检查网络情况", Toast.LENGTH_SHORT).show();
+            G.shortToast("当前网络不可用，请检查网络情况");
             // 一定好主动调用下面这一句,取消本次Subscriber订阅
             if (!d.isDisposed()) {
                 d.dispose();

app/src/main/java/com/sheep/gamegroup/module/login/fragments/SignInFgt.java

@@ -17,7 +17,6 @@ import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.PopupWindow;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.alibaba.fastjson.JSONObject;
 import com.sheep.gamegroup.greendao.DDProviderHelper;

app/src/main/java/com/sheep/gamegroup/receiver/ExampleUtil.java

@@ -14,6 +14,9 @@ import android.text.TextUtils;
 import android.widget.Toast;
 
 
+import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.G;
+
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -84,14 +87,14 @@ public class ExampleUtil {
 		}
 	}
 
-    public static void showToast(final String toast, final Context context)
+    public static void showToast(final String toast)
     {
     	new Thread(new Runnable() {
 			
 			@Override
 			public void run() {
 				Looper.prepare();
-				Toast.makeText(context, toast, Toast.LENGTH_SHORT).show();
+                G.shortToast(toast);
 				Looper.loop();
 			}
 		}).start();

app/src/main/java/com/sheep/gamegroup/receiver/TagAliasOperatorHelper.java

@@ -176,7 +176,7 @@ public class TagAliasOperatorHelper {
                 message.obj = tagAliasBean;
                 delaySendHandler.sendMessageDelayed(message,1000*60);
                 String logs =getRetryStr(tagAliasBean.isAliasAction, tagAliasBean.action,errorCode);
-                ExampleUtil.showToast(logs, context);
+                ExampleUtil.showToast(logs);
                 return true;
             }
         }
@@ -196,7 +196,7 @@ public class TagAliasOperatorHelper {
             delaySendHandler.sendMessageDelayed(message,1000*60);
             String str = "Failed to set mobile number due to %s. Try again after 60s.";
             str = String.format(Locale.ENGLISH,str,(errorCode == 6002 ? "timeout" : "server internal error”"));
-            ExampleUtil.showToast(str, context);
+            ExampleUtil.showToast(str);
             return true;
         }
         return false;
@@ -233,7 +233,7 @@ public class TagAliasOperatorHelper {
         //根据sequence从之前操作缓存中获取缓存记录
         TagAliasBean tagAliasBean = (TagAliasBean)setActionCache.get(sequence);
         if(tagAliasBean == null){
-            ExampleUtil.showToast("获取缓存记录失败", context);
+            ExampleUtil.showToast("获取缓存记录失败");
             return;
         }
         if(jPushMessage.getErrorCode() == 0){
@@ -241,7 +241,7 @@ public class TagAliasOperatorHelper {
             setActionCache.remove(sequence);
             String logs = getActionStr(tagAliasBean.action)+" tags success";
             LogUtil.println(TAG,logs);
-            ExampleUtil.showToast(logs, context);
+            ExampleUtil.showToast(logs);
         }else{
             String logs = "Failed to " + getActionStr(tagAliasBean.action)+" tags";
             if(jPushMessage.getErrorCode() == 6018){
@@ -251,7 +251,7 @@ public class TagAliasOperatorHelper {
             logs += ", errorCode:" + jPushMessage.getErrorCode();
             LogUtil.println(TAG, logs);
             if(!RetryActionIfNeeded(jPushMessage.getErrorCode(),tagAliasBean)) {
-                ExampleUtil.showToast(logs, context);
+                ExampleUtil.showToast(logs);
             }
         }
     }
@@ -262,7 +262,7 @@ public class TagAliasOperatorHelper {
         //根据sequence从之前操作缓存中获取缓存记录
         TagAliasBean tagAliasBean = (TagAliasBean)setActionCache.get(sequence);
         if(tagAliasBean == null){
-            ExampleUtil.showToast("获取缓存记录失败", context);
+            ExampleUtil.showToast("获取缓存记录失败");
             return;
         }
         if(jPushMessage.getErrorCode() == 0){
@@ -270,12 +270,12 @@ public class TagAliasOperatorHelper {
             setActionCache.remove(sequence);
             String logs = getActionStr(tagAliasBean.action)+" tag "+jPushMessage.getCheckTag() + " bind state success,state:"+jPushMessage.getTagCheckStateResult();
             LogUtil.println(TAG,logs);
-            ExampleUtil.showToast(logs, context);
+            ExampleUtil.showToast(logs);
         }else{
             String logs = "Failed to " + getActionStr(tagAliasBean.action)+" tags, errorCode:" + jPushMessage.getErrorCode();
             LogUtil.println(TAG, logs);
             if(!RetryActionIfNeeded(jPushMessage.getErrorCode(),tagAliasBean)) {
-                ExampleUtil.showToast(logs, context);
+                ExampleUtil.showToast(logs);
             }
         }
     }
@@ -286,7 +286,7 @@ public class TagAliasOperatorHelper {
         //根据sequence从之前操作缓存中获取缓存记录
         TagAliasBean tagAliasBean = (TagAliasBean)setActionCache.get(sequence);
         if(tagAliasBean == null){
-            ExampleUtil.showToast("获取缓存记录失败", context);
+            ExampleUtil.showToast("获取缓存记录失败");
             return;
         }
         if(jPushMessage.getErrorCode() == 0){
@@ -294,12 +294,12 @@ public class TagAliasOperatorHelper {
             setActionCache.remove(sequence);
             String logs = getActionStr(tagAliasBean.action)+" alias success";
             LogUtil.println(TAG,logs);
-            ExampleUtil.showToast(logs, context);
+            ExampleUtil.showToast(logs);
         }else{
             String logs = "Failed to " + getActionStr(tagAliasBean.action)+" alias, errorCode:" + jPushMessage.getErrorCode();
             LogUtil.println(TAG, logs);
             if(!RetryActionIfNeeded(jPushMessage.getErrorCode(),tagAliasBean)) {
-                ExampleUtil.showToast(logs, context);
+                ExampleUtil.showToast(logs);
             }
         }
     }
@@ -315,7 +315,7 @@ public class TagAliasOperatorHelper {
             String logs = "Failed to set mobile number, errorCode:" + jPushMessage.getErrorCode();
             LogUtil.println(TAG, logs);
             if(!RetrySetMObileNumberActionIfNeeded(jPushMessage.getErrorCode(),jPushMessage.getMobileNumber())){
-                ExampleUtil.showToast(logs, context);
+                ExampleUtil.showToast(logs);
             }
         }
     }

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

@@ -108,6 +108,7 @@ import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.lang.ref.WeakReference;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -1583,7 +1584,7 @@ public class ViewUtil {
     public static void setImage(ImageView imageView, final IFilter filter) {
         if (imageView != null && filter != null && filter.getConfig() != null) {
             String url = getNetImgByName("alter_original");
-            if(filter.getConfig().isEmpty()){
+            if (filter.getConfig().isEmpty()) {
                 setImage(imageView, url);
                 return;
             }
@@ -1908,20 +1909,18 @@ public class ViewUtil {
      * show ProgressDialog
      */
 
-    protected ProgressDialog mPd;
+    protected WeakReference<ProgressDialog> mPd;
 
     public void showProgress(Activity activity) {
         try {
-            if (mPd != null) {
+            if (mPd != null && mPd.get() != null) {
                 hideProgress(activity);
+            } else {
+                mPd = new WeakReference(new ProgressDialog(activity));
             }
-            mPd = new ProgressDialog(activity);
-//        View view= LayoutInflater.from(this).inflate(R.layout.dialog_layout,null);
-//        dialogShowLoading.setContentView(view);//自己定义布局
-            mPd.setMessage("数据加载中...");
-            mPd.setCancelable(true);//能否够被取消
-//        dialogShowLoading.setProgressStyle(ProgressDialog.STYLE_SPINNER);//圆环风格
-            mPd.show();
+            mPd.get().setMessage("数据加载中...");
+            mPd.get().setCancelable(true);//能否够被取消
+            mPd.get().show();
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -1929,16 +1928,14 @@ public class ViewUtil {
 
     public void showProgress(Activity activity, boolean cancel) {
         try {
-            if (mPd != null) {
+            if (mPd != null && mPd.get() != null) {
                 hideProgress(activity);
+            } else {
+                mPd = new WeakReference(new ProgressDialog(activity));
             }
-            mPd = new ProgressDialog(activity);
-//        View view= LayoutInflater.from(this).inflate(R.layout.dialog_layout,null);
-//        dialogShowLoading.setContentView(view);//自己定义布局
-            mPd.setMessage("数据加载中...");
-            mPd.setCancelable(cancel);//能否够被取消
-//        dialogShowLoading.setProgressStyle(ProgressDialog.STYLE_SPINNER);//圆环风格
-            mPd.show();
+            mPd.get().setMessage("数据加载中...");
+            mPd.get().setCancelable(cancel);//能否够被取消
+            mPd.get().show();
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -1946,15 +1943,11 @@ public class ViewUtil {
 
 
     public void hideProgress(Activity activity) {
-        activity.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                if (mPd != null) {
-                    mPd.dismiss();
-                }
+        activity.runOnUiThread(() -> {
+            if (mPd != null && mPd.get() != null) {
+                mPd.get().dismiss();
             }
         });
-
     }
 
 
@@ -2074,6 +2067,7 @@ public class ViewUtil {
     public static String getNetImgByName(String name) {
         return String.format(Locale.CHINA, "http://cdngame.kuaifazs.com/%s.png", name);
     }
+
     public static String getNetImgByNameAndSuffix(String name) {
         return String.format(Locale.CHINA, "http://cdngame.kuaifazs.com/%s", name);
     }

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

@@ -24,6 +24,7 @@ import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DownloadUtil;
 import com.sheep.gamegroup.view.adapter.DownloadMgrAdapter;
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
@@ -265,7 +266,7 @@ public class ActDownloadMgr extends BaseActivity {
                 int currentDownloadTaskSize = downloadUtil.getDownloadingTasksCount();
                 if (currentDownloadTaskSize >= MAX_DOWNLOAD_TASK_SIZE) {
                     String strPrompt = String.format(getString(R.string.toast_download_task_out_of_rang), MAX_DOWNLOAD_TASK_SIZE + "");
-                    Toast.makeText(this, strPrompt, Toast.LENGTH_SHORT).show();
+                    G.shortToast(strPrompt);
                     return;
                 }
                 changeTaskPersistenceStatus(downloadTask.getMDownloadUrl(), DownloadUtil.STATUS_ING,

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

@@ -1,21 +1,63 @@
 package com.sheep.gamegroup.view.activity;
 
+import android.content.Intent;
 import android.support.v4.app.Fragment;
+import android.util.Log;
 
 import com.sheep.gamegroup.absBase.BaseContainerActivity;
+import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.view.fragment.FgtEveryDayShare;
 import com.sheep.gamegroup.view.fragment.FgtFootprint;
+import com.sheep.jiuyan.samllsheep.utils.G;
+import com.umeng.socialize.UMShareAPI;
+import com.umeng.socialize.UMShareListener;
+import com.umeng.socialize.bean.SHARE_MEDIA;
 
 /**
  * Created by realicing on 2018/11/23.
  * realicing@sina.com
  * 小绵羊3.4.5新增--每日分享
  */
-public class ActEveryDayShare extends BaseContainerActivity {
+public class ActEveryDayShare extends BaseContainerActivity implements UMShareListener {
 
     @Override
     protected Fragment initFragment() {
         return new FgtEveryDayShare();
     }
 
+    @Override
+    public void onStart(SHARE_MEDIA share_media) {
+        LogUtil.println("UMShareListener", "start", share_media.getName());
+    }
+
+    @Override
+    public void onResult(SHARE_MEDIA share_media) {
+        LogUtil.println("UMShareListener", "result", share_media.getName());
+    }
+
+    @Override
+    public void onError(SHARE_MEDIA share_media, Throwable throwable) {
+        String msg = throwable.getMessage();
+        G.showToast(msg != null && msg.contains("没有安装应用") ? "没有安装应用" : msg);
+        LogUtil.println("UMShareListener", "error", share_media.getName() +
+                ",msg:" + throwable.getMessage());
+    }
+
+    @Override
+    public void onCancel(SHARE_MEDIA share_media) {
+        LogUtil.println("UMShareListener", "delete", share_media.getName());
+    }
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        try {
+            UMShareAPI.get(this).onActivityResult(requestCode, resultCode, data);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+
+    }
+
+
 }

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

@@ -68,7 +68,7 @@ public class ActTestExpression extends BaseActivity {
             @Override
             public void onStickerSelected(String categoryName, String stickerName, String stickerBitmapPath) {
                 String stickerPath = stickerBitmapPath;
-                Toast.makeText(getApplicationContext(), stickerPath, Toast.LENGTH_SHORT).show();
+                G.shortToast(stickerPath);
             }
         });
     }

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

@@ -5,7 +5,6 @@ import android.content.Context;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.alibaba.fastjson.JSONObject;
 import com.sheep.gamegroup.model.entity.Article;

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

@@ -99,7 +99,7 @@ public class FgtExchangeCMCC extends BaseFragment implements View.OnClickListene
     @Override
     public void onViewCreated() {
         activity = getActivity();
-        initView(mView);
+        initView(getView());
         initListener();
     }
 

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

@@ -72,13 +72,13 @@ public class FgtGameCenter extends BaseFragment {
         switch (position) {
             case 0:
                 titleBarUtils
-                        .setRightSecondBtn(mView, R.mipmap.search_black_img, new View.OnClickListener() {
+                        .setRightSecondBtn(getView(), R.mipmap.search_black_img, new View.OnClickListener() {
                             @Override
                             public void onClick(View view) {
                                 Jump2View.getInstance().goAppSearch(activity, null);
                             }
                         })
-                        .setRightImgBotton(mView, R.drawable.index_download, new View.OnClickListener() {
+                        .setRightImgBotton(getView(), R.drawable.index_download, new View.OnClickListener() {
                             @Override
                             public void onClick(View view) {
                                 TitleBarUtils.getInstance()
@@ -92,7 +92,7 @@ public class FgtGameCenter extends BaseFragment {
                 ImageButton secondImageButton = findViewById(R.id.ibtn_two_right);
 
                 secondImageButton.setVisibility(View.GONE);
-                titleBarUtils.setRightBtn(mView, "我的福利", 0, new View.OnClickListener() {
+                titleBarUtils.setRightBtn(getView(), "我的福利", 0, new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
                         // 进入我的福利界面

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

@@ -56,8 +56,6 @@ public class FgtGcGameAppDetail extends BaseRefreshLoadMoreFragment implements A
     @BindView(R.id.gc_game_app_detail_info_list)
     RecyclerView recyclerView;
 
-    private Activity activity;
-
     public static FgtGcGameAppDetail newInstance(int appId) {
         FgtGcGameAppDetail fgt = new FgtGcGameAppDetail();
         fgt.appId = appId;
@@ -75,8 +73,7 @@ public class FgtGcGameAppDetail extends BaseRefreshLoadMoreFragment implements A
 
     @Override
     public void onViewCreated() {
-        activity = getActivity();
-        ImageListHelper.initList(activity, gc_game_app_detail_pic_list, pictureList);
+        ImageListHelper.initList(getActivity(), gc_game_app_detail_pic_list, pictureList);
         recyclerView.setHasFixedSize(true);
         recyclerView.setNestedScrollingEnabled(false);
         recyclerView.setLayoutManager(new LinearLayoutManager(SheepApp.getInstance()));

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

@@ -34,7 +34,7 @@ public class FgtImage extends BaseFragment implements View.OnClickListener{
 
     @Override
     public void onViewCreated() {
-        ImageView item_iv = mView.findViewById(R.id.item_iv);
+        ImageView item_iv = getView().findViewById(R.id.item_iv);
         item_iv.setOnClickListener(this);
         Bundle bundle = getArguments();
         if(bundle != null){

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

@@ -1300,7 +1300,7 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
                 }
                 unbinder = null;
             }
-            unbinder = ButterKnife.bind(this, mView);
+            unbinder = ButterKnife.bind(this, getView());
         }
     }
 

app/src/main/java/com/sheep/jiuyan/samllsheep/base/BaseFragment.java

@@ -30,7 +30,6 @@ import io.reactivex.schedulers.Schedulers;
 
 public abstract class BaseFragment extends RxFragment {
 
-    protected View mView;
     /**
      * 是否是第一次初始化，防止重复加载些东西用
      */
@@ -83,20 +82,20 @@ public abstract class BaseFragment extends RxFragment {
      */
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        if (mView == null) {
+        View mView = getView();
+        if (getView() == null) {
             mIsFirstInit = true;
             mView = inflater.inflate(getLayoutId(), null);
         } else {
             mIsFirstInit = false;
         }
-        butterKnifeBindView();
         return mView;
     }
 
     //绑定view
     public void butterKnifeBindView() {
-        if(userButterKnife() && mView != null)
-            unbinder = ButterKnife.bind(this, mView);
+        if(userButterKnife() && getView() != null)
+            unbinder = ButterKnife.bind(this, getView());
     }
 
     public abstract int getLayoutId();
@@ -112,6 +111,7 @@ public abstract class BaseFragment extends RxFragment {
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
+        butterKnifeBindView();
         onViewCreated();
     }
 
@@ -120,7 +120,7 @@ public abstract class BaseFragment extends RxFragment {
     @Override
     public void setUserVisibleHint(boolean isVisibleToUser) {
         super.setUserVisibleHint(isVisibleToUser);
-        if (isVisibleToUser && mView != null) {
+        if (isVisibleToUser && getView() != null) {
             if (firstVisibleToUser) {
                 initViewOnVisibleToUser();
             }
@@ -145,7 +145,7 @@ public abstract class BaseFragment extends RxFragment {
      * @return
      */
     public <T extends View> T findViewById(@IdRes int id) {
-        return (T) mView.findViewById(id);
+        return (T) getView().findViewById(id);
     }
 
     /**
@@ -157,7 +157,7 @@ public abstract class BaseFragment extends RxFragment {
      * @return
      */
     public <T extends View> T findViewById(@IdRes int id, Class<T> tClass) {
-        return (T) mView.findViewById(id);
+        return (T) getView().findViewById(id);
     }
 
     @Override

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

@@ -29,7 +29,6 @@ import java.lang.reflect.Method;
  */
 public class G {
 
-    private static Toast mToast;//全局的Toast
     public static int HEIGHT = 1280;//屏幕高
     public static int WIDTH = 720;//屏幕宽
     public static float DENSITY = 2;//屏幕的Density
@@ -64,19 +63,20 @@ public class G {
      * @param duration 显示的时长
      */
     public static void showToast(String msg, int duration) {
-        if (mToast == null) {
-            mToast = Toast.makeText(SheepApp.getInstance(), msg, duration);
-            mToast.setGravity(Gravity.CENTER, 0, getRealPix(200));//居中靠下
-            if (mToast.getView() instanceof ViewGroup
-                    && ((ViewGroup) mToast.getView()).getChildAt(0) instanceof TextView) {
-                ((TextView) ((ViewGroup) mToast.getView()).getChildAt(0)).setSingleLine(false);
-            }
-        } else if (msg == null || msg.equals(""))
-            mToast.cancel();
-        else {
-            mToast.setText(msg);
-        }
-        mToast.show();
+        Toast.makeText(SheepApp.getInstance(), msg, duration).show();
+//        if (mToast == null) {
+//            mToast = Toast.makeText(SheepApp.getInstance(), msg, duration);
+//            mToast.setGravity(Gravity.CENTER, 0, getRealPix(200));//居中靠下
+//            if (mToast.getView() instanceof ViewGroup
+//                    && ((ViewGroup) mToast.getView()).getChildAt(0) instanceof TextView) {
+//                ((TextView) ((ViewGroup) mToast.getView()).getChildAt(0)).setSingleLine(false);
+//            }
+//        } else if (msg == null || msg.equals(""))
+//            mToast.cancel();
+//        else {
+//            mToast.setText(msg);
+//        }
+//        mToast.show();
     }
 
     public static void shortToast(BaseMessage msg){

app/src/main/java/com/youmi/android/offer/YmPermissionUtil.java

@@ -181,7 +181,7 @@ public class YmPermissionUtil implements PointsChangeNotify, PointsEarnNotify {
                     }
                     // 到这里就表示已经是第3+次请求，而且此时用户已经永久拒绝了，这个时候，我们引导用户到应用权限页面，让用户自己手动打开
                     else {
-                        Toast.makeText(activity, "部分权限被拒绝获取，将会会影响后续功能的使用，建议重新打开", Toast.LENGTH_LONG).show();
+                        G.shortToast("部分权限被拒绝获取，将会会影响后续功能的使用，建议重新打开");
                         openAppPermissionSetting();
                     }
                     return;
@@ -257,7 +257,7 @@ public class YmPermissionUtil implements PointsChangeNotify, PointsEarnNotify {
         // 遍历订单并且toast提示
         for (int i = 0; i < list.size(); ++i) {
             EarnPointsOrderInfo info = list.get(i);
-            Toast.makeText(activity, info.getMessage(), Toast.LENGTH_LONG).show();
+            G.shortToast(info.getMessage());
         }
     }
 

view/src/main/java/com/kfzs/android/view/CompatActivity.java

@@ -48,11 +48,11 @@ public abstract class CompatActivity extends AppCompatActivity {
     }
 
     protected void showToast(String text) {
-        Toast.makeText(this.getApplicationContext(), text, Toast.LENGTH_SHORT).show();
+        Toast.makeText(getApplicationContext(), text, Toast.LENGTH_SHORT).show();
     }
 
     protected void showToast(int id) {
-        Toast.makeText(this.getApplicationContext(), id, Toast.LENGTH_SHORT).show();
+        Toast.makeText(getApplicationContext(), id, Toast.LENGTH_SHORT).show();
     }
 
     protected void skip2Activity(Class<?> cls) {