修改登录页面背景图

.idea/deploymentTargetDropDown.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <value>
+      <entry key="app">
+        <State />
+      </entry>
+    </value>
+  </component>
+</project>

.idea/migrations.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectMigrations">
+    <option name="MigrateToGradleLocalJavaHome">
+      <set>
+        <option value="$PROJECT_DIR$" />
+      </set>
+    </option>
+  </component>
+</project>

.idea/misc.xml

@@ -6,4 +6,11 @@
   <component name="ProjectType">
     <option name="id" value="Android" />
   </component>
+  <component name="VisualizationToolProject">
+    <option name="state">
+      <ProjectState>
+        <option name="scale" value="0.9373776908023483" />
+      </ProjectState>
+    </option>
+  </component>
 </project>

app/release/output-metadata.json

@@ -10,8 +10,8 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 2,
-      "versionName": "1.0.1",
+      "versionCode": 5,
+      "versionName": "1.0.4",
       "outputFile": "app-release.apk"
     }
   ]

app/src/main/AndroidManifest.xml

@@ -30,9 +30,17 @@
             android:name=".activitys.MainActivity"
             android:launchMode="singleTop" />
 
-        <activity android:name=".activitys.DepartmentActivity" />
-        <activity android:name=".activitys.DetailActivity" />
-        <activity android:name=".activitys.SearchActivity" />
-        <activity android:name=".activitys.CropImgActivity" />
+        <activity
+            android:name=".activitys.DepartmentActivity"
+            />
+        <activity
+            android:name=".activitys.DetailActivity"
+            />
+        <activity
+            android:name=".activitys.SearchActivity"
+             />
+        <activity
+            android:name=".activitys.CropImgActivity"
+             />
     </application>
 </manifest>

app/src/main/java/com/tenlion/soft/address_list/activitys/LoginActivity.java

@@ -12,6 +12,7 @@ import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
+import android.widget.TextView;
 
 import com.tenlion.soft.address_list.BaseApplication;
 import com.tenlion.soft.address_list.R;
@@ -27,10 +28,14 @@ import com.tenlionsoft.baselib.core.widget.base.BaseActivity;
 import com.tenlionsoft.baselib.utils.FileIOUtils;
 import com.tenlionsoft.baselib.utils.LogUtils;
 import com.tenlionsoft.baselib.utils.PermissionUtils;
+import com.tenlionsoft.baselib.utils.TimeUtils;
 import com.tenlionsoft.baselib.utils.ToastUtils;
 
 import java.io.File;
 import java.io.IOException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.UUID;
 
 import butterknife.BindView;
@@ -53,6 +58,8 @@ public class LoginActivity extends BaseActivity {
     ImageView mIvShowPwd;
     @BindView(R.id.iv_clear_phone)
     ImageView mIvClosePhone;
+//    @BindView(R.id.tv_time)
+//    TextView mTvTime;
     private Unbinder mUnbinder;
     private boolean isShowPwd = false;
 
@@ -136,7 +143,23 @@ public class LoginActivity extends BaseActivity {
         }
     }
 
