Skip to content

Commit d6e4aed

Browse files
neilyheneilyhe
committed
粘贴功能增加
1 parent 2c2d722 commit d6e4aed

File tree

5 files changed

+53
-33
lines changed

5 files changed

+53
-33
lines changed

‎sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/VideoInputAuthorizeActivity.kt‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package com.tencent.iot.explorer.link.demo.video
22

3+
import android.content.ClipboardManager
34
import android.content.Intent
45
import android.os.Bundle
56
import android.text.InputType
67
import android.text.TextUtils
78
import android.view.View
89
import android.widget.Toast
10+
import androidx.core.content.ContextCompat
911
import com.alibaba.fastjson.JSONArray
1012
import com.alibaba.fastjson.JSONObject
1113
import com.tencent.iot.explorer.link.core.utils.SharePreferenceUtil
@@ -16,7 +18,8 @@ import com.tencent.iot.explorer.link.demo.databinding.ActivityVideoInputAuthoriz
1618
import com.tencent.iot.video.link.consts.VideoConst
1719
import kotlinx.coroutines.*
1820

19-
class VideoInputAuthorizeActivity : VideoBaseActivity<ActivityVideoInputAuthorizeBinding>(), CoroutineScope by MainScope() {
21+
class VideoInputAuthorizeActivity : VideoBaseActivity<ActivityVideoInputAuthorizeBinding>(),
22+
CoroutineScope by MainScope() {
2023

2124
override fun getViewBinding(): ActivityVideoInputAuthorizeBinding =
2225
ActivityVideoInputAuthorizeBinding.inflate(layoutInflater)
@@ -30,9 +33,11 @@ class VideoInputAuthorizeActivity : VideoBaseActivity<ActivityVideoInputAuthoriz
3033
accessIdLayout.evContent.setHint(R.string.hint_access_id)
3134
accessTokenLayout.evContent.setHint(R.string.hint_access_token)
3235
productIdLayout.evContent.setHint(R.string.hint_product_id)
36+
productIdLayout.evContent.inputType = InputType.TYPE_CLASS_TEXT
3337
accessIdLayout.evContent.inputType = InputType.TYPE_CLASS_TEXT
3438
accessTokenLayout.ivMore.visibility = View.GONE
3539
productIdLayout.ivMore.visibility = View.GONE
40+
accessIdLayout.ivMore.visibility = View.VISIBLE
3641

3742
launch(Dispatchers.Main) {
3843
val jsonArrStr = SharePreferenceUtil.getString(
@@ -50,7 +55,6 @@ class VideoInputAuthorizeActivity : VideoBaseActivity<ActivityVideoInputAuthoriz
5055
productIdLayout.evContent.setText(accessInfo.productId)
5156
accessIdLayout.evContent.setSelection(accessInfo.accessId.length)
5257
}
53-
5458
} ?: let {
5559
accessIdLayout.evContent.setText(BuildConfig.TencentIotLinkVideoSDKDemoSecretId)
5660
accessTokenLayout.evContent.setText(BuildConfig.TencentIotLinkVideoSDKDemoSecretKey)
@@ -71,6 +75,19 @@ class VideoInputAuthorizeActivity : VideoBaseActivity<ActivityVideoInputAuthoriz
7175
dlg.show()
7276
dlg.setOnDismissListener(onDlgDismissListener)
7377
}
78+
btnPaste.setOnClickListener {
79+
val clipboard = ContextCompat.getSystemService(this@VideoInputAuthorizeActivity, ClipboardManager::class.java);
80+
if (clipboard != null && clipboard.hasPrimaryClip()) {
81+
clipboard.primaryClip?.getItemAt(0)?.text.toString().split("\n")
82+
.forEachIndexed { index, s ->
83+
when (index) {
84+
0 -> accessIdLayout.evContent.setText(s)
85+
1 -> accessTokenLayout.evContent.setText(s)
86+
2 -> productIdLayout.evContent.setText(s)
87+
}
88+
}
89+
}
90+
}
7491
}
7592
}
7693

‎sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/VideoTestInputActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class VideoTestInputActivity : VideoBaseActivity<ActivityVideoTestInputBinding>(
4848
productIdLayout.evContent.setText(productId)
4949
}
5050
productIdLayout.evContent.setHint(R.string.hint_product_id)
51-
p2pInfoLayout.evContent.inputType = InputType.TYPE_CLASS_TEXT
51+
productIdLayout.evContent.inputType = InputType.TYPE_CLASS_TEXT
5252
if (deviceName.isNotEmpty()) {
5353
deviceNameLayout.evContent.setText(deviceName)
5454
}

‎sdkdemo/src/main/res/drawable/background_blue_cell.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<shape xmlns:android="http://schemas.android.com/apk/res/android">
3-
4-
<solid android:color="@color/blue_1A0052D9" />
53

