Release 0.1.2

Author: weiqiangliu

.idea/workspace.xml

@@ -1,7 +1,7 @@
 {
   "name": "Sensorsdata-UniPlugin-App",
   "id": "Sensorsdata-UniPlugin-App",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "插件描述信息",
   "_dp_type": "nativeplugin",
   "_dp_nativeplugin": {
@@ -21,8 +21,8 @@
         "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>"
       ],
       "dependencies": [
-        "com.sensorsdata.analytics.android:SensorsAnalyticsSDK:6.6.3",
-        "com.sensorsdata.analytics.android:SensorsFocusSDK:0.5.5"
+        "com.sensorsdata.analytics.android:SensorsAnalyticsSDK:6.6.6",
+        "com.sensorsdata.analytics.android:SensorsFocusSDK:0.6.3"
       ],
       "parameters": {
       }

Sensorsdata-UniPlugin-App/android/SensorsdataUniPlugin.aar

@@ -34,7 +34,9 @@ dependencies {
     compileOnly 'com.alibaba:fastjson:1.1.46.android'
 
     compileOnly fileTree(dir: 'libs', include: ['uniapp-v8-release.aar'])
-    compileOnly 'com.sensorsdata.analytics.android:SensorsAnalyticsSDK:6.6.3'
+//    compileOnly fileTree(dir: 'libs', include: ['SensorsFocusSDK.aar'])
+    compileOnly 'com.sensorsdata.analytics.android:SensorsAnalyticsSDK:6.6.6'
     compileOnly 'com.alibaba:fastjson:1.1.46.android'
-    compileOnly 'com.sensorsdata.analytics.android:SensorsFocusSDK:0.5.5'
+    //SF Android SDK 点击回调优化发版后需要修改为该版本
+    compileOnly 'com.sensorsdata.analytics.android:SensorsFocusSDK:0.6.3'
 }

Sensorsdata-UniPlugin-App/package.json

@@ -26,6 +26,8 @@
 import com.sensorsdata.analytics.android.sdk.SensorsDataAPIEmptyImplementation;
 import com.sensorsdata.sf.core.SFConfigOptions;
 import com.sensorsdata.sf.core.SensorsFocusAPI;
+import com.sensorsdata.sf.core.entity.SFCampaign;
+import com.sensorsdata.sf.ui.listener.SensorsFocusCampaignListener;
 import com.sensorsdata.uniapp.property.UniPropertyManager;
 import com.sensorsdata.uniapp.sf.UniCampaignListener;
 import com.sensorsdata.uniapp.sf.UniPopupListener;
@@ -39,7 +41,7 @@
 
 public class UniSensorsAnalyticsModule extends UniDestroyableModule {
 
-    public static final String VERSION = "0.1.1";
+    public static final String VERSION = "0.1.2";
 
     private static final String MODULE_NAME = "UniSensorsAnalyticsModule";
     public static final String LOG_TAG = "SA.UniModule";
@@ -797,9 +799,18 @@ public void popupInit(JSONObject jsonConfig) {
                     sfConfigOptions.enablePopup(JSONUtils.optObject(jsonConfig, "enable_popup", Boolean.class, true));
                 } catch (Exception ignored) {
 
+                }
+                UniPopupListener popupListener = null;
+                try {
+                    Class<SensorsFocusCampaignListener> campaignClass = SensorsFocusCampaignListener.class;
+                    campaignClass.getMethod("onCampaignClick", SFCampaign.class);
+                } catch (NoSuchMethodException e) {
+                    popupListener = new UniPopupListener();
+                } catch (Exception ignored){
+
                 }
                 SensorsFocusAPI.startWithConfigOptions(mWXSDKInstance.getContext(), sfConfigOptions
-                        .setPopupListener(new UniPopupListener())
+                        .setPopupListener(popupListener)
                         .setCampaignListener(new UniCampaignListener()));
             }
             Log.i(LOG_TAG, "SensorsFocus SDK init success!");

android/SensorsdataUniPlugin/build.gradle

@@ -19,9 +19,13 @@
 
 import android.util.Log;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.sensorsdata.analytics.android.sdk.SALog;
 import com.sensorsdata.sf.core.entity.SFCampaign;
 import com.sensorsdata.sf.ui.listener.SensorsFocusCampaignListener;
+import com.sensorsdata.sf.ui.view.SensorsFocusActionModel;
+import com.sensorsdata.uniapp.util.JSONUtils;
 
 import io.dcloud.feature.uniapp.bridge.UniJSCallback;
 
@@ -68,6 +72,47 @@ public void onCampaignEnd(SFCampaign sfCampaign) {
         }
     }
 
