Skip to content

Commit 0b91256

Browse files
committed
修复了登录过期会 crash 的问题
1 parent 12417a3 commit 0b91256

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

app/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ android {
5757
person {
5858
dimension "mode"
5959
applicationId "net.coding.program"
60-
versionCode 541
61-
versionName "5.4.1.20180712.2"
60+
versionCode 542
61+
versionName "5.4.2.20180724.1"
6262
targetSdkVersion 23
6363

6464
manifestPlaceholders = [
@@ -70,8 +70,8 @@ android {
7070
enterprise {
7171
dimension "mode"
7272
applicationId "net.coding.program.enterprise"
73-
versionCode 296
74-
versionName "2.9.6.20180712.2"
73+
versionCode 297
74+
versionName "2.9.7.20180724.1"
7575
targetSdkVersion 21
7676

7777
// 信鸽依赖

app/enterprise/release/output.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":296,"versionName":"2.9.6.20180712.2","enabled":true,"outputFile":"app-enterprise-release.apk","fullName":"enterpriseRelease","baseName":"enterprise-release"},"path":"app-enterprise-release.apk","properties":{}}]

app/src/main/java/net/coding/program/MainActivity.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ public class MainActivity extends BaseActivity {
8686

8787
private long exitTime = 0;
8888
private boolean mKeyboardUp;
89+
private boolean isResume = false;
8990

9091
public static void setNeedWarnEmailNoValidLogin() {
9192
sNeedWarnEmailNoValidLogin = true;
@@ -140,13 +141,12 @@ protected void onCreate(Bundle savedInstanceState) {
140141

141142
requestPermission();
142143

143-
144144
WXPay.getInstance().regToWeixin(this);
145145
}
146146

147147
@UiThread(delay = 2000)
148148
void requestPermission() {
149-
if (MainActivity.this.isFinishing()) {
149+
if (!isResume) {
150150
return;
151151
}
152152

@@ -165,6 +165,7 @@ void startExtraServiceDelay() {
165165
@Override
166166
public void onResume() {
167167
super.onResume();
168+
isResume = true;
168169

169170
handerNotify = new Handler(getMainLooper()) {
170171
@Override
@@ -183,6 +184,7 @@ public void handleMessage(Message msg) {
183184
@Override
184185
public void onPause() {
185186
super.onPause();
187+
isResume = false;
186188

187189
if (handerNotify != null) {
188190
handerNotify.removeMessages(0);

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,10 @@
127127

128128
</FrameLayout>
129129

130-
<View style="@style/DivideLine" />
131-
132130
<LinearLayout
133131
android:layout_width="match_parent"
134132
android:layout_height="75dp"
133+
android:visibility="gone"
135134
android:background="@color/stand_bg">
136135

137136
<FrameLayout

0 commit comments

Comments
 (0)