瀏覽代碼

本机号码获取优化

weizhengliang 2 年之前
父節點
當前提交
f83ec12076

+ 6 - 1
home/src/main/code/com/wdkl/ncs/android/component/home/activity/SmsReceivedActivity.kt

@@ -3,6 +3,7 @@ package com.wdkl.ncs.android.component.home.activity
 import android.app.Activity
 import android.os.Bundle
 import android.text.TextUtils
+import android.text.method.ScrollingMovementMethod
 import android.view.View
 import com.wdkl.ncs.android.component.home.R
 import com.wdkl.ncs.android.component.home.util.AppUtils
@@ -26,11 +27,13 @@ class SmsReceivedActivity : Activity() {
 
         setContentView(R.layout.activity_sms_received)
 
-        Constants.smsCheck = false
+        //Constants.smsCheck = false
 
         setFinishOnTouchOutside(false)
         //window.decorView.systemUiVisibility = FULL_SCREEN_FLAG
 
+        tv_sms_reply.movementMethod = ScrollingMovementMethod.getInstance()
+
         val address = intent.getStringExtra("address")
         val data = intent.getStringExtra("sms_data")
 
@@ -45,10 +48,12 @@ class SmsReceivedActivity : Activity() {
 
 
         btn_number_cancel.setOnClickListener {
+            Constants.smsCheck = false
             finish()
         }
 
         btn_number_confirm.setOnClickListener {
+            Constants.smsCheck = false
             val phoneNo = edit_sms_phone.text.toString()
             if (!TextUtils.isEmpty(phoneNo)) {
                 val tcpModel = DeviceUtil.deviceConnect2(Constants.Companion.imei, phoneNo)

+ 1 - 1
home/src/main/code/com/wdkl/ncs/android/component/home/service/PhoneStateReceiver.java

@@ -62,7 +62,7 @@ public class PhoneStateReceiver extends BroadcastReceiver {
                 smsIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 context.startActivity(smsIntent);
             }
-            //Log.e(TAG, "received sms: " + fullMessage + ", address: " + address + ", check: " + Constant.smsCheck);
+            Log.e(TAG, "received sms: " + fullMessage + ", address: " + address + ", check: " + Constants.Companion.getSmsCheck());
         } else if (action.equals(Intent.ACTION_NEW_OUTGOING_CALL)) {
             String phoneNumber = intent.getStringExtra(Intent.EXTRA_PHONE_NUMBER);
             DeviceChannel.calling = true;

+ 1 - 1
home/src/main/res/layout/activity_sms_received.xml

@@ -22,7 +22,7 @@
             <TextView
                 android:id="@+id/tv_sms_reply"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="180dp"
                 android:layout_below="@id/tv_sms_title"
                 android:layout_marginTop="10dp"
                 android:text=""