Merge branch 'dev-activitycb' into 'dev'

[activitycallback+privacy]添加示例

See merge request !7

pages/SyntaxCase/utsAndroid.uvue

 <template>
   <!-- #ifdef APP-ANDROID -->
-  <!-- #ifdef APP -->
   <scroll-view style="flex: 1">
-    <!-- #endif -->
     <view>
       <view class="uni-padding-wrap uni-common-mt">
         <view class="uni-hello-text"> 逐一点击执行，观察测试反馈 </view>
@@ -19,7 +17,6 @@
       <button @click="pathTestClick">路径转换测试</button>
       <button @click="privacyStateClick">隐私协议状态测试</button>
       <button @click="privacyStateCallBackClick">隐私协议回调测试</button>
-      <button @click="privacyStateCallBackClick">隐私协议回调测试</button>
       <view class="uni-padding-wrap uni-common-mt">
         <view class="uni-hello-text">
           1. 当前页面已通过initAppLifecycle函数注册了生命周期监听。
@@ -44,299 +41,343 @@
       </view>
       <button @tap="getDeviceInfoClick">获取设备基础信息</button>
       <button @tap="getFileProviderUriClick">使用外部应用访问私有文件</button>
-      <!-- #ifdef APP-ANDROID -->
-        <button @tap="activityCallback">注册activity 回调方法</button>
-        <view class="uni-padding-wrap uni-common-mt">
-          <view class="uni-hello-text">
-            点击注册activity 回调方法后，可以手动切换其他APP再返回，可在控制台和界面观察事件日志
-          </view>
+
+      <button @tap="activityCallback">注册activity 回调方法</button>
+      <view class="uni-padding-wrap uni-common-mt">
+        <view class="uni-hello-text">
+          点击注册activity 回调方法后，可以手动切换其他APP再返回，可在控制台和界面观察事件日志
         </view>
-        <view class="uni-padding-wrap uni-common-mt">
-          <view class="text-box" scroll-y="true">
-            <text>{{ cbText }}</text>
-          </view>
+      </view>
+      <view class="uni-padding-wrap uni-common-mt">
+        <view class="text-box" scroll-y="true">
+          <text>{{ cbText }}</text>
         </view>
-        <button @tap="unRegActivityCallback">取消注册activity 回调方法</button>
-
-      <!-- #endif -->
-     
+      </view>
+      <button @tap="unRegActivityCallback">取消注册activity 回调方法</button>
     </view>
-    <!-- #ifdef APP -->
   </scroll-view>
   <!-- #endif -->
-  <!-- #endif -->
 </template>
 
 <script>
-  <!-- #ifdef APP-ANDROID -->
-import {
-  getAppContextTest,
-  getUniActivityTest,
-  getJavaClassTest,
-  getAppTempPathTest,
-  typeofClickTest,
-  gotoSystemPermissionActivityTest,
-  arrayPermissionFlowTest,
-  singlePermissionFlowTest,
-  dispatchAsyncTest,
-  convert2AbsFullPathTest,
-  unRegLifecycle,
-  initAppLifecycle,
-  gotoCameraTake,
-  getDeviceInfoTest,
-  privacyStateTest,
-  privacyStateCallBackTest
-} from '@/uni_modules/uts-platform-api'
-// #ifdef APP-ANDROID
-import {
+  import {
+    getAppContextTest,
+    getUniActivityTest,
+    getJavaClassTest,
+    getAppTempPathTest,
+    typeofClickTest,
+    gotoSystemPermissionActivityTest,
+    arrayPermissionFlowTest,
+    singlePermissionFlowTest,
+    dispatchAsyncTest,
+    convert2AbsFullPathTest,
+    unRegLifecycle,
+    initAppLifecycle,
+    gotoCameraTake,
+    getDeviceInfoTest,
+    privacyStateTest
+  } from '@/uni_modules/uts-platform-api'
+  // #ifdef APP-ANDROID
+  import {
     UTSAcvitiyLifeCycleCallback,
     UTSAcvitiyKeyEventCallback,
     UTSActivityWindowCallback,
     UTSActivityCallback,
     UTSActivityComponentCallback,
-    onCallbackChange,
-    registerCallbacks,
-    unRegisterCallbacks
-} from '@/uni_modules/uts-syntaxcase'
-// #endif
+    onCallbackChange
+  } from '@/uni_modules/uts-syntaxcase'
+  // #endif
+
+
+  import File from 'java.io.File';
+  import Intent from 'android.content.Intent';
 
+  /**
+   * 测试在页面生命周期之外，使用api
+   */
+  export default {
+    data() {
+      return {
+        text: '',
+        cbText: '',
+        selectImage: '',
+        callback: [] as Any[]
+      }
+    },
+    unmounted() {
+      // #ifdef APP-ANDROID
+      this.unRegActivityCallback()
+      // #endif
 
-import File from 'java.io.File';
-import Intent from 'android.content.Intent';
+    },
+    onLoad: function () {
+      let that = this
+      initAppLifecycle(function (eventLog) {
+        // 展示捕捉到的声明周期日志
+        let nextLine = that.text + eventLog
+        that.text = nextLine
+        let nextLineFlag = that.text + '\n'
+        that.text = nextLineFlag
+      })
+    },
+    methods: {
+      privacyStateClick() {
+        privacyStateTest(function (ret, desc) {
+          if (ret) {
+            uni.showToast({
+              title: '测试通过',
+            })
+          } else {
+            uni.showToast({
+              icon: 'none',
+              title: '失败：' + desc,
+            })
+          }
+        })
+      },
+      privacyStateCallBackClick() {
+ 
+        let isAgree : boolean = true
+        
+        const cb = (ret : PrivacyOption) => {
+          console.log('privacyStateCallBackTest->' + ret.isAgree)
+          if (ret.isAgree==isAgree) {
+            uni.showToast({
+              title: '测试通过'
+            })
+          } else {
+            uni.showToast({
+              icon: 'none',
+              title: '失败'
+            })
+          }
+        }
+        // 先重置用户同意状态
+        UTSAndroid.onPrivacyAgreeChange(cb)
+        UTSAndroid.setPrivacyAgree(isAgree)
+        UTSAndroid.offPrivacyAgreeChange(cb)
+        setTimeout(function () {
+          console.log('privacyStateCallBackTest->false' )
+          
+          UTSAndroid.setPrivacyAgree(false)
+        }, 5000);
+      },
+      getDeviceInfoClick() {
+        this.text = getDeviceInfoTest()
+      },
+      testGoOtherActivity() {
+        var that = this
+        let ret = gotoCameraTake(function (file) {
+          // 展示捕捉到的声明周期日志
+          console.log(file)
+          that.selectImage = 'file://' + file
+        })
 
-/**
- * 测试在页面生命周期之外，使用api
- */
-export default {
-  data() {
-    return {
-      text: '',
-      cbText:'',
-      selectImage: '',
-      callbackIds: [] as string[]
-    }
-  },
-  unmounted() {
-    // #ifdef APP-ANDROID
-    this.unRegActivityCallback()
-    // #endif
-    
-  },
-  onLoad: function () {
-    let that = this
-    initAppLifecycle(function (eventLog) {
-      // 展示捕捉到的声明周期日志
-      let nextLine = that.text + eventLog
-      that.text = nextLine
-      let nextLineFlag = that.text + '\n'
-      that.text = nextLineFlag
-    })
-  },
-  methods: {
-    privacyStateClick() {
-      privacyStateTest(function (ret, desc) {
-        if (ret) {
+        if (!ret) {
           uni.showToast({
-            title: '测试通过',
+            icon: 'none',
+            title: '测试失败',
+          })
+        }
+      },
+      testUnRegLifecycle() {
+        // 取消注册生命周期
+        unRegLifecycle()
+      },
+      getJavaClassClick() {
+        if (getJavaClassTest()) {
+          uni.showToast({
+            title: '测试通过'
           })
         } else {
           uni.showToast({
-            icon: 'none',
-            title: '失败：' + desc,
+            icon: 'error',
+            title: '测试失败'
           })
         }
-      })
-    },
-    privacyStateCallBackClick() {
-      privacyStateCallBackTest(function(ret, desc) {
-        if (ret) {
+      },
+      getAppContextClick() {
+        if (getAppContextTest()) {
           uni.showToast({
-            title: '测试通过'
+            title: '测试通过',
           })
         } else {
           uni.showToast({
-            icon: 'none',
-            title: '失败：' + desc
+            icon: 'error',
+            title: '测试失败',
           })
         }
-      })
-    },
-    getDeviceInfoClick() {
-      this.text = getDeviceInfoTest()
-    },
-    testGoOtherActivity() {
-      var that = this
-      let ret = gotoCameraTake(function (file) {
-        // 展示捕捉到的声明周期日志
-        console.log(file)
-        that.selectImage = 'file://' + file
-      })
+      },
 
-      if (!ret) {
-        uni.showToast({
-          icon: 'none',
-          title: '测试失败',
-        })
-      }
-    },
-    testUnRegLifecycle() {
-      // 取消注册生命周期
-      unRegLifecycle()
-    },
-    getJavaClassClick() {
-      if (getJavaClassTest()) {
-      	uni.showToast({
-      		title: '测试通过'
-      	})
-      } else {
-      	uni.showToast({
-      		icon: 'error',
-      		title: '测试失败'
-      	})
-      }
-    },
-    getAppContextClick() {
-      if (getAppContextTest()) {
-        uni.showToast({
-          title: '测试通过',
-        })
-      } else {
-        uni.showToast({
-          icon: 'error',
-          title: '测试失败',
-        })
-      }
-    },
-
-    getUniActivityClick() {
-      if (getUniActivityTest()) {
-        uni.showToast({
-          title: '测试通过',
-        })
-      } else {
-        uni.showToast({
-          icon: 'error',
-          title: '测试失败',
-        })
-      }
-    },
-    pathTestClick() {
-      if (convert2AbsFullPathTest()) {
-        uni.showToast({
-          title: '测试通过',
-        })
-      } else {
-        uni.showToast({
-          icon: 'error',
-          title: '测试失败',
-        })
-      }
-    },
-    getFileProviderUriClick() {
-      let file = new File(UTSAndroid.getResourcePath("static/logo.png"))
-      const uri = UTSAndroid.getFileProviderUri(file)
-      console.log("uri",uri.toString())
-      const intent = new Intent(Intent.ACTION_VIEW, uri)
-      intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) // 添加权限标志 
-      const context = UTSAndroid.getUniActivity()!;
-      context.startActivity(intent);
-    },
-    getAppTempPathClick() {
-      if (getAppTempPathTest()) {
-        uni.showToast({
-          title: '测试通过',
-        })
-      } else {
-        uni.showToast({
-          icon: 'error',
-          title: '测试失败',
-        })
-      }
-    },
-    dispatchAsyncClick() {
-      dispatchAsyncTest(function (ret, desc) {
-        if (ret) {
+      getUniActivityClick() {
+        if (getUniActivityTest()) {
           uni.showToast({
             title: '测试通过',
           })
         } else {
           uni.showToast({
-            icon: 'none',
-            title: '失败：' + desc,
+            icon: 'error',
+            title: '测试失败',
           })
         }
-      })
-    },
-    typeofClick() {
-      if (typeofClickTest()) {
-        uni.showToast({
-          title: '测试通过',
-        })
-      } else {
-        uni.showToast({
-          icon: 'error',
-          title: '测试失败',
-        })
-      }
-    },
-
-    gotoSystemPermissionActivityClick() {
-      gotoSystemPermissionActivityTest()
-    },
-    arrayPermissionFlowClick() {
-      arrayPermissionFlowTest(function (ret, desc) {
-        if (ret) {
+      },
+      pathTestClick() {
+        if (convert2AbsFullPathTest()) {
           uni.showToast({
-            icon: 'none',
             title: '测试通过',
           })
         } else {
           uni.showToast({
-            icon: 'none',
-            title: '失败：' + desc,
+            icon: 'error',
+            title: '测试失败',
           })
         }
-      })
-    },
-    singlePermissionFlowClick() {
-      singlePermissionFlowTest(function (ret, desc) {
-        if (ret) {
+      },
+      getFileProviderUriClick() {
+        let file = new File(UTSAndroid.getResourcePath("static/logo.png"))
+        const uri = UTSAndroid.getFileProviderUri(file)
+        console.log("uri", uri.toString())
+        const intent = new Intent(Intent.ACTION_VIEW, uri)
+        intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) // 添加权限标志 
+        const context = UTSAndroid.getUniActivity()!;
+        context.startActivity(intent);
+      },
+      getAppTempPathClick() {
+        if (getAppTempPathTest()) {
           uni.showToast({
-            icon: 'none',
             title: '测试通过',
           })
         } else {
           uni.showToast({
-            icon: 'none',
-            title: '失败：' + desc,
+            icon: 'error',
+            title: '测试失败',
           })
         }
-      })
-    },
-    // #ifdef APP-ANDROID
-    activityCallback(){
-      var that = this
-      onCallbackChange(function (eventLog:string) {
-        // 展示捕捉到的声明周期日志
-        let nextLine = that.cbText + eventLog
-        that.cbText = nextLine
-        let nextLineFlag = that.cbText + '\n'
-        that.cbText = nextLineFlag
-      })
-      registerCallbacks()
-    },
-    unRegActivityCallback(){
-      unRegisterCallbacks()
-    }
-    // #endif
+      },
+      dispatchAsyncClick() {
+        dispatchAsyncTest(function (ret, desc) {
+          if (ret) {
+            uni.showToast({
+              title: '测试通过',
+            })
+          } else {
+            uni.showToast({
+              icon: 'none',
+              title: '失败：' + desc,
+            })
+          }
+        })
+      },
+      typeofClick() {
+        if (typeofClickTest()) {
+          uni.showToast({
+            title: '测试通过',
+          })
+        } else {
+          uni.showToast({
+            icon: 'error',
+            title: '测试失败',
+          })
+        }
+      },
+
+      gotoSystemPermissionActivityClick() {
+        gotoSystemPermissionActivityTest()
+      },
+      arrayPermissionFlowClick() {
+        arrayPermissionFlowTest(function (ret, desc) {
+          if (ret) {
+            uni.showToast({
+              icon: 'none',
+              title: '测试通过',
+            })
+          } else {
+            uni.showToast({
+              icon: 'none',
+              title: '失败：' + desc,
+            })
+          }
+        })
+      },
+      singlePermissionFlowClick() {
+        singlePermissionFlowTest(function (ret, desc) {
+          if (ret) {
+            uni.showToast({
+              icon: 'none',
+              title: '测试通过',
+            })
+          } else {
+            uni.showToast({
+              icon: 'none',
+              title: '失败：' + desc,
+            })
+          }
+        })
+      },
+      // #ifdef APP-ANDROID
+      // #ifdef UNI-APP-X
+      activityCallback() {
+        var that = this
+        onCallbackChange(function (eventLog : string) {
+          // 展示捕捉到的声明周期日志
+          let nextLine = that.cbText + eventLog
+          that.cbText = nextLine
+          let nextLineFlag = that.cbText + '\n'
+          that.cbText = nextLineFlag
+        })
+        this.callback.push(new UTSAcvitiyLifeCycleCallback())
+        this.callback.push(new UTSActivityWindowCallback())
+        this.callback.push(new UTSAcvitiyKeyEventCallback())
+        this.callback.push(new UTSActivityCallback())
+        this.callback.push(new UTSActivityComponentCallback())
+        this.callback.forEach((value) => {
+          if (value instanceof UTSAcvitiyLifeCycleCallback) {
+            UTSAndroid.onActivityCallback(value)
+          }
+          if (value instanceof UTSActivityWindowCallback) {
+            UTSAndroid.onActivityCallback(value)
+          }
+          if (value instanceof UTSAcvitiyKeyEventCallback) {
+            UTSAndroid.onActivityCallback(value)
+          }
+          if (value instanceof UTSActivityCallback) {
+            UTSAndroid.onActivityCallback(value)
+          }
+          if (value instanceof UTSActivityComponentCallback) {
+            UTSAndroid.onActivityCallback(value)
+          }
 
-  },
-}
-<!-- #endif -->
+        })
+      },
+      unRegActivityCallback() {
+        this.callback.forEach((value) => {
+
+          if (value instanceof UTSAcvitiyLifeCycleCallback) {
+            UTSAndroid.offActivityCallback(value)
+          }
+          if (value instanceof UTSActivityWindowCallback) {
+            UTSAndroid.offActivityCallback(value)
+          }
+          if (value instanceof UTSAcvitiyKeyEventCallback) {
+            UTSAndroid.offActivityCallback(value)
+          }
+          if (value instanceof UTSActivityCallback) {
+            UTSAndroid.offActivityCallback(value)
+          }
+          if (value instanceof UTSActivityComponentCallback) {
+            UTSAndroid.offActivityCallback(value)
+          }
+        })
+      }
+      // #endif
+      // #endif
+
+    },
+  }
 </script>
 
 <style>
-.testButton {
-  width: 100%;
-}
-</style>
+  .testButton {
+    width: 100%;
+  }
+</style>
\ No newline at end of file

uni_modules/uts-platform-api/utssdk/app-android/index.uts

@@ -83,18 +83,23 @@ export function privacyStateTest(callback : (ret : boolean, desc : string) => vo
 
 export function privacyStateCallBackTest(callback : (ret : boolean, desc : string) => void) {
   let isAgree : boolean = true
-  const cb = (ret : boolean) => {
-    console.log('privacyStateCallBackTest->' + ret)
-    if (ret == isAgree) {
+  const cb = (ret : PrivacyOption) => {
+    console.log('privacyStateCallBackTest->' + ret.isAgree)
+    if (ret.isAgree == isAgree) {
       callback(true, "pass")
     } else {
       callback(false, "callback error")
     }
   }
   // 先重置用户同意状态
-  const callBackId=UTSAndroid.registerPrivacyAgreeListener(cb)
+  UTSAndroid.onPrivacyAgreeChange(cb)
   UTSAndroid.setPrivacyAgree(isAgree)
-  UTSAndroid.unRegisterPrivacyAgreeListener(callBackId)
+  UTSAndroid.offPrivacyAgreeChange(cb)
+  setTimeout(function () {
+    console.log('privacyStateCallBackTest->false')
+
+    UTSAndroid.setPrivacyAgree(false)
+  }, 5000);
 }
 
 /**

uni_modules/uts-syntaxcase/utssdk/index.uts

@@ -178,32 +178,10 @@ import ActionMode from 'android.view.ActionMode';
 // export let onCallBackChange: (event: string) => void = (res) => {};
 
 let callback : (eventLog : string) => void = (res) => { };
-let callbackIds : string[] = [];
+
 export function onCallbackChange(fn : (eventLog : string) => void) {
   callback = fn
 }
-export function registerCallbacks() {
-
-  let reg1 = UTSAndroid.registerActivityCallback(new UTSAcvitiyLifeCycleCallback())
-  let reg2 = UTSAndroid.registerActivityCallback(new UTSActivityWindowCallback())
-  let reg3 = UTSAndroid.registerActivityCallback(new UTSAcvitiyKeyEventCallback())
-  let reg4 = UTSAndroid.registerActivityCallback(new UTSActivityCallback())
-  let reg5 = UTSAndroid.registerActivityCallback(new UTSActivityComponentCallback())
-  callbackIds.push(reg1)
-  callbackIds.push(reg2)
-  callbackIds.push(reg3)
-  callbackIds.push(reg4)
-  callbackIds.push(reg5)
-
-}
-
-export function unRegisterCallbacks() {
-  callbackIds.forEach((value) => {
-    console.log(value)
-    UTSAndroid.unRegisterActivityCallback(value)
-  })
-}
-
 
 export class UTSAcvitiyLifeCycleCallback extends UniActivityLifeCycleCallback {
   constructor() {