+    @Override
+    public void onCampaignClick(SFCampaign sfCampaign) {
+        if (clickJSCallback != null) {
+            JSONObject jsonObject = new JSONObject();
+            try {
+                jsonObject.put("planId", sfCampaign.getPlanId());
+                jsonObject.put("type", sfCampaign.getType());
+                jsonObject.put("content", sfCampaign.getContent());
+                SensorsFocusActionModel actionModel = sfCampaign.getAction();
+                JSONObject actionJson = new JSONObject();
+                String type = null;
+                switch (actionModel) {
+                    case OPEN_LINK:
+                        type = "openlink";
+                        break;
+                    case COPY:
+                        type = "copy";
+                        break;
+                    case CLOSE:
+                        type = "close";
+                        break;
+                    case CUSTOMIZE:
+                        type = "customize";
+                        break;
+                }
+                actionJson.put("type", type);
+                String value = actionModel.getValue();
+                if (value == null || "null".equals(value)) {
+                    actionJson.put("value", "");
+                } else {
+                    actionJson.put("value", value);
+                }
+                actionJson.put("extra", actionModel.getExtra() == null ? new JSONObject() : JSONUtils.convertToFastJson(actionModel.getExtra()));
+                jsonObject.put("action", actionJson);
+                UniCampaignListener.clickJSCallback.invokeAndKeepAlive(jsonObject);
+            } catch (Exception e) {
+                Log.i(LOG_TAG, e.getMessage());
+            }
+        }
+    }
+
     @Override
     public void onCampaignFailed(SFCampaign sfCampaign, int errorCode, String errorMessage) {
         if (loadFailedJSCallback != null && sfCampaign != null) {

android/SensorsdataUniPlugin/src/main/java/com/sensorsdata/uniapp/UniSensorsAnalyticsModule.java

@@ -30,7 +30,7 @@
 #endif
 #import <SensorsFocus/SensorsFocus.h>
 
-static NSString *const kSAUniPluginVersion = @"app_uniapp:0.1.1";
+static NSString *const kSAUniPluginVersion = @"app_uniapp:0.1.2";
 static NSString *const kSAUniPluginVersionKey = @"$lib_plugin_version";
 
 static NSString *kSFPlanIdKey = @"planId";

android/SensorsdataUniPlugin/src/main/java/com/sensorsdata/uniapp/sf/UniCampaignListener.java

@@ -1,7 +1,7 @@
 {
   "name": "Sensorsdata-UniPlugin-App",
   "id": "Sensorsdata-UniPlugin-App",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "插件描述信息",
   "_dp_type": "nativeplugin",
   "_dp_nativeplugin": {
@@ -21,8 +21,8 @@
         "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>"
       ],
       "dependencies": [
-        "com.sensorsdata.analytics.android:SensorsAnalyticsSDK:6.6.3",
-        "com.sensorsdata.analytics.android:SensorsFocusSDK:0.5.5"
+        "com.sensorsdata.analytics.android:SensorsAnalyticsSDK:6.6.6",
+        "com.sensorsdata.analytics.android:SensorsFocusSDK:0.6.3"
       ],
       "parameters": {
       }

ios/UniSensorsAnalyticsModule/UniSensorsAnalyticsModule.m

@@ -165,6 +165,7 @@ const sensors = uni.requireNativePlugin('Sensorsdata-UniPlugin-App');
 ### enableLog
 
 方法说明：设置是否开启 log
+
 |参数 |类型 |说明 |是否必选|
 |--|--|--|--|
 |enable| boolean| 是否开启日志址 |是|
@@ -183,6 +184,7 @@ const sensors = uni.requireNativePlugin('Sensorsdata-UniPlugin-App');
 
 ### setFlushInterval
 方法说明：设置两次数据发送的最小时间间隔，单位毫秒
+
 |参数 |类型 |说明 |是否必选|
 |--|--|--|--|
 |interval| number| 是否开启日志址 |是|
@@ -202,6 +204,7 @@ const sensors = uni.requireNativePlugin('Sensorsdata-UniPlugin-App');
 
 ### setFlushBulkSize
 方法说明：设置本地缓存日志的最大条目数，最小 50 条， 默认 100 条。
+
 |参数 |类型 |说明 |是否必选|
 |--|--|--|--|
 |bulkSize| number| 是否开启日志址 |是|
@@ -220,6 +223,7 @@ const sensors = uni.requireNativePlugin('Sensorsdata-UniPlugin-App');
 
 ### setSessionIntervalTime
 方法说明：设置 App 切换到后台与下次事件的时间间隔，默认值为 30*1000 毫秒， 若 App 在后台超过设定事件，则认为当前 Session 结束，发送 $AppEnd 事件
+
 |参数 |类型 |说明 |是否必选|
 |--|--|--|--|
 |session| number| Session 时长，仅 Android 有效 |是|
@@ -236,6 +240,7 @@ const sensors = uni.requireNativePlugin('Sensorsdata-UniPlugin-App');
 ```
 ### setFlushNetworkPolicy
 方法说明：设置 flush 时网络发送策略，默认 3G、4G、WI-FI、5G 环境下都会尝试 flush
+
 |参数 |类型 |说明 |是否必选|
 |--|--|--|--|
 |networkType| number| 网络类型NONE = 0 2G = 1 3G = 1 << 1（2） 4G = 1 << 2（4） WIFI = 1 << 3（8） 5G = 1 << 4（16） ALL = 0xFF（255） |是|
@@ -388,13 +393,15 @@ const sensors = uni.requireNativePlugin('Sensorsdata-UniPlugin-App');
 ###  clearSuperProperties
 
 方法说明：删除事件公共属性
+
 ```js
  sensors.clearSuperProperties(); 
 ```
 
 ###  getSuperProperties
 
 方法说明：获取事件公共属性
+
 ```js
  var superProperties = sensors.getSuperProperties(); 
 ```
@@ -463,6 +470,7 @@ const sensors = uni.requireNativePlugin('Sensorsdata-UniPlugin-App');
 ### profilePushId
 
 方法说明：设置用户推送 ID
+
 |参数 |类型| 说明| 是否必选 |
 |--|--|--|--|
 |pushKey| string| 属性名 | 是|
@@ -476,6 +484,7 @@ const sensors = uni.requireNativePlugin('Sensorsdata-UniPlugin-App');
 ### profileUnsetPushId
 
 方法说明：删除用户设置的推送 ID
+
 |参数 |类型| 说明| 是否必选 |
 |--|--|--|--|
 |pushKey| string| 用户表属性名称| 是|
@@ -528,6 +537,7 @@ const sensors = uni.requireNativePlugin('Sensorsdata-UniPlugin-App');
 ### trackDeepLinkLaunch
 
 方法说明：Deeplink 唤起事件
+
 |参数 |类型| 说明| 是否必选 |
 |--|--|--|--|
 |deepLinkUrl| string| DeepLink 唤起链接| 是|
@@ -540,6 +550,7 @@ const sensors = uni.requireNativePlugin('Sensorsdata-UniPlugin-App');
 ### enableDeepLinkInstallSource
 
 方法说明：DeepLink 是否采集设备信息
+
 |参数 |类型| 说明| 是否必选 |
 |--|--|--|--|
 |enable| boolean| DeepLink 是否采集设备信息,默认 false| 是|
@@ -549,6 +560,7 @@ const sensors = uni.requireNativePlugin('Sensorsdata-UniPlugin-App');
 
 ### popupInit
 方法说明：弹窗 SDK 初始化，需在 initSDK 之后调用
+
 ```js
 sensors.popupInit({
     // SFO 在线服务地址，由 SF 后端提供
@@ -559,6 +571,7 @@ sensors.popupInit({
 
 ### 弹窗回调
 方法说明：处理弹窗的各回调接口,需在弹窗 SDK 初始化后调用
+
 |回调名称 | 说明|
 |--|--|
 |popupLoadSuccess| 弹窗展示成功时的回调|