From 9695405b73d4de40135a0ec05e4ae9d18ae4d344 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 25 六月 2024 09:48:51 +0800
Subject: [PATCH] 2024年06月25日09:48:48
---
app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java | 1 +
app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java | 2 +-
third-zxing/src/main/res/layout/activity_capture.xml | 11 ++++-------
app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java | 1 +
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
index 5a66890..a480c51 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
@@ -118,6 +118,7 @@
viewBinding.homeLoginRegisterTv.setVisibility(View.VISIBLE);
}
+// String acc = "18402017839";
String acc = "13375012441";
// String acc = "18316672920";
// String acc = "nuy13368@uzxia.com";
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
index 7745e4e..ff89ce8 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
@@ -32,7 +32,7 @@
@Override
public void onBindView(Bundle savedInstanceState) {
- Log.d("======","杩樿窇杩欓噷鏉�");
+
setNotificationBarBackgroundColor(CustomColor.white);
setStatusBarTextColor();
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java b/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java
index b6396ef..042097b 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java
@@ -28,6 +28,7 @@
import com.hdl.photovoltaic.utils.PermissionUtils;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
+import com.zxing.qrcode.CaptureActivity;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
diff --git a/third-zxing/src/main/res/layout/activity_capture.xml b/third-zxing/src/main/res/layout/activity_capture.xml
index 66698cd..48c5581 100644
--- a/third-zxing/src/main/res/layout/activity_capture.xml
+++ b/third-zxing/src/main/res/layout/activity_capture.xml
@@ -6,7 +6,6 @@
android:background="#636363">
-
<RelativeLayout
android:id="@+id/top_bar_view"
android:layout_width="match_parent"
@@ -20,8 +19,7 @@
android:layout_width="56dp"
android:layout_height="match_parent"
android:gravity="center_vertical"
- android:orientation="horizontal"
- >
+ android:orientation="horizontal">
<ImageView
android:layout_width="24dp"
@@ -29,8 +27,7 @@
android:layout_gravity="center"
android:layout_marginLeft="16dp"
android:scaleType="centerInside"
- android:src="@drawable/back"
- />
+ android:src="@drawable/back" />
</LinearLayout>
<!--2.鏍囬鏂囨湰-->
@@ -73,8 +70,8 @@
<SurfaceView
android:id="@+id/capture_preview"
- android:layout_width="367dp"
- android:layout_height="367dp"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:layout_centerInParent="true"
/>
--
Gitblit v1.8.0