diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/.idea/.gitignore b/.idea/.gitignore old mode 100644 new mode 100755 diff --git a/.idea/compiler.xml b/.idea/compiler.xml old mode 100644 new mode 100755 diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml new file mode 100644 index 0000000..0c0c338 --- /dev/null +++ b/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml old mode 100644 new mode 100755 diff --git a/.idea/migrations.xml b/.idea/migrations.xml new file mode 100644 index 0000000..f8051a6 --- /dev/null +++ b/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 494b1d6..e6838ae 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,4 +6,11 @@ + + + \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore old mode 100644 new mode 100755 diff --git a/app/build.gradle b/app/build.gradle old mode 100644 new mode 100755 diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro old mode 100644 new mode 100755 diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index af5244c..e2a0d08 100644 --- a/app/release/output-metadata.json +++ b/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" } ] diff --git a/app/src/androidTest/java/com/tenlion/soft/address_list/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/tenlion/soft/address_list/ExampleInstrumentedTest.java old mode 100644 new mode 100755 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml old mode 100644 new mode 100755 index 6e1c79b..aa69f1e --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -30,9 +30,17 @@ android:name=".activitys.MainActivity" android:launchMode="singleTop" /> - - - - + + + + \ No newline at end of file diff --git a/app/src/main/java/com/tenlion/soft/address_list/activitys/LoginActivity.java b/app/src/main/java/com/tenlion/soft/address_list/activitys/LoginActivity.java index 9635fbe..a1a2c4c 100755 --- a/app/src/main/java/com/tenlion/soft/address_list/activitys/LoginActivity.java +++ b/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(); diff --git a/app/src/main/java/com/tenlion/soft/address_list/activitys/MainActivity.java b/app/src/main/java/com/tenlion/soft/address_list/activitys/MainActivity.java index 6c9c957..614012a 100755 --- a/app/src/main/java/com/tenlion/soft/address_list/activitys/MainActivity.java +++ b/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(); +// } } /** diff --git a/app/src/main/res/drawable-hdpi/app_logo.png b/app/src/main/res/drawable-hdpi/app_logo.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/app_logo.png b/app/src/main/res/drawable-mdpi/app_logo.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/app_logo.png b/app/src/main/res/drawable-xhdpi/app_logo.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/login_bg.jpg b/app/src/main/res/drawable-xhdpi/login_bg.jpg deleted file mode 100644 index 93b4b8c..0000000 Binary files a/app/src/main/res/drawable-xhdpi/login_bg.jpg and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/login_bg.png b/app/src/main/res/drawable-xhdpi/login_bg.png new file mode 100644 index 0000000..0761838 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/login_bg.png differ diff --git a/app/src/main/res/drawable-xxhdpi/app_logo.png b/app/src/main/res/drawable-xxhdpi/app_logo.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxxhdpi/app_logo.png b/app/src/main/res/drawable-xxxhdpi/app_logo.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index f90924d..b0d4c17 100755 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -1,5 +1,6 @@ @@ -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" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +