From 17d97f58265510ceda0b38959a90424ee07b6910 Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Tue, 13 Nov 2018 11:42:07 +0800
Subject: [PATCH] 1.0.3-1测试版本 [*]修改重新连接的方式 [*]修改商城连接 [*]修改心跳机制 [*]主要针对oppo和vivo机型添加开启定位服务
---
app/src/main/java/com/moral/yunfushao/base/BaseActivity.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/app/src/main/java/com/moral/yunfushao/base/BaseActivity.java b/app/src/main/java/com/moral/yunfushao/base/BaseActivity.java
index 3e3d149..492cf0e 100644
--- a/app/src/main/java/com/moral/yunfushao/base/BaseActivity.java
+++ b/app/src/main/java/com/moral/yunfushao/base/BaseActivity.java
@@ -24,7 +24,7 @@
* Created by haijiang on 2017/5/2.
*/
-public abstract class BaseActivity extends AppCompatActivity implements View.OnClickListener{
+public abstract class BaseActivity extends AppCompatActivity implements View.OnClickListener {
/**
* ���������������
*/
@@ -42,6 +42,7 @@
* ���������������
*/
protected ToastUtils mToatUtils;
+
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -50,7 +51,7 @@
if (null != extras) {
getBundleExtras(extras);
}
- progressDialog = SweetDialogUtils.showProgressDialog(this,"������������������...",R.color.colorAccent);
+ progressDialog = SweetDialogUtils.showProgressDialog(this, "������������������...", R.color.colorAccent);
mToatUtils = new ToastUtils(this);
@@ -134,7 +135,7 @@
* ���������
*/
public void setEmptyView() {
- if(mEmptyLayout == null){
+ if (mEmptyLayout == null) {
return;
}
mEmptyLayout.setErrorType(EmptyLayout.NODATA);
@@ -144,7 +145,7 @@
* ������������
*/
public void setErrorView() {
- if(mEmptyLayout == null){
+ if (mEmptyLayout == null) {
return;
}
mEmptyLayout.setErrorType(EmptyLayout.NETWORK_ERROR);
@@ -154,7 +155,7 @@
* ������������
*/
public void setNormalView() {
- if(mEmptyLayout == null){
+ if (mEmptyLayout == null) {
return;
}
mEmptyLayout.dismiss();
@@ -164,7 +165,7 @@
* ���������������
*/
public void setLoadingView() {
- if(mEmptyLayout == null){
+ if (mEmptyLayout == null) {
return;
}
mEmptyLayout.setErrorType(EmptyLayout.NETWORK_LOADING);
@@ -172,6 +173,7 @@
/**
* ������findViewById
+ *
* @param viewId
* @param <E>
* @return
@@ -201,12 +203,13 @@
/**
* ������getActivity���null
+ *
* @param outState
*/
@Override
public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
- if(outState != null) {
+ if (outState != null) {
String FRAGMENTS_TAG = "android:support:fragments";
// remove������������Fragment
outState.remove(FRAGMENTS_TAG);
--
Gitblit v1.8.0