From 4f7d18f483d807fb07b3f466ddd4441f2c19ab9e Mon Sep 17 00:00:00 2001
From: itgaojian <itgaojian@163.com>
Date: Thu, 22 Feb 2024 10:24:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E5=88=B0=E8=AE=B0=E5=BD=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  3 +
 app/release/output-metadata.json              |  4 +-
 app/src/main/AndroidManifest.xml              | 23 ++----
 .../activitys/common/SignRecordActivity.java  | 16 +++++
 .../activitys/common/WorkSignActivity.java    |  5 +-
 .../main/res/layout/activity_sign_record.xml  | 71 +++++++++++++++++++
 .../main/res/layout/activity_work_sign.xml    | 18 ++++-
 app/src/main/res/values-night/themes.xml      |  7 ++
 app/src/main/res/values/attrs.xml             | 20 +++---
 app/src/main/res/values/colors.xml            |  5 ++
 app/src/main/res/values/strings.xml           |  3 +
 app/src/main/res/values/styles.xml            | 10 +++
 app/src/main/res/values/themes.xml            | 13 ++++
 13 files changed, 168 insertions(+), 30 deletions(-)
 create mode 100644 app/src/main/java/com/sucstepsoft/realtimelocation/activitys/common/SignRecordActivity.java
 create mode 100644 app/src/main/res/layout/activity_sign_record.xml
 create mode 100644 app/src/main/res/values-night/themes.xml
 create mode 100644 app/src/main/res/values/themes.xml

diff --git a/app/build.gradle b/app/build.gradle
index baf917d..8090931 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -53,6 +53,9 @@ android {
             keyPassword '123456'
         }
     }
+    buildFeatures {
+        viewBinding true
+    }
 }
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index dde8ab2..01432b2 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -10,8 +10,8 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 51,
-      "versionName": "1.5.1",
+      "versionCode": 52,
+      "versionName": "1.5.2",
       "outputFile": "app-release.apk"
     }
   ]
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index be886e1..044776d 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -48,12 +48,17 @@
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
         tools:ignore="GoogleAppIndexingWarning">
+        <activity
+            android:name=".activitys.common.SignRecordActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:exported="false"
+            android:label="@string/title_activity_sign_record"
+            android:theme="@style/AppTheme.Fullscreen" />
         <activity
             android:name=".activitys.census.newhouse.activitys.NewRuleHouseAddActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateHidden"
             tools:ignore="LockedOrientationActivity" />
-
         <activity
             android:name=".activitys.census.normal.CensusClaimListActivity"
             android:screenOrientation="portrait"
@@ -79,7 +84,6 @@
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateHidden"
             tools:ignore="LockedOrientationActivity" />
-
         <activity
             android:name=".activitys.census.newhouse.activitys.HouseLivePersonBindActivity"
             android:screenOrientation="portrait"
@@ -100,27 +104,21 @@
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateHidden"
             tools:ignore="LockedOrientationActivity" />
-
-
         <activity
             android:name=".activitys.census.house.NewCommunityDetailActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateHidden"
             tools:ignore="LockedOrientationActivity" />
-
         <activity
             android:name=".activitys.census.house.NewCommunityAddActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateHidden"
             tools:ignore="LockedOrientationActivity" />
-
-
         <activity
             android:name=".activitys.census.newhouse.activitys.BuildingViewPageActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateHidden"
             tools:ignore="LockedOrientationActivity" />
-
         <activity
             android:name=".activitys.census.special.CensusDisputeDetailActivity"
             android:screenOrientation="portrait"
@@ -136,7 +134,6 @@
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateHidden"
             tools:ignore="LockedOrientationActivity" />
-
         <activity
             android:name=".activitys.census.special.CensusPetitionDetailActivity"
             android:screenOrientation="portrait"
@@ -152,32 +149,26 @@
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateHidden"
             tools:ignore="LockedOrientationActivity" />
-
         <activity
             android:name=".activitys.census.special.CensusHeresyAddActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateHidden"
             tools:ignore="LockedOrientationActivity" />
-
         <activity
             android:name=".activitys.census.special.CensusHeresyDetailActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateHidden"
             tools:ignore="LockedOrientationActivity" />
-
         <activity
             android:name=".activitys.census.special.CensusHeresyListActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateHidden"
             tools:ignore="LockedOrientationActivity" />
-
-
         <activity
             android:name=".activitys.common.WorkSignActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateHidden"
             tools:ignore="LockedOrientationActivity" />
-
         <activity
             android:name=".activitys.addresslist.SearchGridActivity"
             android:screenOrientation="portrait"
@@ -278,13 +269,11 @@
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateHidden"
             tools:ignore="LockedOrientationActivity" />
-
         <activity
             android:name=".activitys.census.house.NewSearchPersonByHouseActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateHidden"
             tools:ignore="LockedOrientationActivity" />
