APP
/
oxFaceAndroid
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

change face activity

main
MTing 2 weeks ago
parent
6c4e199474
commit
d2a0a64817
2 changed files with 82 additions and 72 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 36
      app/src/main/java/com/ouxuan/oxface/OXFaceOnlineActivity.java
  2. 104
      app/src/main/res/layout/activity_oxface_online.xml

36
app/src/main/java/com/ouxuan/oxface/OXFaceOnlineActivity.java
View File

@ -116,8 +116,8 @@ public class OXFaceOnlineActivity extends BaseActivity implements View.OnClickLi
// 底部按钮
private Button btnOpenDoor;
private Button btnScanQR;
private Button btnSettings;
// private Button btnScanQR;
// private Button btnSettings;
// 新增的二维码区域控件
private ImageView imgMiniProgramCode;
@ -207,18 +207,18 @@ public class OXFaceOnlineActivity extends BaseActivity implements View.OnClickLi
// 初始化底部按钮
btnOpenDoor = findViewById(R.id.button_open_door);
btnScanQR = findViewById(R.id.button_scan_qr);
btnSettings = findViewById(R.id.button_settings);
// btnScanQR = findViewById(R.id.button_scan_qr);
// btnSettings = findViewById(R.id.button_settings);
if (btnOpenDoor != null) {
btnOpenDoor.setOnClickListener(this);
}
if (btnScanQR != null) {
btnScanQR.setOnClickListener(this);
}
if (btnSettings != null) {
btnSettings.setOnClickListener(this);
}
// if (btnScanQR != null) {
// btnScanQR.setOnClickListener(this);
// }
// if (btnSettings != null) {
// btnSettings.setOnClickListener(this);
// }
// 隐藏原有的UI元素
hideOriginalUI();
@ -411,13 +411,15 @@ public class OXFaceOnlineActivity extends BaseActivity implements View.OnClickLi
} else if (id == R.id.button_open_door) {
// 开门按钮点击事件
handleOpenDoorClick();
} else if (id == R.id.button_scan_qr) {
// 扫码按钮点击事件
handleScanQRClick();
} else if (id == R.id.button_settings) {
// 设置按钮点击事件
handleSettingsClick();
} else if (id == R.id.img_mini_program_code) {
}
// else if (id == R.id.button_scan_qr) {
// // 扫码按钮点击事件
// handleScanQRClick();
// } else if (id == R.id.button_settings) {
// // 设置按钮点击事件
// handleSettingsClick();
// }
else if (id == R.id.img_mini_program_code) {
// 新用户扫码上传人脸点击事件
handleMiniProgramCodeClick();
} else if (id == R.id.img_scan_door_qrcode) {

104
app/src/main/res/layout/activity_oxface_online.xml
View File

@ -222,6 +222,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="80dp"
android:background="#80000000">
<!-- 二维码区域 - 添加在底部按钮上方 -->
@ -291,74 +294,79 @@
<Button
android:id="@+id/btn_verification_code"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="验证码开门"
android:textColor="#FFFFFF"
android:background="#4CAF50"
android:layout_width="wrap_content"
android:layout_height="28dp"
android:layout_marginBottom="10dp"
android:background="#4CAF50"
android:minHeight="40dp"
android:text="验证码开门"
android:textColor="#FFFFFF"
android:textSize="14sp" />
<Button
android:id="@+id/btn_scanner_door"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="扫码器开门"
android:textColor="#FFFFFF"
android:layout_width="wrap_content"
android:layout_height="28dp"
android:background="#2196F3"
android:minHeight="40dp"
android:text="扫码器开门"
android:textColor="#FFFFFF"
android:textSize="14sp" />
</LinearLayout>
</LinearLayout>
<!-- 底部按钮区域 -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center"
android:weightSum="3"
android:layout_below="@id/qrcode_area"
android:padding="20dp">
<!-- <LinearLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:orientation="horizontal"-->
<!-- android:gravity="center"-->
<!-- android:weightSum="2"-->
<!-- android:layout_below="@id/qrcode_area"-->
<!-- android:padding="16dp"-->
<!-- android:layout_marginStart="16dp"-->
<!-- android:layout_marginEnd="16dp"-->
<!-- android:layout_marginBottom="8dp">-->
<!-- <Button-->
<!-- android:id="@+id/button_scan_qr"-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_weight="1"-->
<!-- android:text="扫码"-->
<!-- android:textSize="18sp"-->
<!-- android:textColor="#FFFFFF"-->
<!-- android:background="#FF9800"-->
<!-- android:layout_marginEnd="10dp"-->
<!-- android:minHeight="50dp" />-->
<!-- <Button-->
<!-- android:id="@+id/button_settings"-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_weight="1"-->
<!-- android:text="设置"-->
<!-- android:textSize="18sp"-->
<!-- android:textColor="#FFFFFF"-->
<!-- android:background="#9C27B0"-->
<!-- android:layout_marginStart="10dp"-->
<!-- android:minHeight="50dp" />-->
<!-- </LinearLayout>-->
</RelativeLayout>
<!-- 独立的开门按钮，放在屏幕左下角 -->
<Button
android:id="@+id/button_open_door"
android:layout_width="0dp"
android:layout_width="120dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="开门"
android:textSize="18sp"
android:textColor="#FFFFFF"
android:background="#009688"
android:layout_marginEnd="10dp"
android:minHeight="50dp" />
<Button
android:id="@+id/button_scan_qr"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="扫码"
android:textSize="18sp"
android:textColor="#FFFFFF"
android:background="#FF9800"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:minHeight="50dp" />
<Button
android:id="@+id/button_settings"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="设置"
android:textSize="18sp"
android:textColor="#FFFFFF"
android:background="#9C27B0"
android:layout_marginStart="10dp"
android:minHeight="50dp" />
</LinearLayout>
</RelativeLayout>
android:minHeight="50dp"
android:layout_alignParentBottom="true"
android:layout_alignParentStart="true"
android:layout_marginStart="16dp"
android:layout_marginBottom="16dp" />
</RelativeLayout>
Write Preview
Loading…
Cancel
Save