Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复一些闪退问题

Browse Source
This commit is contained in:
chenjuntao
2020-07-13 16:01:11 +08:00
parent 9da6cbf097
commit 5b9bef79da
4 changed files with 134 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/src/main/java/com/gh/common/util/ShareUtils.java
View File

@ -24,6 +24,9 @@ import android.widget.PopupWindow;
import android.widget.RelativeLayout;
import android.widget.TextView;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.facebook.common.references.CloseableReference;
import com.facebook.datasource.DataSource;
import com.facebook.imagepipeline.datasource.BaseBitmapDataSubscriber;
@ -54,9 +57,6 @@ import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.List;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import static com.gh.common.util.LoginHelper.WEIBO_SCOPE;
/**
@ -247,17 +247,17 @@ public class ShareUtils {
e.printStackTrace();
}
contentView.setOnClickListener(v -> popupWindow.get().dismiss());
contentView.setOnClickListener(v -> safelyDismiss());
contentView.setOnKeyListener((v, keyCode, event) -> {
if (keyCode == KeyEvent.KEYCODE_BACK
&& event.getRepeatCount() == 0
&& popupWindow != null
&& popupWindow.get() != null
&& popupWindow.get().isShowing()) {
if (callBack != null) {
callBack.onCancel();
}
popupWindow.get().dismiss();
safelyDismiss();
}
return false;
});
@ -298,7 +298,7 @@ public class ShareUtils {
}
if (mShareEntrance != ShareEntrance.shareGh) {
popupWindow.get().dismiss();
safelyDismiss();
}
}
@ -338,7 +338,7 @@ public class ShareUtils {
loadBitMap(shareIcon, msg, req);
if (mShareEntrance != ShareEntrance.shareGh) {
popupWindow.get().dismiss();
safelyDismiss();
}
}
@ -454,7 +454,7 @@ public class ShareUtils {
}
if (mShareEntrance != ShareEntrance.shareGh) {
popupWindow.get().dismiss();
safelyDismiss();
}
}
@ -499,7 +499,7 @@ public class ShareUtils {
loadBitMap(shareIcon, msg, req);
if (mShareEntrance != ShareEntrance.shareGh) {
popupWindow.get().dismiss();
safelyDismiss();
}
}
@ -520,7 +520,7 @@ public class ShareUtils {
if (mShareEntrance != ShareEntrance.shareGh) {
popupWindow.get().dismiss();
safelyDismiss();
}
}
@ -562,8 +562,8 @@ public class ShareUtils {
e.printStackTrace();
}
if (mShareEntrance != ShareEntrance.shareGh) {
popupWindow.get().dismiss();
if (mShareEntrance != ShareEntrance.shareGh ) {
safelyDismiss();
}
}
@ -575,7 +575,7 @@ public class ShareUtils {
cmb.setText(copyContent);
if (mShareEntrance != ShareEntrance.shareGh) {
Utils.toast(mContext, "复制成功");
popupWindow.get().dismiss();
safelyDismiss();
} else {
Utils.toast(mContext, "复制成功，请到微信/QQ粘贴分享");
}
@ -661,7 +661,7 @@ public class ShareUtils {
break;
case 7:
if (mShareEntrance != ShareEntrance.shareGh) {
popupWindow.get().dismiss();
safelyDismiss();
} else {
shareType = "copy_link";
LogUtils.uploadShareType(shareType, shareEntrance.getName(), shareUrl, mTitle, mSummary, resourceId);
@ -689,6 +689,12 @@ public class ShareUtils {
}
}
}
private void safelyDismiss() {
if (popupWindow.get() != null) {
popupWindow.get().dismiss();
}
}
interface OnItemClickListener {
void onItemClick(int position);