diff --git a/common/src/main/java/com/yunbao/common/manager/NoviceInstructorManager.java b/common/src/main/java/com/yunbao/common/manager/NoviceInstructorManager.java index 91bee4874..8d969dc4d 100644 --- a/common/src/main/java/com/yunbao/common/manager/NoviceInstructorManager.java +++ b/common/src/main/java/com/yunbao/common/manager/NoviceInstructorManager.java @@ -33,12 +33,18 @@ public class NoviceInstructorManager extends BaseCacheManager { private Handler netHandler = new Handler(); //是否弹出指导员引导弹窗 private String homeZdyPop = ""; + private boolean isFrist = true; public NoviceInstructorManager(Context context) { super(context); this.context = context; } + public NoviceInstructorManager setFrist(boolean frist) { + isFrist = frist; + return this; + } + /** * 呼出指导员引导弹窗 * @@ -54,7 +60,7 @@ public class NoviceInstructorManager extends BaseCacheManager { * 检查需不需要弹出新人面向指导员弹窗 */ public void checktHomeZdyPop() { - if (!TextUtils.isEmpty(homeZdyPop) && TextUtils.equals(homeZdyPop, "1")) { + if (!TextUtils.isEmpty(homeZdyPop) && TextUtils.equals(homeZdyPop, "1") && !isFrist) { netHandler.post(instructorOperationOpenRunnable); } } diff --git a/main/src/main/java/com/yunbao/main/activity/EntryActivity.java b/main/src/main/java/com/yunbao/main/activity/EntryActivity.java index 5242e0b06..e3f3ccec1 100644 --- a/main/src/main/java/com/yunbao/main/activity/EntryActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/EntryActivity.java @@ -529,10 +529,10 @@ public class EntryActivity extends AppCompatActivity { private void updateUI() { boolean enableButtons = AccessToken.getCurrentAccessToken() != null; - ToastUtil.show(enableButtons+""); + ToastUtil.show(enableButtons + ""); Profile profile = Profile.getCurrentProfile(); if (enableButtons && profile != null) { - ToastUtil.show(profile.getId()+""); + ToastUtil.show(profile.getId() + ""); LoginData data = new LoginData(); // data.setAvatar(profile.getProfilePictureUri(150, 150).toString()); data.setNickName(profile.getName()); @@ -740,6 +740,7 @@ public class EntryActivity extends AppCompatActivity { if (obj.containsKey("home_zdy_pop")) { NoviceInstructorManager.get(activity).setHomeZdyPop(obj.getString("home_zdy_pop")); } + } else { MainActivity.forward(EntryActivity.this, false); } @@ -771,7 +772,7 @@ public class EntryActivity extends AppCompatActivity { return; } LiveAudienceActivity.forward(EntryActivity.this, liveBean, liveType, liveTypeVal, "", 0, liveSdk); - + NoviceInstructorManager.get(activity).setFrist(false); } }); } diff --git a/main/src/main/java/com/yunbao/main/activity/LoginActivity.java b/main/src/main/java/com/yunbao/main/activity/LoginActivity.java index daf4d1465..1eec1c07e 100644 --- a/main/src/main/java/com/yunbao/main/activity/LoginActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/LoginActivity.java @@ -262,7 +262,7 @@ public class LoginActivity extends AbsActivity { return; } LiveAudienceActivity.forward(LoginActivity.this, liveBean, liveType, liveTypeVal, "", 0, liveSdk); - + NoviceInstructorManager.get(activity).setFrist(false); } }); } diff --git a/main/src/main/java/com/yunbao/main/activity/RegisterActivity.java b/main/src/main/java/com/yunbao/main/activity/RegisterActivity.java index d9f745e2e..048ab034b 100644 --- a/main/src/main/java/com/yunbao/main/activity/RegisterActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/RegisterActivity.java @@ -549,7 +549,7 @@ public class RegisterActivity extends AbsActivity { return; } LiveAudienceActivity.forward(RegisterActivity.this, liveBean, liveType, liveTypeVal, "", 0, liveSdk); - + NoviceInstructorManager.get(activity).setFrist(false); } }); } diff --git a/main/src/main/java/com/yunbao/main/dialog/OneLoginDialog.java b/main/src/main/java/com/yunbao/main/dialog/OneLoginDialog.java index dc737a7d9..9f4e98064 100644 --- a/main/src/main/java/com/yunbao/main/dialog/OneLoginDialog.java +++ b/main/src/main/java/com/yunbao/main/dialog/OneLoginDialog.java @@ -168,7 +168,7 @@ public class OneLoginDialog extends AbsDialogFragment { return; } LiveAudienceActivity.forward(mContext, liveBean, liveType, liveTypeVal, "", 0, liveSdk); - + NoviceInstructorManager.get(mContext).setFrist(false); } }); } diff --git a/main/src/main/java/com/yunbao/main/manager/imrongcloud/ConversationIMListManager.java b/main/src/main/java/com/yunbao/main/manager/imrongcloud/ConversationIMListManager.java index 74f8fcc75..b44fd7b00 100644 --- a/main/src/main/java/com/yunbao/main/manager/imrongcloud/ConversationIMListManager.java +++ b/main/src/main/java/com/yunbao/main/manager/imrongcloud/ConversationIMListManager.java @@ -185,9 +185,9 @@ public class ConversationIMListManager { */ @Override public boolean onConversationLongClick(Context context, View view, BaseUiConversation baseUiConversation) { - new ConversationPopuwWindow((Activity) context) - .setIsAdmin(baseUiConversation.mCore.getTargetId()) - .show(view); +// new ConversationPopuwWindow((Activity) context) +// .setIsAdmin(baseUiConversation.mCore.getTargetId()) +// .show(view); return true; }