Skip to content

Commit d9021ef

Browse files
committed
【ID871147007】合规6-关闭“定位权限”后,家庭详情的“家庭位置”不做显示。
http://tapd.oa.com/NEW_IOT/prong/stories/view/1020393192871147007 Change-Id: I07e138bb78a09c3fbb3533d751f0626355824cff
1 parent d89c944 commit d9021ef

File tree

3 files changed

+6
-0
lines changed

3 files changed

+6
-0
lines changed

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

Lines changed: 4 additions & 0 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.permission
34
import android.app.Activity
45
import android.content.Intent
56
import android.os.Bundle
@@ -45,6 +46,8 @@ class FamilyActivity : MActivity(), FamilyView, CRecyclerView.RecyclerItemView {
4546
private var deleteFamilyPopup: CommonPopupWindow? = null
4647
private var exitFamilyPopup: CommonPopupWindow? = null
4748

49+
private val permissions = arrayOf(permission.ACCESS_COARSE_LOCATION)
50+
4851
override fun getModel(): IModel? {
4952
return model
5053
}
@@ -79,6 +82,7 @@ class FamilyActivity : MActivity(), FamilyView, CRecyclerView.RecyclerItemView {
7982
*/
8083
private fun addHeader() {
8184
headerHolder = FamilyInfoHeaderHolder(this, crv_member_list, R.layout.head_family)
85+
familyEntity?.showAddress = checkPermissions(permissions)
8286
headerHolder.data = familyEntity
8387
crv_member_list.addHeader(headerHolder)
8488
headerHolder.headListener = object : CRecyclerView.HeadListener {

app/src/main/java/com/tencent/iot/explorer/link/kitlink/holder/FamilyInfoHeaderHolder.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ class FamilyInfoHeaderHolder : CRecyclerView.HeadViewHolder<FamilyEntity> {
2323
try {
2424
var address = JSON.parseObject(Address, com.tencent.iot.explorer.link.kitlink.entity.Address::class.java)
2525
itemView.tv_head_family_address.text = address?.name
26+
itemView.tv_head_family_address.visibility = if(showAddress) View.VISIBLE else View.GONE
2627
} catch (e : JSONException) {
2728
e.printStackTrace()
2829
}

sdk/explorer-link-android/src/main/java/com/tencent/iot/explorer/link/core/auth/entity/FamilyEntity.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ class FamilyEntity {
99
var FamilyType = 0
1010
var FamilyName = ""
1111
var Address = ""
12+
var showAddress = false
1213
var RoomsNum = ""
1314
var Role = 0 // 1:自己是管理员 0:普通成员
1415
var CreateTime = 0L

0 commit comments

Comments
 (0)