video sdk合规检测，去掉腾讯地图的依赖。

Change-Id: Ibc84d454e7b72aa58bc66fe891e01faaf4e7cccd
tencentyun · Jan 3, 2024 · d7d461a · d7d461a
1 parent 18452a7
commit d7d461a
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 724 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -158,11 +158,6 @@ dependencies {
     implementation 'io.github.shichuanenhui:refresh-header-classics:1.0.0'
     implementation 'io.github.shichuanenhui:refresh-footer-classics:1.0.0'
 
-
-    implementation 'com.tencent.map:tencent-map-vector-sdk:4.4.1'
-    // 地图组件库，包括小车平移、点聚合等组件功能，详见开发指南。
-    implementation 'com.tencent.map:sdk-utilities:1.0.6'
-
     if (findProject(':sdk:explorer-link-android') != null) {
         implementation project(path: ':sdk:explorer-link-android')
     } else {
@@ -187,7 +182,6 @@ dependencies {
     implementation "com.tencent.iot.thirdparty.android:esptouch:0.3.7.2"
     implementation "com.github.skydoves:progressview:1.1.2"
     implementation 'com.belerweb:pinyin4j:2.5.0'
-    implementation 'com.tencent.map.geolocation:TencentLocationSdk-openplatform:7.2.6'
     implementation 'cn.aigestudio.wheelpicker:WheelPicker:1.1.3'
     implementation 'com.chauthai.swipereveallayout:swipe-reveal-layout:1.4.1'
     implementation 'com.github.Jay-Goo:RangeSeekBar:v3.0.0'

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -84,7 +84,6 @@
         <activity android:name=".kitlink.activity.CommentDetailsActivity" />
         <activity android:name=".kitlink.activity.DelayTimeActivity" />
         <activity android:name=".kitlink.activity.BuleToothActivity"/>
-        <activity android:name=".kitlink.activity.MarkerPaddingActivity"/>
         <activity android:name=".kitlink.activity.CloudTimingActivity" /> <!-- 信鸽Android P -->
         <uses-library
             android:name="org.apache.http.legacy"

diff --git a/app/src/main/java/com/tencent/iot/explorer/link/kitlink/activity/AddFamilyActivity.kt b/app/src/main/java/com/tencent/iot/explorer/link/kitlink/activity/AddFamilyActivity.kt
@@ -34,12 +34,8 @@ class AddFamilyActivity : BaseActivity(), MyCallback {
     override fun setListener() {
         iv_back.setOnClickListener { finish() }
         iv_set_location.setOnClickListener {
-            val intent = Intent(this, MarkerPaddingActivity::class.java)
-            startActivityForResult(intent, CommonField.MAP_LOCATION_REQ_CODE)
         }
         et_family_address.setOnClickListener {
-            val intent = Intent(this, MarkerPaddingActivity::class.java)
-            startActivityForResult(intent, CommonField.MAP_LOCATION_REQ_CODE)
         }
         btn_add_family.setOnClickListener { addFamily() }
         iv_set_family_name.setOnClickListener {

diff --git a/app/src/main/java/com/tencent/iot/explorer/link/kitlink/activity/DeviceWifiActivity.kt b/app/src/main/java/com/tencent/iot/explorer/link/kitlink/activity/DeviceWifiActivity.kt
@@ -1,5 +1,6 @@
 package com.tencent.iot.explorer.link.kitlink.activity
 
+import android.Manifest
 import android.content.Context
 import android.content.Intent
 import android.net.wifi.WifiInfo
@@ -13,7 +14,6 @@ import androidx.appcompat.content.res.AppCompatResources
 import com.tencent.iot.explorer.link.R
 import com.tencent.iot.explorer.link.T
 import com.tencent.iot.explorer.link.core.utils.KeyBoardUtils
-import com.tencent.iot.explorer.link.core.utils.LocationUtil
 import com.tencent.iot.explorer.link.customview.dialog.WifiHelperDialog
 import com.tencent.iot.explorer.link.customview.progress.bean.StepBean
 import com.tencent.iot.explorer.link.kitlink.consts.CommonField
@@ -95,6 +95,8 @@ class DeviceWifiActivity : PActivity() {
         showWifiInfo()
     }
 
+    private val permissions = arrayOf(Manifest.permission.ACCESS_COARSE_LOCATION)
+
     /**
      * 展示wifi
      */
@@ -110,7 +112,7 @@ class DeviceWifiActivity : PActivity() {
                 openWifiDialog?.show()
             } else {
                 var ssid2Set = wifiManager.connectionInfo.ssid.replace("\"", "")
-                if (!LocationUtil.isLocationServiceEnable(this)) {
+                if (!checkPermissions(permissions)) {
                     tv_select_wifi.hint = getString(R.string.open_location_tip)
                     ssid2Set = ""
                     openLocationServiceDialog?.show()

diff --git a/app/src/main/java/com/tencent/iot/explorer/link/kitlink/activity/FamilyActivity.kt b/app/src/main/java/com/tencent/iot/explorer/link/kitlink/activity/FamilyActivity.kt
@@ -97,13 +97,6 @@ class FamilyActivity : MActivity(), FamilyView, CRecyclerView.RecyclerItemView {
                         jumpActivity(RoomListActivity::class.java)
                     }
                     2 -> {
-                        val intent = Intent(this@FamilyActivity, MarkerPaddingActivity::class.java)
-                        var bundle = Bundle()
-                        bundle.putString(CommonField.ADDRESS, headerHolder.data?.Address)
-                        bundle.putString(CommonField.FAMILY_ID, familyEntity?.FamilyId)
-                        bundle.putString(CommonField.FAMILY_NAME, familyEntity?.FamilyName)
-                        intent.putExtra(CommonField.ADDRESS, bundle)
-                        startActivityForResult(intent, CommonField.MAP_LOCATION_REQ_CODE)
                     }
                     3 -> {
                         jumpActivity(InviteMemberActivity::class.java)