CNLive Android Team / CNLiveApp · Commits

Commit 33aaf60f760bd18e24aca5c2aa478deffffcd14a

Authored by 谷俊
1 parent 425522c4

token失效添加toast提示

Inline Side-by-side
Showing 4 changed files with 10 additions and 0 deletions
app/src/main/java/com/cnlive/gundam/main/ui/fragment/ConfigFragment.java
  View file @33aaf60
@@ -17,6 +17,7 @@ import com.cnlive.gundam.user.activity.LoginActivity; @@ -17,6 +17,7 @@ import com.cnlive.gundam.user.activity.LoginActivity;
17 import com.cnlive.gundam.user.activity.UserPersonalActivity; 17 import com.cnlive.gundam.user.activity.UserPersonalActivity;
18 import com.cnlive.gundam.user.auth.UserService; 18 import com.cnlive.gundam.user.auth.UserService;
19 import com.cnlive.gundam.user.model.User; 19 import com.cnlive.gundam.user.model.User;
  20 +import com.cnlive.gundam.user.util.ToastUtil;
20 import com.cnlive.libs.user.IUserService; 21 import com.cnlive.libs.user.IUserService;
21 import com.cnlive.libs.user.UserUtil; 22 import com.cnlive.libs.user.UserUtil;
22 import com.cnlive.libs.user.model.UserData; 23 import com.cnlive.libs.user.model.UserData;
@@ -114,6 +115,7 @@ public class ConfigFragment extends Fragment implements View.OnClickListener { @@ -114,6 +115,7 @@ public class ConfigFragment extends Fragment implements View.OnClickListener {
114 userService.setActiveAccountInfo(userData.getData()); 115 userService.setActiveAccountInfo(userData.getData());
115 notifyUI(true); 116 notifyUI(true);
116 } else if (i == IUserService.ERROR_TOKEN_INVALID) { 117 } else if (i == IUserService.ERROR_TOKEN_INVALID) {
  118 + ToastUtil.show(getActivity(), getString(R.string.user_token_invalid));
117 UserService userService = UserService.getInstance(getActivity()); 119 UserService userService = UserService.getInstance(getActivity());
118 userService.clearUser(); 120 userService.clearUser();
119 notifyUI(false); 121 notifyUI(false);
app/src/main/java/com/cnlive/gundam/user/fragment/UserPersonalEditFragment.java
  View file @33aaf60
@@ -14,6 +14,7 @@ import com.cnlive.gundam.databinding.FragmentPersonalEditBinding; @@ -14,6 +14,7 @@ import com.cnlive.gundam.databinding.FragmentPersonalEditBinding;
14 import com.cnlive.gundam.user.activity.UserPersonalActivity; 14 import com.cnlive.gundam.user.activity.UserPersonalActivity;
15 import com.cnlive.gundam.user.auth.UserService; 15 import com.cnlive.gundam.user.auth.UserService;
16 import com.cnlive.gundam.user.model.User; 16 import com.cnlive.gundam.user.model.User;
  17 +import com.cnlive.gundam.user.util.ToastUtil;
17 import com.cnlive.libs.user.IUserService; 18 import com.cnlive.libs.user.IUserService;
18 import com.cnlive.libs.user.UserUtil; 19 import com.cnlive.libs.user.UserUtil;
19 import com.cnlive.libs.user.model.UserData; 20 import com.cnlive.libs.user.model.UserData;
@@ -130,6 +131,7 @@ public class UserPersonalEditFragment extends Fragment implements Callback, View @@ -130,6 +131,7 @@ public class UserPersonalEditFragment extends Fragment implements Callback, View
130 updateUserInfo(); 131 updateUserInfo();
131 Toast.makeText(getActivity(), "提交成功", Toast.LENGTH_LONG).show(); 132 Toast.makeText(getActivity(), "提交成功", Toast.LENGTH_LONG).show();
132 } else if (i == IUserService.ERROR_TOKEN_INVALID) { 133 } else if (i == IUserService.ERROR_TOKEN_INVALID) {
  134 + ToastUtil.show(getActivity(), getString(R.string.user_token_invalid));
133 UserService userService = UserService.getInstance(getActivity()); 135 UserService userService = UserService.getInstance(getActivity());
134 userService.clearUser(); 136 userService.clearUser();
135 getActivity().finish(); 137 getActivity().finish();
@@ -147,6 +149,7 @@ public class UserPersonalEditFragment extends Fragment implements Callback, View @@ -147,6 +149,7 @@ public class UserPersonalEditFragment extends Fragment implements Callback, View
147 UserService userService = UserService.getInstance(getActivity()); 149 UserService userService = UserService.getInstance(getActivity());
148 userService.setActiveAccountInfo(userData.getData()); 150 userService.setActiveAccountInfo(userData.getData());
149 } else if (i == IUserService.ERROR_TOKEN_INVALID) { 151 } else if (i == IUserService.ERROR_TOKEN_INVALID) {
  152 + ToastUtil.show(getActivity(), getString(R.string.user_token_invalid));
150 UserService userService = UserService.getInstance(getActivity()); 153 UserService userService = UserService.getInstance(getActivity());
151 userService.clearUser(); 154 userService.clearUser();
152 getActivity().finish(); 155 getActivity().finish();
app/src/main/java/com/cnlive/gundam/user/fragment/UserPersonalFragment.java
  View file @33aaf60
@@ -31,6 +31,7 @@ import com.cnlive.gundam.user.auth.UserService; @@ -31,6 +31,7 @@ import com.cnlive.gundam.user.auth.UserService;
31 import com.cnlive.gundam.user.model.PersonalData; 31 import com.cnlive.gundam.user.model.PersonalData;
32 import com.cnlive.gundam.user.model.User; 32 import com.cnlive.gundam.user.model.User;
33 import com.cnlive.gundam.user.util.PictureUtil; 33 import com.cnlive.gundam.user.util.PictureUtil;
  34 +import com.cnlive.gundam.user.util.ToastUtil;
34 import com.cnlive.gundam.user.view.SelectPopupWindow; 35 import com.cnlive.gundam.user.view.SelectPopupWindow;
35 import com.cnlive.libs.user.IUserService; 36 import com.cnlive.libs.user.IUserService;
36 import com.cnlive.libs.user.UserUtil; 37 import com.cnlive.libs.user.UserUtil;
@@ -284,6 +285,7 @@ public class UserPersonalFragment extends Fragment implements DataBindingAdapter @@ -284,6 +285,7 @@ public class UserPersonalFragment extends Fragment implements DataBindingAdapter
284 updateUserInfo(); 285 updateUserInfo();
285 Toast.makeText(getActivity(), "提交成功", Toast.LENGTH_LONG).show(); 286 Toast.makeText(getActivity(), "提交成功", Toast.LENGTH_LONG).show();
286 } else if (i == IUserService.ERROR_TOKEN_INVALID) { 287 } else if (i == IUserService.ERROR_TOKEN_INVALID) {
  288 + ToastUtil.show(getActivity(), getString(R.string.user_token_invalid));
287 UserService userService = UserService.getInstance(getActivity()); 289 UserService userService = UserService.getInstance(getActivity());
288 userService.clearUser(); 290 userService.clearUser();
289 getActivity().finish(); 291 getActivity().finish();
@@ -303,6 +305,7 @@ public class UserPersonalFragment extends Fragment implements DataBindingAdapter @@ -303,6 +305,7 @@ public class UserPersonalFragment extends Fragment implements DataBindingAdapter
303 user = userService.getActiveAccountInfo(); 305 user = userService.getActiveAccountInfo();
304 initData(); 306 initData();
305 } else if (i == IUserService.ERROR_TOKEN_INVALID) { 307 } else if (i == IUserService.ERROR_TOKEN_INVALID) {
  308 + ToastUtil.show(getActivity(), getString(R.string.user_token_invalid));
306 UserService userService = UserService.getInstance(getActivity()); 309 UserService userService = UserService.getInstance(getActivity());
307 userService.clearUser(); 310 userService.clearUser();
308 getActivity().finish(); 311 getActivity().finish();
app/src/main/res/values/strings.xml
  View file @33aaf60
@@ -40,6 +40,8 @@ @@ -40,6 +40,8 @@
40 <string name="ugc_live">直播</string> 40 <string name="ugc_live">直播</string>
41 <string name="ugc_vod">回放</string> 41 <string name="ugc_vod">回放</string>
42 42
  43 + <string name="user_token_invalid">用户的token失效，请重新登录</string>
  44 +
43 <string name="verified_url" formatted="false">https://mobile.cnlive.com/CnliveMobile/web/review/review.jsp?sid=%s&amp;plat=a&amp;appId=%s </string> 45 <string name="verified_url" formatted="false">https://mobile.cnlive.com/CnliveMobile/web/review/review.jsp?sid=%s&amp;plat=a&amp;appId=%s </string>
44 <string name="debug_verified_url" formatted="false">https://mobile.cnlive.com/CnliveMobile/web/review/review.jsp?sid=%s&amp;plat=a&amp;appId=%s&amp;type=0 </string> 46 <string name="debug_verified_url" formatted="false">https://mobile.cnlive.com/CnliveMobile/web/review/review.jsp?sid=%s&amp;plat=a&amp;appId=%s&amp;type=0 </string>
45 </resources> 47 </resources>