Merge branch 'dev_im' of http://113.105.137.151:22280/lify/rvapp into master-video

RvWrapper/src/main/java/com/ruiwenliu/wrapper/SPConstance.java

@@ -3,6 +3,7 @@ package com.ruiwenliu.wrapper;
 public final class SPConstance {
     public static final String USER_JSON ="user_json";
     public static final String USER_JSON_NAME ="username";
+    public static final String USER_JSON_NICKANAME= "nickname";
     public static final String USER_JSON_HEADERURL ="headerurl";
     public static final String USER_JSON_USERID ="userid";
     public static final String USER_JSON_TOKEN ="token";
@@ -12,4 +13,5 @@ public final class SPConstance {
     public static final String USER_JSON_USERINFO ="userinfo";
     public static final String USER_JSON_CODE = "userCode";
     public static final String USER_JSON_TOKE_TIME = "tokentime";
+
 }

module_home/src/main/java/com/rv/home/rv/module/basic/BaseLoginActivity.java

@@ -140,9 +140,10 @@ public abstract class BaseLoginActivity<P extends MvpPresenter> extends BaseStat
         Cookie.save(getApplicationContext(), SPConstance.USER_JSON_HEADERURL, registeredBean.getData().getHeaderurl());
         Cookie.save(getApplicationContext(), SPConstance.USER_JSON_TOKEN, registeredBean.getToken());
         Cookie.save(getApplicationContext(), SPConstance.USER_JSON_TOKE_TIME, DateUtils.getCurDate());
+        Cookie.save(getApplicationContext(), SPConstance.USER_JSON_NICKANAME, registeredBean.getData().getNickname());
 
         Cookie.save(getApplicationContext(), SPConstance.USER_JSON_IMUSERID, registeredBean.getData().getImUserId());
-        Cookie.save(getApplicationContext(),SPConstance.USER_JSON_IMTOKEN,registeredBean.getData().getImToken());
+        Cookie.save(getApplicationContext(), SPConstance.USER_JSON_IMTOKEN, registeredBean.getData().getImToken());
 
         UtilsManager.getInstance(OkGoUtil.application).setSharePreferencesSave(SPConstance.USER_JSON).putString(SPConstance.USER_JSON_CODE, registeredBean.getData().getCode()).commit();
         UtilsManager.getInstance(OkGoUtil.application).setSharePreferencesSave(SPConstance.USER_JSON).putString(SPConstance.USER_JSON_NAME, registeredBean.getData().getUsername()).commit();

plugin_share/src/main/java/com/rv/share/view/RvWebView.java

@@ -127,8 +127,8 @@ public class RvWebView extends WebView {
         @JavascriptInterface
         public String getTokenOrLogin() {
             if (TextUtils.isEmpty(OkGoUtil.getToken())) {
-                Intent intent = LoginRvActivity.getIntent(getContext(),1) ;
-                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK) ;
+                Intent intent = LoginRvActivity.getIntent(getContext(), 1);
+                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 getContext().startActivity(intent);
                 return "";
             }
@@ -141,13 +141,14 @@ public class RvWebView extends WebView {
             Intent intent = new Intent();
             intent.setComponent(name);
             intent.putExtra("to", "mine_coupons");
-            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK) ;
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             getContext().startActivity(intent);
         }
 
         @JavascriptInterface
         public String getUserName() {
-            String name = Cookie.getStringValue(getContext(), SPConstance.USER_JSON_NAME, "");
+            String name = !TextUtils.isEmpty(Cookie.getStringValue(getContext(), SPConstance.USER_JSON_NICKANAME, "")) ? Cookie.getStringValue(getContext(), SPConstance.USER_JSON_NICKANAME, "")
+                    : Cookie.getStringValue(getContext(), SPConstance.USER_JSON_NAME, "");
             return name;
         }
 
@@ -197,7 +198,7 @@ public class RvWebView extends WebView {
             Intent intent = new Intent();
             intent.setComponent(name);
             intent.putExtra("to", "mine_wallet");
-            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK) ;
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             getContext().startActivity(intent);
         }