64
<stroke android:color="@color/blue_0052D9"
75
android:width="1dp" />
8-
9-
<corners android:radius="12dp"/>
10-
11-
126
</shape>

‎sdkdemo/src/main/res/layout/activity_video_input_authorize.xml‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,24 @@
9090

9191
</androidx.constraintlayout.widget.ConstraintLayout>
9292

93+
<Button
94+
android:id="@+id/btn_paste"
95+
android:layout_width="60dp"
96+
android:layout_height="30dp"
97+
android:layout_marginStart="16dp"
98+
android:layout_marginTop="8dp"
99+
android:background="@drawable/background_blue_cell"
100+
android:text="粘贴"
101+
android:textColor="@color/blue_0052D9"
102+
app:layout_constraintStart_toStartOf="parent"
103+
app:layout_constraintTop_toBottomOf="@id/v_title" />
104+
93105
<include
94106
android:id="@+id/access_id_layout"
95107
layout="@layout/input_item_layout"
96108
android:layout_width="match_parent"
97109
android:layout_height="56dp"
98-
app:layout_constraintTop_toBottomOf="@id/type_layout"
110+
app:layout_constraintTop_toBottomOf="@id/btn_paste"
99111
/>
100112

101113
<include

‎sdkdemo/src/main/res/layout/input_item_layout.xml‎

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,56 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto"
34
android:layout_width="match_parent"
4-
android:layout_height="wrap_content"
5-
xmlns:app="http://schemas.android.com/apk/res-auto">
5+
android:layout_height="wrap_content">
66

77
<TextView
88
android:id="@+id/tv_tip"
99
android:layout_width="wrap_content"
1010
android:layout_height="wrap_content"
11-
app:layout_constraintStart_toStartOf="parent"
12-
app:layout_constraintTop_toTopOf="parent"
13-
app:layout_constraintBottom_toBottomOf="parent"
1411
android:layout_marginStart="16dp"
1512
android:textColor="@color/black"
1613
android:textSize="@dimen/ts_17"
17-
/>
14+
app:layout_constraintBottom_toBottomOf="parent"
15+
app:layout_constraintStart_toStartOf="parent"
16+
app:layout_constraintTop_toTopOf="parent" />
1817

1918
<EditText
2019
android:id="@+id/ev_content"
2120
android:layout_width="0dp"
2221
android:layout_height="wrap_content"
23-
app:layout_constraintStart_toStartOf="parent"
24-
app:layout_constraintTop_toTopOf="parent"
25-
app:layout_constraintBottom_toBottomOf="parent"
2622
android:layout_marginStart="147dp"
27-
android:textColorHint="@color/gray_FFBBBBBB"
28-
android:textColor="@color/gray_FF7F7F7F"
29-
android:gravity="center_vertical"
30-
android:textSize="@dimen/ts_17"
3123
android:background="@null"
24+
android:gravity="center_vertical"
3225
android:inputType="textPassword"
3326
android:lines="1"
27+
android:textColor="@color/gray_FF7F7F7F"
28+
android:textColorHint="@color/gray_FFBBBBBB"
29+
android:textSize="@dimen/ts_17"
30+
app:layout_constraintBottom_toBottomOf="parent"
3431
app:layout_constraintEnd_toStartOf="@id/iv_more"
35-
/>
32+
app:layout_constraintStart_toStartOf="parent"
33+
app:layout_constraintTop_toTopOf="parent" />
3634

3735
<ImageView
3836
android:id="@+id/iv_more"
3937
android:layout_width="24dp"
4038
android:layout_height="0dp"
41-
app:layout_constraintDimensionRatio="h,1:1"
4239
android:layout_marginEnd="16dp"
4340
android:padding="5dp"
44-
app:layout_constraintEnd_toEndOf="parent"
45-
app:layout_constraintTop_toTopOf="parent"
46-
app:layout_constraintBottom_toBottomOf="parent"
47-
android:src="@mipmap/ic_arrow_left_gray"
4841
android:rotation="-90"
49-
/>
42+
android:src="@mipmap/ic_arrow_left_gray"
43+
android:visibility="gone"
44+
app:layout_constraintBottom_toBottomOf="parent"
45+
app:layout_constraintDimensionRatio="h,1:1"
46+
app:layout_constraintEnd_toEndOf="parent"
47+
app:layout_constraintTop_toTopOf="parent" />
5048

5149
<View
5250
android:layout_width="match_parent"
5351
android:layout_height="1dp"
54-
app:layout_constraintBottom_toBottomOf="parent"
55-
android:background="@color/black_1A000000"
5652
android:layout_marginStart="16dp"
57-
/>
53+
android:background="@color/black_1A000000"
54+
app:layout_constraintBottom_toBottomOf="parent" />
5855

5956
</androidx.constraintlayout.widget.ConstraintLayout>

0 commit comments

Comments
 (0)