diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index fc0596e..744cf0b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -14,10 +14,7 @@ import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* -import kotlinx.android.synthetic.main.activity_order_completed_detail.imageRecyclerView -import kotlinx.android.synthetic.main.activity_order_completed_detail.wellCodeView -import kotlinx.android.synthetic.main.activity_order_completed_detail.wellLocationView -import kotlinx.android.synthetic.main.activity_well_detail.* +import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* class CompletedDetailActivity : BaseActivity() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index fc0596e..744cf0b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -14,10 +14,7 @@ import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* -import kotlinx.android.synthetic.main.activity_order_completed_detail.imageRecyclerView -import kotlinx.android.synthetic.main.activity_order_completed_detail.wellCodeView -import kotlinx.android.synthetic.main.activity_order_completed_detail.wellLocationView -import kotlinx.android.synthetic.main.activity_well_detail.* +import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* class CompletedDetailActivity : BaseActivity() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 1523822..1166fb3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -28,6 +28,7 @@ import com.pengxh.app.multilib.widget.dialog.BottomActionSheet import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_in_handle_detail.* +import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* import java.io.File diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index fc0596e..744cf0b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -14,10 +14,7 @@ import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* -import kotlinx.android.synthetic.main.activity_order_completed_detail.imageRecyclerView -import kotlinx.android.synthetic.main.activity_order_completed_detail.wellCodeView -import kotlinx.android.synthetic.main.activity_order_completed_detail.wellLocationView -import kotlinx.android.synthetic.main.activity_well_detail.* +import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* class CompletedDetailActivity : BaseActivity() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 1523822..1166fb3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -28,6 +28,7 @@ import com.pengxh.app.multilib.widget.dialog.BottomActionSheet import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_in_handle_detail.* +import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* import java.io.File diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index cd4fdff..1af3342 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -14,12 +14,15 @@ import com.casic.app.smartwell.utils.* import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginInViewModel +import com.casic.app.smartwell.vm.UserDetailViewModel import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_login.* class LoginActivity : BaseActivity() { private lateinit var authenticateViewModel: AuthenticateViewModel + private lateinit var loginInViewModel: LoginInViewModel + private lateinit var userDetailViewModel: UserDetailViewModel private val textWatcher = object : TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { @@ -47,11 +50,12 @@ } override fun initData() { - loginButton.setChangeAlphaWhenPress(true) // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(Constant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(Constant.PASSWORD, "") as String) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) + loginInViewModel = ViewModelProvider(this).get(LoginInViewModel::class.java) + userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) } override fun initEvent() { @@ -65,6 +69,8 @@ } false } + + loginButton.setChangeAlphaWhenPress(true) loginButton.setOnClickListener { val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() @@ -94,11 +100,12 @@ val dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!) //登录并获取Token，POST请求 - val loginInViewModel = ViewModelProvider(this).get(LoginInViewModel::class.java) loginInViewModel.login(account = account, secretKey = dataByPublicKey) loginInViewModel.resultModel.observe(this, { loginResult -> if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) + //获取token之后保存用户信息 + userDetailViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo(MainActivity::class.java) finish() diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index fc0596e..744cf0b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -14,10 +14,7 @@ import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* -import kotlinx.android.synthetic.main.activity_order_completed_detail.imageRecyclerView -import kotlinx.android.synthetic.main.activity_order_completed_detail.wellCodeView -import kotlinx.android.synthetic.main.activity_order_completed_detail.wellLocationView -import kotlinx.android.synthetic.main.activity_well_detail.* +import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* class CompletedDetailActivity : BaseActivity() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 1523822..1166fb3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -28,6 +28,7 @@ import com.pengxh.app.multilib.widget.dialog.BottomActionSheet import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_in_handle_detail.* +import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* import java.io.File diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index cd4fdff..1af3342 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -14,12 +14,15 @@ import com.casic.app.smartwell.utils.* import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginInViewModel +import com.casic.app.smartwell.vm.UserDetailViewModel import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_login.* class LoginActivity : BaseActivity() { private lateinit var authenticateViewModel: AuthenticateViewModel + private lateinit var loginInViewModel: LoginInViewModel + private lateinit var userDetailViewModel: UserDetailViewModel private val textWatcher = object : TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { @@ -47,11 +50,12 @@ } override fun initData() { - loginButton.setChangeAlphaWhenPress(true) // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(Constant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(Constant.PASSWORD, "") as String) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) + loginInViewModel = ViewModelProvider(this).get(LoginInViewModel::class.java) + userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) } override fun initEvent() { @@ -65,6 +69,8 @@ } false } + + loginButton.setChangeAlphaWhenPress(true) loginButton.setOnClickListener { val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() @@ -94,11 +100,12 @@ val dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!) //登录并获取Token，POST请求 - val loginInViewModel = ViewModelProvider(this).get(LoginInViewModel::class.java) loginInViewModel.login(account = account, secretKey = dataByPublicKey) loginInViewModel.resultModel.observe(this, { loginResult -> if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) + //获取token之后保存用户信息 + userDetailViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo(MainActivity::class.java) finish() diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index b128521..59c4d57 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -29,6 +29,7 @@ import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* import kotlinx.android.synthetic.main.activity_well_management.* +import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* import java.io.File @@ -112,8 +113,8 @@ val wellPosition = orderDetail.position.toString() wellLocationView.text = wellPosition if (wellPosition.length > 12) { - tipsImageView.visibility = View.VISIBLE - tipsImageView.setOnClickListener { + locationTipsView.visibility = View.VISIBLE + locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) .setTitle("窨井完整位置") @@ -122,7 +123,7 @@ .show() } } else { - tipsImageView.visibility = View.GONE + locationTipsView.visibility = View.GONE } //工单流转细节 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index fc0596e..744cf0b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -14,10 +14,7 @@ import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* -import kotlinx.android.synthetic.main.activity_order_completed_detail.imageRecyclerView -import kotlinx.android.synthetic.main.activity_order_completed_detail.wellCodeView -import kotlinx.android.synthetic.main.activity_order_completed_detail.wellLocationView -import kotlinx.android.synthetic.main.activity_well_detail.* +import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* class CompletedDetailActivity : BaseActivity() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 1523822..1166fb3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -28,6 +28,7 @@ import com.pengxh.app.multilib.widget.dialog.BottomActionSheet import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_in_handle_detail.* +import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* import java.io.File diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index cd4fdff..1af3342 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -14,12 +14,15 @@ import com.casic.app.smartwell.utils.* import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginInViewModel +import com.casic.app.smartwell.vm.UserDetailViewModel import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_login.* class LoginActivity : BaseActivity() { private lateinit var authenticateViewModel: AuthenticateViewModel + private lateinit var loginInViewModel: LoginInViewModel + private lateinit var userDetailViewModel: UserDetailViewModel private val textWatcher = object : TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { @@ -47,11 +50,12 @@ } override fun initData() { - loginButton.setChangeAlphaWhenPress(true) // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(Constant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(Constant.PASSWORD, "") as String) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) + loginInViewModel = ViewModelProvider(this).get(LoginInViewModel::class.java) + userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) } override fun initEvent() { @@ -65,6 +69,8 @@ } false } + + loginButton.setChangeAlphaWhenPress(true) loginButton.setOnClickListener { val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() @@ -94,11 +100,12 @@ val dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!) //登录并获取Token，POST请求 - val loginInViewModel = ViewModelProvider(this).get(LoginInViewModel::class.java) loginInViewModel.login(account = account, secretKey = dataByPublicKey) loginInViewModel.resultModel.observe(this, { loginResult -> if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) + //获取token之后保存用户信息 + userDetailViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo(MainActivity::class.java) finish() diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index b128521..59c4d57 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -29,6 +29,7 @@ import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* import kotlinx.android.synthetic.main.activity_well_management.* +import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* import java.io.File @@ -112,8 +113,8 @@ val wellPosition = orderDetail.position.toString() wellLocationView.text = wellPosition if (wellPosition.length > 12) { - tipsImageView.visibility = View.VISIBLE - tipsImageView.setOnClickListener { + locationTipsView.visibility = View.VISIBLE + locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) .setTitle("窨井完整位置") @@ -122,7 +123,7 @@ .show() } } else { - tipsImageView.visibility = View.GONE + locationTipsView.visibility = View.GONE } //工单流转细节 diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 1a5d9c1..6d24c0c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -22,6 +22,7 @@ import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* +import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* class NotProcessedDetailActivity : BaseActivity() { @@ -69,8 +70,8 @@ val wellPosition = orderDetail.position.toString() wellLocationView.text = wellPosition if (wellPosition.length > 12) { - tipsImageView.visibility = View.VISIBLE - tipsImageView.setOnClickListener { + locationTipsView.visibility = View.VISIBLE + locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) .setTitle("窨井完整位置") @@ -79,7 +80,7 @@ .show() } } else { - tipsImageView.visibility = View.GONE + locationTipsView.visibility = View.GONE } dispatchDateView.text = orderDetail.createTime diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index fc0596e..744cf0b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -14,10 +14,7 @@ import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* -import kotlinx.android.synthetic.main.activity_order_completed_detail.imageRecyclerView -import kotlinx.android.synthetic.main.activity_order_completed_detail.wellCodeView -import kotlinx.android.synthetic.main.activity_order_completed_detail.wellLocationView -import kotlinx.android.synthetic.main.activity_well_detail.* +import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* class CompletedDetailActivity : BaseActivity() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 1523822..1166fb3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -28,6 +28,7 @@ import com.pengxh.app.multilib.widget.dialog.BottomActionSheet import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_in_handle_detail.* +import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* import java.io.File diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index cd4fdff..1af3342 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -14,12 +14,15 @@ import com.casic.app.smartwell.utils.* import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginInViewModel +import com.casic.app.smartwell.vm.UserDetailViewModel import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_login.* class LoginActivity : BaseActivity() { private lateinit var authenticateViewModel: AuthenticateViewModel + private lateinit var loginInViewModel: LoginInViewModel + private lateinit var userDetailViewModel: UserDetailViewModel private val textWatcher = object : TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { @@ -47,11 +50,12 @@ } override fun initData() { - loginButton.setChangeAlphaWhenPress(true) // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(Constant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(Constant.PASSWORD, "") as String) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) + loginInViewModel = ViewModelProvider(this).get(LoginInViewModel::class.java) + userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) } override fun initEvent() { @@ -65,6 +69,8 @@ } false } + + loginButton.setChangeAlphaWhenPress(true) loginButton.setOnClickListener { val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() @@ -94,11 +100,12 @@ val dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!) //登录并获取Token，POST请求 - val loginInViewModel = ViewModelProvider(this).get(LoginInViewModel::class.java) loginInViewModel.login(account = account, secretKey = dataByPublicKey) loginInViewModel.resultModel.observe(this, { loginResult -> if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) + //获取token之后保存用户信息 + userDetailViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo(MainActivity::class.java) finish() diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index b128521..59c4d57 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -29,6 +29,7 @@ import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* import kotlinx.android.synthetic.main.activity_well_management.* +import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* import java.io.File @@ -112,8 +113,8 @@ val wellPosition = orderDetail.position.toString() wellLocationView.text = wellPosition if (wellPosition.length > 12) { - tipsImageView.visibility = View.VISIBLE - tipsImageView.setOnClickListener { + locationTipsView.visibility = View.VISIBLE + locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) .setTitle("窨井完整位置") @@ -122,7 +123,7 @@ .show() } } else { - tipsImageView.visibility = View.GONE + locationTipsView.visibility = View.GONE } //工单流转细节 diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 1a5d9c1..6d24c0c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -22,6 +22,7 @@ import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* +import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* class NotProcessedDetailActivity : BaseActivity() { @@ -69,8 +70,8 @@ val wellPosition = orderDetail.position.toString() wellLocationView.text = wellPosition if (wellPosition.length > 12) { - tipsImageView.visibility = View.VISIBLE - tipsImageView.setOnClickListener { + locationTipsView.visibility = View.VISIBLE + locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) .setTitle("窨井完整位置") @@ -79,7 +80,7 @@ .show() } } else { - tipsImageView.visibility = View.GONE + locationTipsView.visibility = View.GONE } dispatchDateView.text = orderDetail.createTime diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml index 4fee60e..eb38e88 100644 --- a/app/src/main/res/layout/activity_order_completed_detail.xml +++ b/app/src/main/res/layout/activity_order_completed_detail.xml @@ -20,169 +20,7 @@ android:orientation="vertical" android:padding="@dimen/dp_10"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) + //获取token之后保存用户信息 + userDetailViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo(MainActivity::class.java) finish() diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index b128521..59c4d57 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -29,6 +29,7 @@ import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* import kotlinx.android.synthetic.main.activity_well_management.* +import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* import java.io.File @@ -112,8 +113,8 @@ val wellPosition = orderDetail.position.toString() wellLocationView.text = wellPosition if (wellPosition.length > 12) { - tipsImageView.visibility = View.VISIBLE - tipsImageView.setOnClickListener { + locationTipsView.visibility = View.VISIBLE + locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) .setTitle("窨井完整位置") @@ -122,7 +123,7 @@ .show() } } else { - tipsImageView.visibility = View.GONE + locationTipsView.visibility = View.GONE } //工单流转细节 diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 1a5d9c1..6d24c0c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -22,6 +22,7 @@ import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* +import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* class NotProcessedDetailActivity : BaseActivity() { @@ -69,8 +70,8 @@ val wellPosition = orderDetail.position.toString() wellLocationView.text = wellPosition if (wellPosition.length > 12) { - tipsImageView.visibility = View.VISIBLE - tipsImageView.setOnClickListener { + locationTipsView.visibility = View.VISIBLE + locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) .setTitle("窨井完整位置") @@ -79,7 +80,7 @@ .show() } } else { - tipsImageView.visibility = View.GONE + locationTipsView.visibility = View.GONE } dispatchDateView.text = orderDetail.createTime diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml index 4fee60e..eb38e88 100644 --- a/app/src/main/res/layout/activity_order_completed_detail.xml +++ b/app/src/main/res/layout/activity_order_completed_detail.xml @@ -20,169 +20,7 @@ android:orientation="vertical" android:padding="@dimen/dp_10"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) + //获取token之后保存用户信息 + userDetailViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo(MainActivity::class.java) finish() diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index b128521..59c4d57 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -29,6 +29,7 @@ import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* import kotlinx.android.synthetic.main.activity_well_management.* +import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* import java.io.File @@ -112,8 +113,8 @@ val wellPosition = orderDetail.position.toString() wellLocationView.text = wellPosition if (wellPosition.length > 12) { - tipsImageView.visibility = View.VISIBLE - tipsImageView.setOnClickListener { + locationTipsView.visibility = View.VISIBLE + locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) .setTitle("窨井完整位置") @@ -122,7 +123,7 @@ .show() } } else { - tipsImageView.visibility = View.GONE + locationTipsView.visibility = View.GONE } //工单流转细节 diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 1a5d9c1..6d24c0c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -22,6 +22,7 @@ import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* +import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* class NotProcessedDetailActivity : BaseActivity() { @@ -69,8 +70,8 @@ val wellPosition = orderDetail.position.toString() wellLocationView.text = wellPosition if (wellPosition.length > 12) { - tipsImageView.visibility = View.VISIBLE - tipsImageView.setOnClickListener { + locationTipsView.visibility = View.VISIBLE + locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) .setTitle("窨井完整位置") @@ -79,7 +80,7 @@ .show() } } else { - tipsImageView.visibility = View.GONE + locationTipsView.visibility = View.GONE } dispatchDateView.text = orderDetail.createTime diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml index 4fee60e..eb38e88 100644 --- a/app/src/main/res/layout/activity_order_completed_detail.xml +++ b/app/src/main/res/layout/activity_order_completed_detail.xml @@ -20,169 +20,7 @@ android:orientation="vertical" android:padding="@dimen/dp_10"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) + //获取token之后保存用户信息 + userDetailViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo(MainActivity::class.java) finish() diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index b128521..59c4d57 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -29,6 +29,7 @@ import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* import kotlinx.android.synthetic.main.activity_well_management.* +import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* import java.io.File @@ -112,8 +113,8 @@ val wellPosition = orderDetail.position.toString() wellLocationView.text = wellPosition if (wellPosition.length > 12) { - tipsImageView.visibility = View.VISIBLE - tipsImageView.setOnClickListener { + locationTipsView.visibility = View.VISIBLE + locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) .setTitle("窨井完整位置") @@ -122,7 +123,7 @@ .show() } } else { - tipsImageView.visibility = View.GONE + locationTipsView.visibility = View.GONE } //工单流转细节 diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 1a5d9c1..6d24c0c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -22,6 +22,7 @@ import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* +import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* class NotProcessedDetailActivity : BaseActivity() { @@ -69,8 +70,8 @@ val wellPosition = orderDetail.position.toString() wellLocationView.text = wellPosition if (wellPosition.length > 12) { - tipsImageView.visibility = View.VISIBLE - tipsImageView.setOnClickListener { + locationTipsView.visibility = View.VISIBLE + locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) .setTitle("窨井完整位置") @@ -79,7 +80,7 @@ .show() } } else { - tipsImageView.visibility = View.GONE + locationTipsView.visibility = View.GONE } dispatchDateView.text = orderDetail.createTime diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml index 4fee60e..eb38e88 100644 --- a/app/src/main/res/layout/activity_order_completed_detail.xml +++ b/app/src/main/res/layout/activity_order_completed_detail.xml @@ -20,169 +20,7 @@ android:orientation="vertical" android:padding="@dimen/dp_10"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) + //获取token之后保存用户信息 + userDetailViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo(MainActivity::class.java) finish() diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index b128521..59c4d57 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -29,6 +29,7 @@ import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* import kotlinx.android.synthetic.main.activity_well_management.* +import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* import java.io.File @@ -112,8 +113,8 @@ val wellPosition = orderDetail.position.toString() wellLocationView.text = wellPosition if (wellPosition.length > 12) { - tipsImageView.visibility = View.VISIBLE - tipsImageView.setOnClickListener { + locationTipsView.visibility = View.VISIBLE + locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) .setTitle("窨井完整位置") @@ -122,7 +123,7 @@ .show() } } else { - tipsImageView.visibility = View.GONE + locationTipsView.visibility = View.GONE } //工单流转细节 diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 1a5d9c1..6d24c0c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -22,6 +22,7 @@ import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* +import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* class NotProcessedDetailActivity : BaseActivity() { @@ -69,8 +70,8 @@ val wellPosition = orderDetail.position.toString() wellLocationView.text = wellPosition if (wellPosition.length > 12) { - tipsImageView.visibility = View.VISIBLE - tipsImageView.setOnClickListener { + locationTipsView.visibility = View.VISIBLE + locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) .setTitle("窨井完整位置") @@ -79,7 +80,7 @@ .show() } } else { - tipsImageView.visibility = View.GONE + locationTipsView.visibility = View.GONE } dispatchDateView.text = orderDetail.createTime diff --git a/app/src/main/res/layout/activity_order_completed_detail.xml b/app/src/main/res/layout/activity_order_completed_detail.xml index 4fee60e..eb38e88 100644 --- a/app/src/main/res/layout/activity_order_completed_detail.xml +++ b/app/src/main/res/layout/activity_order_completed_detail.xml @@ -20,169 +20,7 @@ android:orientation="vertical" android:padding="@dimen/dp_10"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file