Commit 71c9601c6d594a0ef501b03edac86d5d079767ce

Authored by hanyayun
1 parent 63f0bddb

Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/ModulePedometer

# Conflicts:
#	config.gradle
#	moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/MyRecordView.java
#	moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunLineView.java
config.gradle
@@ -21,7 +21,7 @@ ext { @@ -21,7 +21,7 @@ ext {
21 //编译方式 21 //编译方式
22 debug : false, 22 debug : false,
23 //版本号 23 //版本号
24 - version: "0.9.5", 24 + version: "0.9.7",
25 //Lib库前缀 25 //Lib库前缀
26 packeg : "com.cnlive.module", 26 packeg : "com.cnlive.module",
27 //Lib库名称 27 //Lib库名称
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/commonInfo/CommonInfo.java
@@ -50,6 +50,19 @@ public class CommonInfo { @@ -50,6 +50,19 @@ public class CommonInfo {
50 50
51 /** 51 /**
52 * @param context 52 * @param context
  53 + * @param uid
  54 + */
  55 + public static void setUserInfo(Context context, String uid,String userName,String userIcon,String userPhone) {
  56 + MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString(KEY_USER_ID, uid);
  57 + MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString(KEY_USER_NICK_NAME, userName);
  58 + MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString(KEY_USER_NICK_ICON, userIcon);
  59 + MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString(KEY_USER_PHONE, userPhone);
  60 + }
  61 +
  62 +
  63 +
  64 + /**
  65 + * @param context
53 */ 66 */
54 public static String getUserId(Context context) { 67 public static String getUserId(Context context) {
55 return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString(KEY_USER_ID, ""); 68 return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString(KEY_USER_ID, "");