beta 1.0

Author: likai79511

.idea/misc.xml

@@ -11,7 +11,7 @@ android {
         applicationId "k.agera.com.locationwidget"
         minSdkVersion 21
         targetSdkVersion 19
-        versionCode 1
+        versionCode 2
         versionName "1.0"
 
         vectorDrawables.useSupportLibrary = true

app/build.gradle

@@ -31,7 +31,8 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".base.SplashActivity">
+        <activity android:name=".base.SplashActivity"
+            android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -41,10 +42,12 @@
 
         <activity
             android:name=".login.SignUpActivity"
-            android:windowSoftInputMode="adjustPan" />
+            android:windowSoftInputMode="adjustPan"
+            android:launchMode="singleTask"/>
         <activity
             android:name=".login.SignInActivity"
-            android:windowSoftInputMode="adjustPan" />
+            android:windowSoftInputMode="adjustPan"
+            android:launchMode="singleTask"/>
 
         <activity android:name=".base.MainActivity" />
 

app/src/main/AndroidManifest.xml

@@ -42,6 +42,11 @@ class SignInActivity : BaseActivity(), Updatable {
         mEt_accound = findViewById(R.id.et_account) as EditText
         mEt_password = findViewById(R.id.et_password) as EditText
 
+        var account = intent?.getStringExtra("account")
+        account?.let {
+            mEt_accound?.setText(account)
+        }
+
         initEvents()
     }
 
@@ -57,6 +62,11 @@ class SignInActivity : BaseActivity(), Updatable {
             startActivity(Intent(SignInActivity@ this, SignUpActivity::class.java))
         }
 
+        findViewById(R.id.ll_root).setOnClickListener {
+            var imm = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+            imm.hideSoftInputFromWindow(it.windowToken, 0)
+        }
+
         mRep = Repositories.repositoryWithInitialValue(Result.absent<String>())
                 .observe(clickObservable)
                 .onUpdatesPerLoop()

app/src/main/java/k/agera/com/locationwidget/login/SignInActivity.kt

@@ -9,12 +9,12 @@ import com.google.android.agera.Repositories
 import com.google.android.agera.Repository
 import com.google.android.agera.Result
 import com.google.android.agera.Updatable
-import k.agera.com.locationwidget.base.BaseActivity
-import k.agera.com.locationwidget.utils.CommonUtils
 import k.agera.com.locationwidget.MyApp
 import k.agera.com.locationwidget.R
+import k.agera.com.locationwidget.base.BaseActivity
 import k.agera.com.locationwidget.core.TaskDriver
 import k.agera.com.locationwidget.observable.ClickObservable
+import k.agera.com.locationwidget.utils.CommonUtils
 
 /**
  * Created by Agera on 2018/8/21.
@@ -49,6 +49,11 @@ class SignUpActivity : BaseActivity(), Updatable {
             (MyApp.instance().getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager).hideSoftInputFromWindow(it.windowToken, 0)
             clickObservable.onClick(it)
         }
+        findViewById(R.id.ll_root).setOnClickListener {
+            var imm = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+            imm.hideSoftInputFromWindow(it.windowToken, 0)
+        }
+
         mRep = Repositories.repositoryWithInitialValue(Result.absent<String>())
                 .observe(clickObservable)
                 .onUpdatesPerLoop()
@@ -99,7 +104,9 @@ class SignUpActivity : BaseActivity(), Updatable {
     override fun update() {
         CommonUtils.instance().showShortMessage(mEt_accound, "注册成功，跳转登录页面...")
         TaskDriver.instance().mMainHandler.postDelayed({
-            startActivity(Intent(SignUpActivity@ this, SignInActivity::class.java))
+            var intent = Intent(SignUpActivity@ this, SignInActivity::class.java)
+            intent.putExtra("account", account)
+            startActivity(intent)
             finish()
         }, 1_500)
     }

app/src/main/java/k/agera/com/locationwidget/login/SignUpActivity.kt

@@ -160,7 +160,7 @@ class CommonUtils private constructor() {
     fun startDaemon() {
         var build = JobInfo.Builder(0, ComponentName(ctx.baseContext, DaemonService::class.java))
         build.setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY)
-        build.setPeriodic(if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) 15 * 60 * 1000 else 10 * 60 * 1000)
+        build.setPeriodic(if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M) 15 * 60 * 1000 else 10 * 60 * 1000)
         build.setPersisted(true)
         (ctx.getSystemService(Context.JOB_SCHEDULER_SERVICE) as JobScheduler).schedule(build.build())
     }

app/src/main/java/k/agera/com/locationwidget/utils/CommonUtils.kt

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/ll_root"
+    android:clickable="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -41,6 +43,7 @@
             android:layout_marginTop="20dp"
             android:background="@drawable/circle_rect"
             android:hint="密码"
+            android:inputType="textPassword"
             android:padding="5dp" />
 
         <LinearLayout

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

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/ll_root"
+    android:clickable="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -40,6 +42,7 @@
             android:layout_height="50dp"
             android:layout_marginTop="20dp"
             android:background="@drawable/circle_rect"
+            android:inputType="textPassword"
             android:hint="密码"
             android:padding="5dp" />