6.29.3

微信公众号推送调整

app/src/main/java/com/silence/commonframe/activity/MainActivity.java

@@ -3,8 +3,6 @@ package com.silence.commonframe.activity;
 import android.annotation.SuppressLint;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.graphics.Color;
-import android.os.Build;
 import android.os.Handler;
 import android.os.Message;
 import android.support.v4.app.Fragment;
@@ -13,8 +11,6 @@ import android.support.v4.app.FragmentTransaction;
 import android.support.v4.app.NotificationManagerCompat;
 import android.view.KeyEvent;
 import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
 import android.widget.Button;
 
 import com.orhanobut.hawk.Hawk;
@@ -102,7 +98,6 @@ public class MainActivity extends BaseActivity implements OnFunLoginListener {
         //预加载设备fragment，因为那个页费时
         mFragmentManager.beginTransaction().add(R.id.fragment_container, deviceFragment).hide(deviceFragment).commit();
 
-        initWindows();
         FunSupportlogin();
 
         mHandler.sendMessage(mHandler.obtainMessage(MSG_SET_ALIAS, Hawk.get(BaseConstants.LOGIN_ID) + ""));//fc9b1aeb8e5c4debb0b8ae79569d99a6
@@ -123,20 +118,6 @@ public class MainActivity extends BaseActivity implements OnFunLoginListener {
         }
     }
 
-    //沉浸式状态栏
-    private void initWindows() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            Window window = getWindow();
-            window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS
-                    | WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
-            window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                    | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
-            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-            window.setStatusBarColor(Color.TRANSPARENT);
-            window.setNavigationBarColor(Color.BLACK);
-        }
-    }
-
     private void switchState(Button selectedButton) {
         mBtnTabChat.setSelected(false);
         mBtnTabContact.setSelected(false);
@@ -175,6 +156,7 @@ public class MainActivity extends BaseActivity implements OnFunLoginListener {
                 lastTime = System.currentTimeMillis();
             } else {
                 CDialog.Builder builder = new CDialog.Builder(this);
+                builder.setTitle("提示");
                 builder.setMessage("你确定要退出系统吗？");
                 builder.setPositiveButton("确定", new DialogInterface.OnClickListener() {
                     @Override
@@ -185,7 +167,7 @@ public class MainActivity extends BaseActivity implements OnFunLoginListener {
                 builder.setNegativeButton("取消", new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-
+                        dialog.dismiss();
                     }
                 });
                 builder.show();

app/src/main/res/values/styles.xml

@@ -149,7 +149,8 @@
 
     <style name="Theme.Transparent" parent="@style/Theme.AppCompat.Dialog">
         <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowNoTitle">true</item>
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
         <item name="android:windowFrame">@null</item>
         <item name="android:background">@color/transparent</item>
         <item name="android:windowBackground">@color/transparent</item>