提交原因：感觉电脑要爆炸，重启下

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Wed Dec 27 16:10:13 CST 2017
-debugName=293
+#Wed Dec 27 17:04:36 CST 2017
+debugName=294
 versionName=613
-debugCode=293
+debugCode=294
 versionCode=152

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

@@ -8,6 +8,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Handler;
 import android.util.DisplayMetrics;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -171,7 +172,12 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
             myAdapter.notifyDataSetChanged();
         }
         Log.i("fanglh",sc_industry+"");
-        progressDialog.dismiss();
+        new Handler().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                progressDialog.dismiss();
+            }
+        },2000);
     }
 
     private void initView() {

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

@@ -73,6 +73,8 @@ public class FindWagePWActivity extends BaseActivity implements View.OnClickList
         mNext3Btn.setOnClickListener(this);
         mEyeTv.setOnClickListener(this);
         mClearphoneTv.setOnClickListener(this);
+        mPhoneEt.setFocusable(false);
+        mPhoneEt.setKeyListener(null);
 
         showStepView(1);
     }

app_modular/appme/src/main/res/layout/check_wages_activity.xml

@@ -106,7 +106,7 @@
             android:textSize="@dimen/text_main"
             android:layout_alignParentRight="true"
             android:layout_marginRight="10dp"
-            android:background="#62AFE5"
+            android:background="@drawable/bg_bule_btn"
             android:visibility="visible"
             android:layout_marginTop="5dp"
             />
@@ -115,7 +115,7 @@
             android:id="@+id/seconds_tv"
             android:layout_width="wrap_content"
             android:layout_height="35dp"
-            android:padding="10dp"
+            android:padding="2dp"
             android:textColor="@color/white"
             android:textSize="@dimen/text_main"
             android:layout_alignParentRight="true"
@@ -142,8 +142,8 @@
         android:textSize="@dimen/text_main"
         android:layout_alignParentRight="true"
         android:layout_marginRight="10dp"
-        android:background="@color/white"
         android:layout_gravity="right"
+        android:background="@null"
         />
 
     <Button

app_modular/appme/src/main/res/layout/wage_forgetps.xml

@@ -21,7 +21,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="请输入手机号"
+                    android:text="请确认手机号"
                     android:textSize="20sp"
                     android:textColor="@color/black"/>
                 <TextView
@@ -55,7 +55,8 @@
                         android:layout_alignParentRight="true"
                         android:textSize="20sp"
                         android:drawableRight="@drawable/phone_del"
-                        android:layout_alignParentBottom="true"/>
+                        android:layout_alignParentBottom="true"
+                        android:visibility="gone"/>
                 </RelativeLayout>
                 <View
                     android:layout_width="match_parent"

app_modular/appme/src/main/res/layout/wages_details_activity.xml

@@ -121,7 +121,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="@drawable/errorbg"
-                    android:padding="10dp"/>
+                    android:padding="10dp"
+                    android:textColor="#00000"/>
             </LinearLayout>
 
             <LinearLayout