Release 2.0.1

Author: chenru

README.md

@@ -10,7 +10,8 @@
 
 ## 基本要求
 App 元素点击事件要求 React Native 0.23 ~ 0.61.5；   
-App 页面浏览事件要求 React Navigation ^2.0 ~ ^4.0。
+App 页面浏览事件要求 React Navigation ^2.0 ~ ^4.0；
+App 可视化全埋点要求 React Native 0.46 ~ 0.60。
 
 ## 集成方式
 ### 安装 React Native 模块

RNSensorsAnalyticsModule.podspec

@@ -1,7 +1,7 @@
 
 Pod::Spec.new do |s|
   s.name         = "RNSensorsAnalyticsModule"
-  s.version      = "2.0.0"
+  s.version      = "2.0.1"
   s.summary      = "The official React Native SDK of Sensors Analytics."
   s.description  = <<-DESC
                   神策分析 RN 组件

SensorsDataRNHook.js

@@ -7,6 +7,7 @@
 import com.facebook.react.bridge.ReadableMap;
 import com.sensorsdata.analytics.RNSensorsAnalyticsModule;
 import com.sensorsdata.analytics.utils.RNViewUtils;
+import com.sensorsdata.analytics.data.ViewProperties;
 
 import com.facebook.react.uimanager.JSTouchDispatcher;
 import com.facebook.react.uimanager.events.EventDispatcher;
@@ -20,9 +21,11 @@
 import java.util.WeakHashMap;
 import java.util.HashMap;
 import org.json.JSONObject;
+import android.util.SparseArray;
 
 public class RNAgent {
     private static final WeakHashMap jsTouchDispatcherViewGroupWeakHashMap = new WeakHashMap();
+    private static SparseArray<ViewProperties> viewPropertiesArray = new SparseArray();
 
     public static void handleTouchEvent(
             JSTouchDispatcher jsTouchDispatcher, MotionEvent event, EventDispatcher eventDispatcher) {
@@ -107,4 +110,33 @@ public static void trackViewClick(int viewId){
             SALog.printStackTrace(e);
         }
     }
+
+    public static void saveViewProperties(int viewId, boolean clickable, ReadableMap viewProperties) {
+        if(clickable){
+            viewPropertiesArray.put(viewId, new ViewProperties(clickable,viewProperties));
+        }
+    }   
+
+    public static void addView(View view,int index){
+        ViewProperties properties = viewPropertiesArray.get(view.getId());
+        if(properties != null){
+            properties.setViewProperty(view);
+        }
+    }
+
+    /**
+     * 忽略 Slider、Switch Android SDK 的采集逻辑，统一通过 Recat Native 采集
+     */
+    static void ignoreView(){
+        try{
+            SensorsDataAPI.sharedInstance().ignoreViewType(Class.forName("com.facebook.react.views.switchview.ReactSwitch"));
+        }catch (Exception e){
+
+        }
+        try{
+            SensorsDataAPI.sharedInstance().ignoreViewType(Class.forName("com.facebook.react.views.slider.ReactSlider"));
+        }catch (Exception e){
+
+        }
+    }
 }

android/src/main/java/com/sensorsdata/analytics/RNAgent.java

@@ -652,13 +652,13 @@ public void trackChannelEvent(String eventName, ReadableMap properties) {
      * <p>
      * RN 中使用示例：
      * <Button title="Button" onPress={()=>
-     * RNSensorsAnalyticsModule.identify(distinctId)}>
+     * RNSensorsAnalyticsModule.identify(anonymousId)}>
      * </Button>
      */
     @ReactMethod
-    public void identify(String distinctId) {
+    public void identify(String anonymousId) {
         try {
-            SensorsDataAPI.sharedInstance().identify(distinctId);
+            SensorsDataAPI.sharedInstance().identify(anonymousId);
         } catch (Exception e) {
             e.printStackTrace();
             Log.e(LOGTAG, e.toString() + "");

android/src/main/java/com/sensorsdata/analytics/RNSensorsAnalyticsModule.java

@@ -15,7 +15,7 @@
  */
 
 public class RNSensorsAnalyticsPackage implements ReactPackage {
-    public static final String VERSION = "2.0.0";
+    public static final String VERSION = "2.0.1";
     @Override
     public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
         List<NativeModule> modules = new ArrayList<>();

android/src/main/java/com/sensorsdata/analytics/RNSensorsAnalyticsPackage.java

@@ -22,6 +22,7 @@
 import android.util.Log;
 
 import com.facebook.react.bridge.Callback;
+import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
@@ -54,10 +55,16 @@
  * ReadableArray -> Array
  */
 
-public class RNSensorsDataModule extends ReactContextBaseJavaModule {
+public class RNSensorsDataModule extends ReactContextBaseJavaModule{
 
     public RNSensorsDataModule(ReactApplicationContext reactContext) {
         super(reactContext);
+        try{
+            reactContext.addLifecycleEventListener(new SensorsDataLifecycleListener());
+        }catch(Exception e){
+
+        }
+        RNAgent.ignoreView();
     }
 
     private static final String MODULE_NAME = "RNSensorsDataModule";
@@ -107,4 +114,23 @@ public void trackViewScreen(ReadableMap params) {
             SALog.printStackTrace(e);
         }
     }
+
+    @ReactMethod
+    public void saveViewProperties(int viewId, boolean clickable, ReadableMap viewProperties) {
+        RNAgent.saveViewProperties(viewId, clickable, viewProperties);
+    }
+
+    class SensorsDataLifecycleListener implements LifecycleEventListener {
+        public void onHostResume() {
+            RNViewUtils.setScreenVisiable(true);
+        }
+
+        public void onHostPause() {
+            RNViewUtils.setScreenVisiable(false);
+        }
+
+        public void onHostDestroy() {
+
+        }
+    }
 }

android/src/main/java/com/sensorsdata/analytics/RNSensorsDataModule.java

@@ -13,12 +13,15 @@
 import android.view.ViewGroup;
 import android.view.View;
 import android.view.ViewParent;
+import org.json.JSONObject;
 
 public class RNViewUtils {
 
     private static WeakReference onTouchViewReference;
     private static String currentTitle;
     private static String currentScreenName;
+    public static boolean isScreenVisiable = false;
+    private static JSONObject properties = new JSONObject();
 
     public static void setOnTouchView(View nativeTargetView) {
         onTouchViewReference = new WeakReference(nativeTargetView);
@@ -110,6 +113,13 @@ public static NativeViewHierarchyManager getNativeViewHierarchyManager(
     public static void saveScreenAndTitle(String screenName,String title){
         currentScreenName = screenName;
         currentTitle = title;
+        try{
+            properties.put("$title", title);
+            properties.put("$screen_name", screenName);
+        }catch (Exception e){
+
+        }
+
     }
 
     public static String getTitle(){
@@ -119,4 +129,19 @@ public static String getTitle(){
     public static String getScreenName(){
         return currentScreenName;
     }
+
+    /**
+     * 供可视化调用，返回 $title，$screen_name
+     * @return json 格式
+     */
+    public static String getVisualizeProperties(){
+        if(!isScreenVisiable){
+            return "";
+        }
+        return properties.toString();
+    }
+
+    public static void setScreenVisiable(boolean isVisiable){
+        isScreenVisiable = isVisiable;
+    }
 }