修复沉浸栏模式下底部输入框 被系统盘隐藏的bug！！！

WeiChat/src/main/res/values-zh-rCN/strings.xml

@@ -1166,7 +1166,7 @@
     <string name="c_photo_album">相册</string>
     <string name="c_photo_album_failed">选择失败</string>
     <string name="c_crop_failed">裁减失败</string>
-    <string name="exit_tips">确定要退出此账号吗？</string>
+    <string name="exit_tips">确定退出此账号吗？</string>
     <string name="watting">等待</string>
     <string name="approvel">审批</string>
     <string name="Did_not_pass">未通过</string>

WeiChat/src/main/res/values/strings.xml

@@ -376,7 +376,7 @@
     <string name="use_help">用户反馈</string>
     <string name="about_us">关于UU互联</string>
     <string name="app_version">当前版本</string>
-    <string name="exit_tips">确定要退出此账号吗？</string>
+    <string name="exit_tips">确定退出此账号吗？</string>
     <string name="exit_current_account">退出登录</string>
     <string name="deleteing">删除中&#8230;</string>
     <string name="clear_completed">清除完毕</string>

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Tue May 22 16:16:38 CST 2018
-debugName=320
+#Wed May 23 09:38:35 CST 2018
+debugName=326
 versionName=630
-debugCode=320
+debugCode=326
 versionCode=170

app_core/common/src/main/res/values-zh-rCN/strings.xml

@@ -1167,7 +1167,7 @@
     <string name="c_photo_album">相册</string>
     <string name="c_photo_album_failed">选择失败</string>
     <string name="c_crop_failed">裁减失败</string>
-    <string name="exit_tips">确定要退出此账号吗？</string>
+    <string name="exit_tips">确定退出此账号吗？</string>
     <string name="watting">等待</string>
     <string name="approvel">审批</string>
     <string name="Did_not_pass">未通过</string>

app_core/common/src/main/res/values/strings.xml

@@ -376,7 +376,7 @@
     <string name="use_help">用户反馈</string>
     <string name="about_us">关于UU互联</string>
     <string name="app_version">当前版本</string>
-    <string name="exit_tips">确定要退出此账号吗？</string>
+    <string name="exit_tips">确定退出此账号吗？</string>
     <string name="exit_current_account">退出登录</string>
     <string name="deleteing">删除中&#8230;</string>
     <string name="clear_completed">清除完毕</string>

app_modular/appme/src/main/java/com/uas/appme/settings/activity/SettingActivity.java

@@ -64,6 +64,7 @@ import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
 import com.me.network.app.http.rx.ResultListener;
 import com.me.network.app.http.rx.ResultSubscriber;
+import com.modular.apputils.utils.PopupWindowHelper;
 import com.scwang.smartrefresh.layout.util.DensityUtil;
 import com.uas.appme.R;
 import com.uas.appme.pedometer.view.NewStepActivity;
@@ -183,8 +184,17 @@ public class SettingActivity extends SupportToolBarActivity implements View.OnCl
         mExitBtn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-              //  showExitDialog();
-                showExitPop();
+                PopupWindowHelper.showAlart(SettingActivity.this, getString(R.string.app_name), getString(R.string.exit_tips), new PopupWindowHelper.OnSelectListener() {
+                    @Override
+                    public void select(boolean selectOk) {
+                        if (selectOk){
+                            UserSp.getInstance(mContext).clearUserInfo();
+                            ViewUtil.clearAccount(mContext);
+                            LoginHelper.broadcastLogout(mContext);
+                            SettingActivity.this.finish();
+                        }
+                    }
+                });
             }
         });
         mCacheTv = (TextView) findViewById(R.id.cache_tv);
