Merge branch 'd_f' of http://git.siwill.com/ifengouy/VisitorApp

 Conflicts:

	app/src/main/AndroidManifest.xml

app/src/main/AndroidManifest.xml

@@ -8,6 +8,12 @@
 
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.CAMERA" />
+
+    <!-- 显示系统窗口权限 -->
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+    <!-- 在 屏幕最顶部显示权限-->
+    <uses-permission android:name="android.permission.SYSTEM_OVERLAY_WINDOW" />
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
@@ -26,6 +32,8 @@
         <activity android:name=".LoginActivity" />
         <activity android:name=".activity.VisitorRegActivity" />
         <activity android:name=".activity.IdcardRegActivity" />
+        <activity android:name=".activity.HomeAc" />
+        <activity android:name=".activity.VisitorRegisterAc" />
     </application>
 
 </manifest>

app/src/main/java/com/sunwin/visitorapp/activity/HomeAc.java

@@ -30,6 +30,8 @@ public class HomeAc extends BaseActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_home);
 
+
+        findViewById(R.id.ImageSetting).setOnClickListener(v -> startActivity(new Intent(mContext,SettingAc.class)));
         FragmentManager fragmentmanager=getFragmentManager();
         FragmentTransaction fragmentTransaction =fragmentmanager.beginTransaction();
         //添加fragment
@@ -47,6 +49,8 @@ public class HomeAc extends BaseActivity {
 
 
 
+
+
     }
 
     @Override

app/src/main/java/com/sunwin/visitorapp/activity/SettingAc.java

@@ -0,0 +1,18 @@
+package com.sunwin.visitorapp.activity;
+
+import android.os.Bundle;
+
+import com.sunwin.visitorapp.BaseActivity;
+import com.sunwin.visitorapp.R;
+import com.sunwin.visitorapp.view.UINav;
+
+public class SettingAc extends BaseActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.ac_setting);
+        UINav nav = findViewById(R.id.UINav);
+        nav.setData(this,"系统设置");
+    }
+}

app/src/main/res/layout/ac_setting.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/login_button_normal">
+
+    <com.sunwin.visitorapp.view.UINav
+        android:id="@+id/UINav"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+</LinearLayout>