Browse Source

activity 更改

liuyuqi-dellpc 4 years ago
parent
commit
ed29da63b0

+ 3 - 1
app/src/main/java/me/yoqi/qrcode/CaptureActivity.java

@@ -22,6 +22,8 @@ import android.view.WindowManager;
 import android.widget.ImageView;
 import android.widget.ImageView;
 import android.widget.Toast;
 import android.widget.Toast;
 
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.Result;
 import com.google.zxing.Result;
 import com.google.zxing.ResultPoint;
 import com.google.zxing.ResultPoint;
@@ -42,7 +44,7 @@ import java.util.Collection;
  * @author liuyuqi
  * @author liuyuqi
  *
  *
  */
  */
-public final class CaptureActivity extends Activity implements SurfaceHolder.Callback {
+public final class CaptureActivity extends AppCompatActivity implements SurfaceHolder.Callback {
 
 
 	private static final String TAG = CaptureActivity.class.getSimpleName();
 	private static final String TAG = CaptureActivity.class.getSimpleName();
 
 

+ 26 - 27
app/src/main/java/me/yoqi/qrcode/ResultActivity.java

@@ -1,37 +1,36 @@
 package me.yoqi.qrcode;
 package me.yoqi.qrcode;
 
 
-import me.yoqi.qrcode.R;
-
 import android.annotation.SuppressLint;
 import android.annotation.SuppressLint;
-import android.app.Activity;
 import android.content.ClipData;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.ClipboardManager;
 import android.content.Intent;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Bundle;
 import android.widget.EditText;
 import android.widget.EditText;
 
 
-public class ResultActivity extends Activity {
-
-	private EditText et_result;
-	ClipboardManager myClipboard;
-
-	@SuppressLint("NewApi")
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_result);
-		initView();
-		Intent intent = getIntent();
-		String text = intent.getStringExtra("text");
-		et_result.setText(text);
-		
-		myClipboard = (ClipboardManager)getSystemService(CLIPBOARD_SERVICE);
-		
-		ClipData myClip = ClipData.newPlainText("text", text);
-		myClipboard.setPrimaryClip(myClip);
-	}
-
-	private void initView() {
-		et_result = (EditText) findViewById(R.id.et_result);
-	}
+import androidx.appcompat.app.AppCompatActivity;
+
+public class ResultActivity extends AppCompatActivity {
+
+    private EditText et_result;
+    ClipboardManager myClipboard;
+
+    @SuppressLint("NewApi")
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_result);
+        initView();
+        Intent intent = getIntent();
+        String text = intent.getStringExtra("text");
+        et_result.setText(text);
+
+        myClipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
+
+        ClipData myClip = ClipData.newPlainText("text", text);
+        myClipboard.setPrimaryClip(myClip);
+    }
+
+    private void initView() {
+        et_result = (EditText) findViewById(R.id.et_result);
+    }
 }
 }