@@ -653,7 +663,6 @@ public class SettingActivity extends SupportToolBarActivity implements View.OnCl
     private  PopupWindow popupWindow;
     public void showExitPop() {
         View view = null;
-        
         WindowManager windowManager = (WindowManager) getSystemService(Context.WINDOW_SERVICE);
         if (popupWindow == null) {
             LayoutInflater layoutInflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
@@ -668,10 +677,7 @@ public class SettingActivity extends SupportToolBarActivity implements View.OnCl
                 @Override
                 public void onClick(View view) {
                     popupWindow.dismiss();
-                    UserSp.getInstance(mContext).clearUserInfo();
-                    ViewUtil.clearAccount(mContext);
-                    LoginHelper.broadcastLogout(mContext);
-                    SettingActivity.this.finish();
+                  
                 }
             });
             tv_cancel.setOnClickListener(new View.OnClickListener() {

app_modular/appme/src/main/res/values-en/strings.xml

@@ -376,7 +376,7 @@
     <string name="use_help">用户反馈</string>
     <string name="about_us">关于UU互联</string>
     <string name="app_version">当前版本</string>
-    <string name="exit_tips">确定要退出此账号吗？</string>
+    <string name="exit_tips">确定退出此账号吗？</string>
     <string name="exit_current_account">退出登录</string>
     <string name="deleteing">删除中&#8230;</string>
     <string name="clear_completed">清除完毕</string>

app_modular/appme/src/main/res/values/strings.xml

@@ -376,7 +376,7 @@
     <string name="use_help">用户反馈</string>
     <string name="about_us">关于UU互联</string>
     <string name="app_version">当前版本</string>
-    <string name="exit_tips">确定要退出此账号吗？</string>
+    <string name="exit_tips">确定退出此账号吗？</string>
     <string name="exit_current_account">退出登录</string>
     <string name="deleteing">删除中&#8230;</string>
     <string name="clear_completed">清除完毕</string>

app_modular/apputils/src/main/res/layout/item_select_alert_pop.xml

@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:gravity="center_horizontal"
     android:orientation="vertical"
-    android:paddingLeft="10dp"
-    android:paddingRight="10dp"
-    android:paddingTop="10dp">
+    android:paddingLeft="@dimen/dp_10"
+    android:paddingTop="@dimen/dp_10"
+    android:paddingRight="@dimen/dp_10"
+    android:paddingBottom="@dimen/dp_4">
 
     <TextView
         android:id="@+id/title_tv"
         android:layout_width="match_parent"
         android:layout_height="20dp"
+        android:textStyle="bold"
         android:gravity="center"
         android:text="@string/common_dialog_title"
         android:textColor="@color/text_main"
@@ -21,24 +23,29 @@
     <TextView
         android:id="@+id/message_tv"
         android:layout_width="match_parent"
-        android:layout_height="50dp"
+        android:layout_height="60dp"
         android:layout_marginTop="5dp"
+        android:paddingLeft="@dimen/dp_10"
+        android:paddingRight="@dimen/dp_10"
         android:ellipsize="end"
-        android:gravity="center"
+        android:gravity="left|center_vertical"
         android:maxLines="2"
         android:textColor="@color/text_hine"
         android:textSize="@dimen/text_main" />
 
-    <View
+ <!--   <View
         android:layout_width="match_parent"
         android:layout_height="2px"
         android:layout_marginTop="10dp"
         android:background="@color/item_line" />
-
+-->
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="40dp"
         android:orientation="horizontal"
+        android:paddingLeft="@dimen/dp_10"
+        android:paddingRight="@dimen/dp_10"
+        android:padding="@dimen/dp_4"
         android:textColor="@color/text_main"
         android:textSize="@dimen/text_main">
 
@@ -47,15 +54,17 @@
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
+            android:textColor="@color/titleBlue"
+            android:background="@drawable/selector_cancel_bg"
             android:gravity="center"
             android:text="@string/common_cancel"
-            android:textColor="@color/text_main"
-            android:textSize="@dimen/text_main" />
+            android:layout_marginRight="20dp"
+            android:textSize="@dimen/text_hine" />
 
-        <View
+ <!--       <View
             android:layout_width="2px"
             android:layout_height="match_parent"
-            android:background="@color/item_line" />
+            android:background="@color/item_line" />-->
 
         <TextView
             android:id="@+id/sure_tv"
@@ -63,8 +72,10 @@
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:gravity="center"
+            android:layout_marginLeft="20dp"
+            android:background="@drawable/selector_confirm_bg"
             android:text="@string/common_sure"
-            android:textColor="@color/text_main"
-            android:textSize="@dimen/text_main" />
+            android:textColor="@color/white"
+            android:textSize="@dimen/text_hine" />
     </LinearLayout>
 </LinearLayout>