+//    SimpleDateFormat format = new SimpleDateFormat("MM-dd HH:mm");
+
     private void login() {
+
+//        String start = mEtUserPhone.getText().toString().trim();
+//        String end = mEtUserPwd.getText().toString().trim();
+//        if (TextUtils.isEmpty(start) || TextUtils.isEmpty(end)) return;
+//        start = start.replaceAll("/", " ");
+//        end = end.replaceAll("/", " ");
+//        try {
+//            Date startDate = format.parse(start);
+//            Date endDate = format.parse(end);
+//            String fitTimeSpan = TimeUtils.getFitTimeSpan(startDate, endDate, 3);
+//            mTvTime.setText(fitTimeSpan);
+//        } catch (ParseException e) {
+//            throw new RuntimeException(e);
+//        }
         if (checkUserInputInfo()) {
             String userName = mEtUserPhone.getText().toString().trim();
             String pwd = mEtUserPwd.getText().toString().trim();

app/src/main/java/com/tenlion/soft/address_list/activitys/MainActivity.java

@@ -218,19 +218,18 @@ public class MainActivity extends BaseActivity {
     }
 
     private void checkPermission() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            boolean isInstall = getPackageManager().canRequestPackageInstalls();
-            if (isInstall) {
+//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+//            boolean isInstall = getPackageManager().canRequestPackageInstalls();
+//            if (isInstall) {
                 checkAppVersion();
-            } else {
-                ToastUtils.showLong("App升级需要使用安装未知来源的权限,请授权.");
-//                Intent intent = new Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES);
-                Intent intent = new Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES, Uri.parse("package:" + getPackageName()));
-                startActivityForResult(intent, 10086);
-            }
-        } else {
-            checkAppVersion();
-        }
+//            } else {
+//                ToastUtils.showLong("App升级需要使用安装未知来源的权限,请授权.");
+//                Intent intent = new Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES, Uri.parse("package:" + MainActivity.this.getPackageName()));
+//                startActivityForResult(intent, 10086);
+//            }
+//        } else {
+//            checkAppVersion();
+//        }
     }
 
     /**

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/login_bg">
@@ -29,10 +30,25 @@
                 android:hint="输入您的账号"
                 android:maxLines="1"
                 android:padding="10dp"
-                android:textColor="@color/white"
+                android:textColor="@color/black"
                 android:textColorHint="@color/white"
                 android:textSize="14sp"
                 android:typeface="monospace" />
+            <!--            <EditText-->
+            <!--                android:id="@+id/et_user_phone"-->
+            <!--                android:layout_width="match_parent"-->
+            <!--                android:layout_height="wrap_content"-->
+            <!--                android:background="@null"-->
+            <!--                android:hint="开始时间"-->
+            <!--                android:inputType="number"-->
+            <!--                android:maxLines="1"-->
+            <!--                android:imeOptions="actionNext"-->
+            <!--                android:singleLine="true"-->
+            <!--                android:padding="10dp"-->
+            <!--                android:textColor="@color/black"-->
+            <!--                android:textColorHint="@color/white"-->
+            <!--                android:textSize="14sp"-->
+            <!--                android:typeface="monospace" />-->
 
             <ImageView
                 android:id="@+id/iv_clear_phone"
@@ -64,10 +80,25 @@
                 android:inputType="textPassword"
                 android:maxLines="1"
                 android:padding="10dp"
-                android:textColor="@color/white"
+                android:textColor="@color/black"
                 android:textColorHint="@color/white"
                 android:textSize="14sp"
                 android:typeface="monospace" />
+            <!--            <EditText-->
+            <!--                android:id="@+id/et_user_pwd"-->
+            <!--                android:layout_width="match_parent"-->
+            <!--                android:layout_height="wrap_content"-->
+            <!--                android:background="@null"-->
+            <!--                android:hint="结束时间"-->
+            <!--                android:singleLine="true"-->
+            <!--                android:inputType="number"-->
+            <!--                android:maxLines="1"-->
+            <!--                android:padding="10dp"-->
+            <!--                android:imeOptions="actionNext"-->
+            <!--                android:textColor="@color/black"-->
+            <!--                android:textColorHint="@color/white"-->
+            <!--                android:textSize="14sp"-->
+            <!--                android:typeface="monospace" />-->
 
             <ImageView
                 android:id="@+id/iv_show_pwd"
@@ -79,6 +110,14 @@
                 android:background="@drawable/ic_hide_pwd" />
         </RelativeLayout>
 
+        <TextView
+            android:id="@+id/tv_time"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textColor="@color/black"
+            android:textSize="18sp"
+            tools:text="23423" />
+
 
         <Button
             android:id="@+id/btn_confirm"
@@ -87,6 +126,7 @@
             android:layout_below="@id/rl_pwd"
             android:layout_marginTop="50dp"
             android:background="@drawable/sel_btn_submit"
+            android:gravity="center"
             android:minHeight="0dp"
             android:padding="10dp"
             android:text="登  录"

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

@@ -109,7 +109,7 @@
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="监管掌上通"
+                            android:text="狱务掌上通"
                             android:textSize="15sp" />
                     </LinearLayout>
 

app/src/main/res/values-v26/style.xml

@@ -106,13 +106,16 @@
         <item name="colorAccent">@color/main_theme</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowAnimationStyle">@style/AnimationActivity</item>
-        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowIsTranslucent">false</item>
+        <item name="android:windowDisablePreview">true</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:typeface">monospace</item>
         <item name="android:forceDarkAllowed" tools:targetApi="q">true</item>
     </style>
     <style name="CustomAppTheme" parent="@android:style/Theme.Light.NoTitleBar.Fullscreen">
         <item name="android:windowFullscreen">true</item>
+        <item name="android:windowIsTranslucent">false</item>
+        <item name="android:windowDisablePreview">true</item>
     </style>
 
     <style name="AppSplashTheme" parent="Theme.AppCompat.Light.NoActionBar">

app/src/main/res/values-v27/style.xml

@@ -106,13 +106,16 @@
         <item name="colorAccent">@color/main_theme</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowAnimationStyle">@style/AnimationActivity</item>
-        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowIsTranslucent">false</item>
+        <item name="android:windowDisablePreview">true</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:typeface">monospace</item>
         <item name="android:forceDarkAllowed" tools:targetApi="q">true</item>
     </style>
     <style name="CustomAppTheme" parent="@android:style/Theme.Light.NoTitleBar.Fullscreen">
         <item name="android:windowFullscreen">true</item>
+        <item name="android:windowIsTranslucent">false</item>
+        <item name="android:windowDisablePreview">true</item>
     </style>
 
     <style name="AppSplashTheme" parent="Theme.AppCompat.Light.NoActionBar">

app/src/main/res/values/styles.xml

@@ -106,12 +106,15 @@
         <item name="colorAccent">@color/main_theme</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowAnimationStyle">@style/AnimationActivity</item>
-        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowIsTranslucent">false</item>
+        <item name="android:windowDisablePreview">true</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:typeface">monospace</item>
     </style>
     <style name="CustomAppTheme" parent="@android:style/Theme.Light.NoTitleBar.Fullscreen">
         <item name="android:windowFullscreen">true</item>
+        <item name="android:windowIsTranslucent">false</item>
+        <item name="android:windowDisablePreview">true</item>
     </style>
 
     <style name="AppSplashTheme" parent="Theme.AppCompat.Light.NoActionBar">