backup

config.gradle

@@ -45,7 +45,7 @@ ext {
             "m-confide"       : "0.0.47",
             "m-consultant"    : "0.0.56",
             "m-fm"            : "0.0.28",
-            "m-user"          : "0.0.51",
+            "m-user"          : "0.0.52",
             "m-home"          : "0.0.18",
             "m-im"            : "0.0.11",
             "m-dynamic"       : "0.0.5.1",

m-user/src/main/java/com/yidianling/user/ui/login/SecretActivity.kt

 package com.yidianling.user.ui.login
 
-import android.annotation.SuppressLint
 import android.app.Activity
-import android.content.Context
 import android.content.Intent
 import android.os.Build
-import android.os.Handler
-import android.support.v4.app.ActivityCompat.startActivityForResult
 import android.text.Html
 import android.view.KeyEvent
 import com.ydl.ydlcommon.base.BaseActivity
 import com.ydl.ydlcommon.base.BaseApp
-import com.ydl.ydlcommon.utils.ActivityManager
 import com.ydl.ydlcommon.utils.SharedPreferencesEditor
 import com.ydl.ydlcommon.utils.StatusBarUtils
 import com.yidianling.common.tools.RxAppTool
-import com.yidianling.common.tools.ToastUtil
 import com.yidianling.user.R
 import com.yidianling.user.UserHelper
-import com.yidianling.user.http.UserHttpImpl
 import com.yidianling.user.widget.SecretDialog
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
 import kotlinx.android.synthetic.main.user_activity_secret.*
-import kotlin.system.exitProcess
 
 /**
  * 隐私界面
@@ -37,7 +27,7 @@ class SecretActivity : BaseActivity() {
     private var mSecretProtocolString: String = ""
 
     companion object {
-        val SECRET_PROTOCOL:String = "secret_protocol"
+        val SECRET_PROTOCOL: String = "secret_protocol"
         val SECRET_PAGE_REQUEST_CODE: Int = 40000002
         val SECRET_PAGE_REQUEST_OK_CODE: Int = 40000003
         val SECRET_PAGE_REQUEST_FAILURE_CODE: Int = 40000004
@@ -45,7 +35,7 @@ class SecretActivity : BaseActivity() {
         fun startProtocol(context: Activity, secretProtocolString: String) {
             val intent = Intent(context, SecretActivity::class.java)
             intent.putExtra(SECRET_PROTOCOL, secretProtocolString)
-            startActivityForResult(context, intent, SECRET_PAGE_REQUEST_CODE, null)
+            context.startActivityForResult(intent, SECRET_PAGE_REQUEST_CODE)
         }
     }
 
@@ -60,7 +50,7 @@ class SecretActivity : BaseActivity() {
     }
 
     private fun getParam() {
-        mSecretProtocolString = intent.getStringExtra(SECRET_PROTOCOL)?:""
+        mSecretProtocolString = intent.getStringExtra(SECRET_PROTOCOL) ?: ""
         if (null != user_secret_desc) {
             user_secret_desc.text = Html.fromHtml(mSecretProtocolString)
         }