|
|
@@ -247,20 +247,17 @@ public class Jump2View {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 进入主页前需要检查协议或者用户标签
|
|
|
+ * 正常进入
|
|
|
+ * 进入主页前需要检查是否需要绑定手机号
|
|
|
* @param activity
|
|
|
*/
|
|
|
public void checkPhoneOrGoHomePage(final Activity activity) {
|
|
|
CommonUtil.getInstance().updateUserInfo(new Action1<UserEntity>() {
|
|
|
@Override
|
|
|
public void call(UserEntity userEntity) {
|
|
|
- if(userEntity != null && !TextUtils.isEmpty(userEntity.getShareLink("other"))) {
|
|
|
-// GlideImageLoader.downLoadImage(userEntity.getShare_link().hashCode(), AppUtil.getQRLink(userEntity.getShare_link(), 800), null);
|
|
|
-// //PersionInfoAct.java与AskGetMoneyAct.java中分享二维码时的图片预下载
|
|
|
- Glide.with(activity)
|
|
|
- .load(AppUtil.getQRLink(userEntity.getShareLink("other"), 800))
|
|
|
- .apply(new RequestOptions().diskCacheStrategy(DiskCacheStrategy.RESOURCE))
|
|
|
- .preload(800, 800);
|
|
|
+ if(userEntity != null && !TextUtils.isEmpty(userEntity.getShare_link())) {
|
|
|
+ //PersionInfoAct.java与AskGetMoneyAct.java中分享二维码时的图片预下载
|
|
|
+ GlideImageLoader.downloadAndSetImage(null, AppUtil.getQRLink(userEntity.getShareLink(DialogShare.FACE_TO_FACE), 800), 800);
|
|
|
}
|
|
|
|
|
|
if(userEntity != null && userEntity.canBindMobile()
|
|
|
@@ -276,48 +273,34 @@ public class Jump2View {
|
|
|
});
|
|
|
}
|
|
|
/**
|
|
|
+ * 通过引导页面或者登录成功后进入
|
|
|
* 进入主页前需要检查是否需要绑定手机号、用户标签是否设置
|
|
|
* @param activity
|
|
|
*/
|
|
|
private void checkOrGoHomePage(final Activity activity) {
|
|
|
- //是否展示协议
|
|
|
-// tryShowAgreement(activity, new Action1<String>() {
|
|
|
-// @Override
|
|
|
-// public void call(String msg) {
|
|
|
-// if(msg == null || TextUtils.equals(msg, "404")) {
|
|
|
- CommonUtil.getInstance().updateUserInfo(new Action1<UserEntity>() {
|
|
|
- @Override
|
|
|
- public void call(UserEntity userEntity) {
|
|
|
- if(userEntity != null && !TextUtils.isEmpty(userEntity.getShareLink("other"))) {
|
|
|
-// GlideImageLoader.downLoadImage(userEntity.getShare_link().hashCode(), AppUtil.getQRLink(userEntity.getShare_link(), 800), null);
|
|
|
-// //PersionInfoAct.java与AskGetMoneyAct.java中分享二维码时的图片预下载
|
|
|
- Glide.with(activity)
|
|
|
- .load(AppUtil.getQRLink(userEntity.getShareLink("other"), 800))
|
|
|
- .apply(new RequestOptions().diskCacheStrategy(DiskCacheStrategy.RESOURCE))
|
|
|
- .preload(800, 800);
|
|
|
- }
|
|
|
+ CommonUtil.getInstance().updateUserInfo(new Action1<UserEntity>() {
|
|
|
+ @Override
|
|
|
+ public void call(UserEntity userEntity) {
|
|
|
+ if(userEntity != null && !TextUtils.isEmpty(userEntity.getShare_link())) {
|
|
|
+ //PersionInfoAct.java与AskGetMoneyAct.java中分享二维码时的图片预下载
|
|
|
+ GlideImageLoader.downloadAndSetImage(null, AppUtil.getQRLink(userEntity.getShareLink(DialogShare.FACE_TO_FACE), 800), 800);
|
|
|
+ }
|
|
|
|
|
|
- if(userEntity != null && userEntity.canBindMobile()
|
|
|
- && !BuildConfig.DEBUG
|
|
|
- ){//老用户没有绑定手机号
|
|
|
- Jump2View.getInstance().goBindPhone(activity, 1);
|
|
|
- return;
|
|
|
- }
|
|
|
- checkLabel(activity, new Action1<BaseMessage>() {
|
|
|
- @Override
|
|
|
- public void call(BaseMessage baseMessage) {
|
|
|
- goHomePageView(activity, null);
|
|
|
- activity.finish();
|
|
|
- }
|
|
|
- });
|
|
|
- }
|
|
|
- });
|
|
|
-// }else {
|
|
|
-// G.showToast(msg);
|
|
|
-// SheepApp.getInstance().quit();
|
|
|
-// }
|
|
|
-// }
|
|
|
-// });
|
|
|
+ if(userEntity != null && userEntity.canBindMobile()
|
|
|
+// && !BuildConfig.DEBUG
|
|
|
+ ){//老用户没有绑定手机号
|
|
|
+ Jump2View.getInstance().goBindPhone(activity, 1);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ checkLabel(activity, new Action1<BaseMessage>() {
|
|
|
+ @Override
|
|
|
+ public void call(BaseMessage baseMessage) {
|
|
|
+ goHomePageView(activity, null);
|
|
|
+ activity.finish();
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+ });
|
|
|
}
|
|
|
|
|
|
|