扫码功能增加

Author: neilyhe

sdkdemo/build.gradle

@@ -105,6 +105,18 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'com.squareup.picasso:picasso:2.71828'
     implementation 'com.squareup.okhttp3:okhttp:3.0.1'
+    
+    // Google ML Kit for QR code scanning
+    implementation 'com.google.mlkit:barcode-scanning:17.2.0'
+    implementation 'com.google.android.gms:play-services-mlkit-barcode-scanning:18.3.0'
+    
+    // CameraX dependencies - using stable version combination
+    def camerax_version = "1.2.1"
+    implementation "androidx.camera:camera-core:${camerax_version}"
+    implementation "androidx.camera:camera-camera2:${camerax_version}"
+    implementation "androidx.camera:camera-lifecycle:${camerax_version}"
+    implementation "androidx.camera:camera-view:${camerax_version}"
+
     testImplementation 'junit:junit:4.+'
     testImplementation 'org.robolectric:robolectric:4.5.1'
     testImplementation ('org.bouncycastle:bcprov-jdk15on')  {

sdkdemo/src/main/AndroidManifest.xml

@@ -84,19 +84,26 @@
         <activity android:name="com.tencent.iot.explorer.link.rtc.ui.audiocall.TRTCAudioCallActivity" />
         <activity android:name="com.tencent.iot.explorer.link.rtc.ui.videocall.TRTCVideoCallActivity" />
 <!--        <activity android:name=".core.activity.LoginActivity" />-->
-        <activity android:name=".core.activity.LoginActivity">
+        <activity android:name=".core.activity.LoginActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".core.activity.MainActivity">
+        <activity android:name=".core.activity.MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
             </intent-filter>
         </activity>
-        <activity android:name=".core.activity.AddDeviceActivity" />
+        <activity android:name=".core.activity.AddDeviceActivity"
+            android:exported="false"/>
+        <activity
+            android:name=".core.activity.QRCodeScannerActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:theme="@style/AppTheme" />
 
         <activity
             android:name=".core.wxapi.WXEntryActivity"

sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/AddDeviceActivity.kt

@@ -3,13 +3,11 @@ package com.tencent.iot.explorer.link.demo.core.activity
 import android.Manifest
 import android.content.Intent
 import android.content.pm.PackageManager
-import android.os.Bundle
 import android.text.TextUtils
 import android.widget.Toast
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import com.tencent.iot.explorer.link.demo.BaseActivity
-import com.tencent.iot.explorer.link.demo.R
 import com.tencent.iot.explorer.link.demo.databinding.ActivityAddDeviceBinding
 
 /**
@@ -85,11 +83,9 @@ class AddDeviceActivity : BaseActivity<ActivityAddDeviceBinding>() {
      * 启动二维码扫描器
      */
     private fun launchQRCodeScanner() {
-        // TODO: 实现二维码扫描功能
-        // 这里应该启动一个二维码扫描Activity或使用第三方库
-        
-        // 临时实现：模拟扫描结果
-        simulateQRCodeScan()
+        // 启动二维码扫描Activity
+        val intent = Intent(this, QRCodeScannerActivity::class.java)
+        startActivityForResult(intent, REQUEST_SCAN_QR_CODE)
     }
 
     /**
@@ -205,7 +201,7 @@ class AddDeviceActivity : BaseActivity<ActivityAddDeviceBinding>() {
      * 处理二维码扫描结果
      */
     private fun handleQRCodeResult(data: Intent?) {
-        // TODO: 从Intent中获取二维码扫描结果
+        // 从Intent中获取二维码扫描结果
         val qrCodeResult = data?.getStringExtra("QR_CODE_RESULT") ?: ""
 
         if (qrCodeResult.isNotEmpty()) {
@@ -276,4 +272,4 @@ class AddDeviceActivity : BaseActivity<ActivityAddDeviceBinding>() {
         // 临时实现：直接返回
         super.onBackPressed()
     }
-}
+}