Merge pull request #33 from jpush/dev

Dev

Author: JoshLipan

android/.idea/gradle.xml

@@ -1,22 +1,16 @@
-buildscript {
-    repositories {
-        jcenter()
-    }
+apply plugin: 'com.android.library'
 
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.1'
-    }
+def safeExtGet(prop, fallback) {
+    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
 
-apply plugin: 'com.android.library'
-
 android {
-    compileSdkVersion 23
-    buildToolsVersion "25.0.2"
+    compileSdkVersion safeExtGet('compileSdkVersion', 27)
+    buildToolsVersion safeExtGet('buildToolsVersion', '26.0.2')
 
     defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 22
+        minSdkVersion safeExtGet('minSdkVersion', 16)
+        targetSdkVersion safeExtGet('targetSdkVersion', 27)
         versionCode 1
         versionName "1.0"
     }
@@ -34,6 +28,6 @@ repositories {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.facebook.react:react-native:+'
+    api fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.facebook.react:react-native:+'
 }

android/.idea/misc.xml

@@ -1,11 +1,16 @@
 package cn.jpush.reactnativejanalytics;
 
+import android.util.Log;
+
+import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableMapKeySetIterator;
 
+import cn.jiguang.analytics.android.api.Account;
+import cn.jiguang.analytics.android.api.AccountCallback;
 import cn.jiguang.analytics.android.api.BrowseEvent;
 import cn.jiguang.analytics.android.api.CalculateEvent;
 import cn.jiguang.analytics.android.api.CountEvent;
@@ -130,4 +135,67 @@ public void stopLogPageView(ReadableMap map) {
         if (getCurrentActivity() != null)
             JAnalyticsInterface.onPageEnd(getCurrentActivity(), name);
     }
+
+    @ReactMethod
+    public void setChannel(ReadableMap map) {
+        String channel = map.getString("channel");
+        JAnalyticsInterface.setChannel(getCurrentActivity(), channel);
+    }
+
+    @ReactMethod
+    public void setAnalyticsReportPeriod(ReadableMap map) {
+        int period = map.getInt("period");
+        JAnalyticsInterface.setAnalyticsReportPeriod(getCurrentActivity(), period);
+    }
+
+    /**
+     * 设置账户维度模型
+     */
+    @ReactMethod
+    public void identifyAccount(ReadableMap map, final Callback success, final Callback fail) {
+        Logger.i(JANALYTICS_NAME, "Stopping page statistics");
+        String accountID = map.getString("accountID");
+        long creationTime = map.getInt("creationTime");
+        String name = map.getString("name");
+        int sex = map.getInt("sex");
+        int paid = map.getInt("paid");
+        String birthdate = map.getString("birthdate");
+        String phone = map.getString("phone");
+        String email = map.getString("email");
+        String weiboID = map.getString("weiboID");
+        String wechatID = map.getString("wechatID");
+        String qqID = map.getString("qqID");
+        ReadableMap extras = map.getMap("extras");
+
+        Account account = new Account(accountID);
+        account.setCreationTime(creationTime); // 账户创建的时间戳
+        account.setName(name);
+        account.setSex(sex);
+        account.setPaid(paid);
+        account.setBirthdate(birthdate); // "19880920"是yyyyMMdd格式的字符串
+        account.setPhone(phone);
+        account.setEmail(email);
+        account.setWeiboId(weiboID);
+        account.setWechatId(wechatID);
+        account.setQqId(qqID);
+        if (extras != null) {
+            ReadableMapKeySetIterator iterator = extras.keySetIterator();
+            while (iterator.hasNextKey()) {
+                String key = (String) iterator.nextKey();
+                String value = extras.getString(key);
+                account.setExtraAttr(key, value); // key如果为空，或者以极光内部namespace(符号$)开头，会设置失败并打印日志
+            }
+        }
+        JAnalyticsInterface.identifyAccount(getCurrentActivity(), account, new AccountCallback() {
+            @Override
+            public void callback(int code, String msg) {
+                if (code == 0) {
+                    success.invoke();
+                } else {
+                    Log.i(JAnalyticsModule.class.getSimpleName(), "Identify account error code " + code + " :" + msg);
+                    fail.invoke(msg);
+                }
+            }
+        });
+    }
 }

android/.idea/modules.xml

@@ -28,8 +28,8 @@ android {
 }
 ...
 dependencies {
-  compile project(':janalytics-react-native')
-  compile project(':jcore-react-native')
+  implementation project(':janalytics-react-native')
+  implementation project(':jcore-react-native')
 }
 ```