Merge pull request #23 from zoyi/fixError

fix Profile setting / userId regacy

Author: zoyi-jin

android/src/main/java/com/zoyi/channel/rn/Const.java

@@ -10,6 +10,7 @@ public class Const {
   // Boot
   public static final String KEY_PLUGIN_KEY = "pluginKey";
   public static final String KEY_MEMBER_ID = "memberId";
+  public static final String KEY_USER_ID = "userId";
   public static final String KEY_LOCALE = "locale";
   public static final String KEY_DEBUG_MODE = "debugMode";
   public static final String KEY_ENABLED_TRACK_DEFAULT_EVENT = "enabledTrackDefaultEvent";

android/src/main/java/com/zoyi/channel/rn/ParseUtils.java

@@ -196,7 +196,7 @@ public static Profile toProfile(ReadableMap profileMap) {
           .setAvatarUrl(Utils.getString(profileMap, Const.KEY_AVATAR_URL));
 
       Iterator propertyIterator = ParseUtils
-          .toHashMap(Utils.getReadableMap(profileMap, Const.KEY_PROPERTY))
+          .toHashMap(profileMap)
           .entrySet()
           .iterator();
 
@@ -216,7 +216,11 @@ public static Profile toProfile(ReadableMap profileMap) {
 
   public static ChannelPluginSettings toChannelPluginSettings(ReadableMap settingsMap) {
     String pluginKey = Utils.getString(settingsMap, Const.KEY_PLUGIN_KEY);
-    String userId = Utils.getString(settingsMap, Const.KEY_MEMBER_ID);
+    String memberId = Utils.getString(settingsMap, Const.KEY_MEMBER_ID);
+    String userId = Utils.getString(settingsMap, Const.KEY_USER_ID);
+
+    String id = memberId == null ? userId : memberId;
+
     String locale = Utils.getString(settingsMap, Const.KEY_LOCALE);
 
     boolean debugMode = Utils.getBoolean(settingsMap, Const.KEY_DEBUG_MODE, false);
@@ -227,7 +231,7 @@ public static ChannelPluginSettings toChannelPluginSettings(ReadableMap settings
     ReadableMap profile = Utils.getReadableMap(settingsMap, Const.KEY_PROFILE);
 
     return new ChannelPluginSettings(pluginKey)
-        .setMemberId(userId)
+        .setMemberId(id)
         .setLocale(CHLocale.fromString(locale))
         .setDebugMode(debugMode)
         .setEnabledTrackDefaultEvent(enabledTrackDefaultEvent)