Skip to content

Commit 08c22cd

Browse files
committed
sdk合规检测,使用腾讯连连做demo,去掉腾讯地图的依赖。
Change-Id: Ic311f80e6d09242a4112d38628deda4aa2279d3b
1 parent c88e3c3 commit 08c22cd

File tree

11 files changed

+6
-751
lines changed

11 files changed

+6
-751
lines changed

app/build.gradle

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -148,11 +148,6 @@ dependencies {
148148
implementation 'io.github.shichuanenhui:refresh-header-classics:1.0.0'
149149
implementation 'io.github.shichuanenhui:refresh-footer-classics:1.0.0'
150150

151-
152-
implementation 'com.tencent.map:tencent-map-vector-sdk:4.4.7'
153-
// 地图组件库,包括小车平移、点聚合等组件功能,详见开发指南。
154-
implementation 'com.tencent.map:sdk-utilities:1.0.6'
155-
156151
if (findProject(':sdk:explorer-link-android') != null) {
157152
implementation project(path: ':sdk:explorer-link-android')
158153
} else {
@@ -170,7 +165,6 @@ dependencies {
170165
implementation "com.tencent.iot.thirdparty.android:esptouch:0.3.7.2"
171166
implementation "com.github.skydoves:progressview:1.1.2"
172167
implementation 'com.belerweb:pinyin4j:2.5.1'
173-
implementation 'com.tencent.map.geolocation:TencentLocationSdk-openplatform:7.4.1'
174168
implementation 'cn.aigestudio.wheelpicker:WheelPicker:1.1.3'
175169
implementation 'com.chauthai.swipereveallayout:swipe-reveal-layout:1.4.1'
176170
implementation 'com.github.Jay-Goo:RangeSeekBar:v3.0.0'

app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@
9191
<activity android:name=".kitlink.activity.CommentDetailsActivity" />
9292
<activity android:name=".kitlink.activity.DelayTimeActivity" />
9393
<activity android:name=".kitlink.activity.BuleToothActivity"/>
94-
<activity android:name=".kitlink.activity.MarkerPaddingActivity"/>
9594
<activity android:name=".kitlink.activity.CloudTimingActivity" /> <!-- 信鸽Android P -->
9695
<uses-library
9796
android:name="org.apache.http.legacy"

app/src/main/java/com/tencent/iot/explorer/link/kitlink/activity/AddFamilyActivity.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,8 @@ class AddFamilyActivity : BaseActivity(), MyCallback {
3434
override fun setListener() {
3535
iv_back.setOnClickListener { finish() }
3636
iv_set_location.setOnClickListener {
37-
val intent = Intent(this, MarkerPaddingActivity::class.java)
38-
startActivityForResult(intent, CommonField.MAP_LOCATION_REQ_CODE)
3937
}
4038
et_family_address.setOnClickListener {
41-
val intent = Intent(this, MarkerPaddingActivity::class.java)
42-
startActivityForResult(intent, CommonField.MAP_LOCATION_REQ_CODE)
4339
}
4440
btn_add_family.setOnClickListener { addFamily() }
4541
iv_set_family_name.setOnClickListener {

app/src/main/java/com/tencent/iot/explorer/link/kitlink/activity/DeviceWifiActivity.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.tencent.iot.explorer.link.kitlink.activity
22

3+
import android.Manifest
34
import android.content.Context
45
import android.content.Intent
56
import android.net.wifi.WifiInfo
@@ -13,7 +14,6 @@ import androidx.appcompat.content.res.AppCompatResources
1314
import com.tencent.iot.explorer.link.R
1415
import com.tencent.iot.explorer.link.T
1516
import com.tencent.iot.explorer.link.core.utils.KeyBoardUtils
16-
import com.tencent.iot.explorer.link.core.utils.LocationUtil
1717
import com.tencent.iot.explorer.link.customview.dialog.WifiHelperDialog
1818
import com.tencent.iot.explorer.link.customview.progress.bean.StepBean
1919
import com.tencent.iot.explorer.link.kitlink.consts.CommonField
@@ -95,6 +95,8 @@ class DeviceWifiActivity : PActivity() {
9595
showWifiInfo()
9696
}
9797

98+
private val permissions = arrayOf(Manifest.permission.ACCESS_COARSE_LOCATION)
99+
98100
/**
99101
* 展示wifi
100102
*/
@@ -110,7 +112,7 @@ class DeviceWifiActivity : PActivity() {
110112
openWifiDialog?.show()
111113
} else {
112114
var ssid2Set = wifiManager.connectionInfo.ssid.replace("\"", "")
113-
if (!LocationUtil.isLocationServiceEnable(this)) {
115+
if (!checkPermissions(permissions)) {
114116
tv_select_wifi.hint = getString(R.string.open_location_tip)
115117
ssid2Set = ""
116118
openLocationServiceDialog?.show()

app/src/main/java/com/tencent/iot/explorer/link/kitlink/activity/FamilyActivity.kt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,6 @@ class FamilyActivity : MActivity(), FamilyView, CRecyclerView.RecyclerItemView {
101101
jumpActivity(RoomListActivity::class.java)
102102
}
103103
2 -> {
104-
val intent = Intent(this@FamilyActivity, MarkerPaddingActivity::class.java)
105-
var bundle = Bundle()
106-
bundle.putString(CommonField.ADDRESS, headerHolder.data?.Address)
107-
bundle.putString(CommonField.FAMILY_ID, familyEntity?.FamilyId)
108-
bundle.putString(CommonField.FAMILY_NAME, familyEntity?.FamilyName)
109-
intent.putExtra(CommonField.ADDRESS, bundle)
110-
startActivityForResult(intent, CommonField.MAP_LOCATION_REQ_CODE)
111104
}
112105
3 -> {
113106
jumpActivity(InviteMemberActivity::class.java)

0 commit comments

Comments
 (0)