-
         <activity
             android:name=".activitys.census.house.SearchHouseByPersonActivity"
             android:screenOrientation="portrait"
diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/common/SignRecordActivity.java b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/common/SignRecordActivity.java
new file mode 100644
index 0000000..73ad80d
--- /dev/null
+++ b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/common/SignRecordActivity.java
@@ -0,0 +1,16 @@
+package com.sucstepsoft.realtimelocation.activitys.common;
+
+import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity;
+import com.sucstepsoft.realtimelocation.R;
+
+/**
+ * An example full-screen activity that shows and hides the system UI (i.e.
+ * status bar and navigation/system bar) with user interaction.
+ */
+public class SignRecordActivity extends BaseActivity {
+
+    @Override
+    protected int setLayoutId() {
+        return R.layout.activity_sign_record;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/common/WorkSignActivity.java b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/common/WorkSignActivity.java
index ac730ee..23e5787 100644
--- a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/common/WorkSignActivity.java
+++ b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/common/WorkSignActivity.java
@@ -9,7 +9,6 @@ import android.text.TextUtils;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.ZoomControls;
@@ -104,6 +103,8 @@ public class WorkSignActivity extends BaseActivity {
     ImageView mIvSignInState;
     @BindView(R.id.iv_sign_out_state)
     ImageView mIvSignOutState;
+    @BindView(R.id.btn_sign_record)
+    Button mBtnSignRecord;
     private List<List<LatLng>> mPenLineList;
     private BaiduMap mBaiduMap;
     private BDLocation mCurrent;
@@ -188,7 +189,9 @@ public class WorkSignActivity extends BaseActivity {
         getCurrentTime();
         checkSign();
         mLlSign.setOnClickListener(v -> doSign());
+        mBtnSignRecord.setOnClickListener(v->startActivity(new Intent(mActivity,SignRecordActivity.class)));
         refreshView(STATE_LOAD_SUCCESS);
+
     }
 
     /**
diff --git a/app/src/main/res/layout/activity_sign_record.xml b/app/src/main/res/layout/activity_sign_record.xml
new file mode 100644
index 0000000..8cb7890
--- /dev/null
+++ b/app/src/main/res/layout/activity_sign_record.xml
@@ -0,0 +1,71 @@
+<?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:orientation="vertical">
+
+    <LinearLayout
+        android:id="@+id/ll_content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                style="@style/issue_report_title"
+                android:drawableLeft="@drawable/ic_item_title_icon_rec"
+                android:drawablePadding="5dp"
+                android:padding="8dp"
+                android:text="签到记录"
+                android:textStyle="bold" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                android:orientation="vertical"
+                android:paddingLeft="20dp"
+                android:paddingRight="20dp">
+
+
+                <LinearLayout style="@style/item_white_bottom_border">
+
+
+                    <TextView
+                        style="@style/item_title_wrap"
+                        android:text="时间" />
+
+                    <ImageView
+                        style="@style/style_hint_star"
+                        android:layout_gravity="center_vertical" />
+
+                    <TextView
+                        android:id="@+id/tv_crime_date"
+                        style="@style/sel_text_arrow"
+                        android:hint="请选择发生时间" />
+                </LinearLayout>
+
+
+            </LinearLayout>
+
+
+            <Button
+                android:id="@+id/btn_confirm"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="15dp"
+                android:background="@drawable/sel_btn_submit"
+                android:minHeight="0dp"
+                android:padding="10dp"
+                android:text="查&#160;&#160;&#160;&#160;询"
+                android:textColor="@color/white"
+                android:textSize="17sp" />
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_work_sign.xml b/app/src/main/res/layout/activity_work_sign.xml
index 1aba064..d2573ef 100644
--- a/app/src/main/res/layout/activity_work_sign.xml
+++ b/app/src/main/res/layout/activity_work_sign.xml
@@ -56,6 +56,20 @@
                     tools:text="部门职位" />
             </LinearLayout>
 
+            <Button
+                android:id="@+id/btn_sign_record"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/sel_btn_submit"
+                android:minWidth="0dp"
+                android:minHeight="0dp"
+                android:paddingLeft="15dp"
+                android:paddingTop="5dp"
+                android:paddingRight="15dp"
+                android:paddingBottom="5dp"
+                android:text="记录"
+                android:textColor="@color/col_white_black" />
+
         </LinearLayout>
 
         <LinearLayout
@@ -189,9 +203,9 @@
         <ImageView
             android:id="@+id/iv_state"
             android:layout_width="wrap_content"
-            android:src="@drawable/ic_reload_refresh"
+            android:layout_height="wrap_content"
             android:layout_centerInParent="true"
-            android:layout_height="wrap_content" />
+            android:src="@drawable/ic_reload_refresh" />
 
         <TextView
             android:id="@+id/tv_state"
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
new file mode 100644
index 0000000..ce75692
--- /dev/null
+++ b/app/src/main/res/values-night/themes.xml
@@ -0,0 +1,7 @@
+<resources>
+
+    <style name="ThemeOverlay.RealTimeLocation.FullscreenContainer" parent="">
+        <item name="fullscreenBackgroundColor">@color/light_blue_900</item>
+        <item name="fullscreenTextColor">@color/light_blue_A400</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index d7f26d5..1d95b86 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -3,19 +3,19 @@
     <!-- 自定义星星属性 -->
     <declare-styleable name="star">
         //星星数量
-        <attr format="integer" name="starsNum"></attr>
+        <attr name="starsNum" format="integer"></attr>
         //星星宽度
-        <attr format="dimension" name="starWidth"></attr>
+        <attr name="starWidth" format="dimension"></attr>
         //星星高度
-        <attr format="dimension" name="starHeight"></attr>
+        <attr name="starHeight" format="dimension"></attr>
         //星星间距
-        <attr format="dimension" name="starDistance"></attr>
+        <attr name="starDistance" format="dimension"></attr>
         //星星背景
-        <attr format="reference" name="starBackground"></attr>
+        <attr name="starBackground" format="reference"></attr>
         //星星变化背景
-        <attr format="reference" name="starDrawBackground"></attr>
+        <attr name="starDrawBackground" format="reference"></attr>
         //控件是否可以点击
-        <attr format="boolean" name="starClickable"></attr>
+        <attr name="starClickable" format="boolean"></attr>
 
     </declare-styleable>
     <declare-styleable name="ExpandableLinearLayout">
@@ -24,7 +24,7 @@
         <!--提示文字的大小-->
         <attr name="tipTextSize" format="dimension" />
         <!--字体颜色-->
-        <attr name="tipTextColor" format="color"/>
+        <attr name="tipTextColor" format="color" />
         <!--待展开的文字提示-->
         <attr name="expandText" format="string" />
         <!--待收起时的文字提示-->
@@ -34,4 +34,8 @@
         <!--是否使用默认的底部-->
         <attr name="useDefaultBottom" format="boolean" />
     </declare-styleable>
+    <declare-styleable name="FullscreenAttrs">
+        <attr name="fullscreenBackgroundColor" format="color" />
+        <attr name="fullscreenTextColor" format="color" />
+    </declare-styleable>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 605027f..90121c4 100755
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -9,4 +9,9 @@
     <color name="red_ff">#FF0000</color>
     <color name="transparent_1">#AA000000</color>
     <color name="blue_line">#00BEF7</color>
+    <color name="light_blue_600">#FF039BE5</color>
+    <color name="light_blue_900">#FF01579B</color>
+    <color name="light_blue_A200">#FF40C4FF</color>
+    <color name="light_blue_A400">#FF00B0FF</color>
+    <color name="black_overlay">#66000000</color>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5aa2916..8ff0738 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -44,4 +44,7 @@
         <item>N员上报(自处理)</item>
     </string-array>
     <string name="uninput">未录入</string>
+    <string name="title_activity_sign_record">SignRecordActivity</string>
+    <string name="dummy_button">Dummy Button</string>
+    <string name="dummy_content">DUMMY\nCONTENT</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b0930dd..523d4ae 100755
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -158,6 +158,7 @@
         <item name="android:textSize">13sp</item>
         <item name="android:textColor">@color/black</item>
     </style>
+
     <style name="sel_text_arrow_text">
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_height">wrap_content</item>
@@ -251,4 +252,13 @@
         <item name="android:paddingRight">20dp</item>
         <item name="android:paddingBottom">10dp</item>
     </style>
+
+    <style name="Widget.AppTheme.ActionBar.Fullscreen" parent="Widget.AppCompat.ActionBar">
+        <item name="android:background">@color/black_overlay</item>
+    </style>
+
+    <style name="Widget.AppTheme.ButtonBar.Fullscreen" parent="">
+        <item name="android:background">@color/black_overlay</item>
+        <item name="android:buttonBarStyle">?android:attr/buttonBarStyle</item>
+    </style>
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
new file mode 100644
index 0000000..73fec53
--- /dev/null
+++ b/app/src/main/res/values/themes.xml
@@ -0,0 +1,13 @@
+<resources>
+
+    <style name="AppTheme.Fullscreen" parent="AppTheme">
+        <item name="android:actionBarStyle">@style/Widget.AppTheme.ActionBar.Fullscreen</item>
+        <item name="android:windowActionBarOverlay">true</item>
+        <item name="android:windowBackground">@null</item>
+    </style>
+
+    <style name="ThemeOverlay.RealTimeLocation.FullscreenContainer" parent="">
+        <item name="fullscreenBackgroundColor">@color/light_blue_600</item>
+        <item name="fullscreenTextColor">@color/light_blue_A200</item>
+    </style>
+</resources>
\ No newline at end of file