hanjing před 7 roky
rodič
revize
80656e3e8d

+ 4 - 0
app/src/main/AndroidManifest.xml

@@ -267,6 +267,7 @@
         <activity
             android:name="com.sheep.gamegroup.view.activity.ChangeTelAct"
             android:launchMode="singleTask"
+            android:theme="@style/AppActionTheme"
             android:screenOrientation="portrait" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActBindMobileRegister"
@@ -368,9 +369,11 @@
             android:screenOrientation="portrait" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.RealNameAuthenAct"
+            android:theme="@style/AppActionTheme"
             android:screenOrientation="portrait" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.ChangeWxOrTelAct"
+            android:theme="@style/AppActionTheme"
             android:screenOrientation="portrait" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.ReNameActivity"
@@ -746,6 +749,7 @@
             android:screenOrientation="portrait" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActModifyThird"
+            android:theme="@style/AppActionTheme"
             android:screenOrientation="portrait" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActPlayGameList"

+ 1 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/ActModifyThird.java

@@ -60,6 +60,7 @@ public class ActModifyThird extends BaseActivity {
     @Override
     public void initView() {
         TitleBarUtils.getInstance()
+                .setShowOrHide(this, true)
                 .setTitle(this, "验证手机号")
                 .setTitleFinish(this);
         type = getIntent().getStringExtra("type");

+ 1 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/ChangeTelAct.java

@@ -109,6 +109,7 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View {
                 .inject(this);
         where_from = getIntent().getIntExtra("where_from", 0);
         TitleBarUtils titleBarUtils = TitleBarUtils.getInstance()
+                .setShowOrHide(this, true)
                 .setTitle(this, noticeStr)
                 .setTitleFinish(this, new View.OnClickListener() {
                     @Override

+ 1 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/ChangeWxOrTelAct.java

@@ -33,6 +33,7 @@ public class ChangeWxOrTelAct extends BaseActivity {
     @Override
     public void initView() {
         TitleBarUtils.getInstance()
+                .setShowOrHide(this, true)
                 .setTitle(this,"绑定微信号")
                 .setTitleFinish(this);
         from = getIntent().getIntExtra("from", TYPE_NORMAL);

+ 4 - 4
app/src/main/java/com/sheep/gamegroup/view/activity/PersonalInfoAct.java

@@ -176,7 +176,7 @@ public class PersonalInfoAct extends AbsChooseImageActivity {
     @OnClick({R.id.personal_info_avatar_container, R.id.personal_info_name_container, R.id.personal_info_qr_container,
             R.id.personal_info_phone_container, R.id.personal_info_bind_tx_wx_container,
             R.id.personal_info_bind_qq_container, R.id.personal_info_bind_wx_container,
-            R.id.personal_info_authentication_container, R.id.llayout_sex, R.id.llayout_birthday,
+            R.id.personal_info_authentication_container, R.id.llayout_birthday,
             R.id.personal_info_loginname_container})
 
     public void onClick(View view) {
@@ -185,9 +185,9 @@ public class PersonalInfoAct extends AbsChooseImageActivity {
             return;
         }
         switch (view.getId()) {
-            case R.id.llayout_sex://用户性别
-                ViewUtil.choiceSex(PersonalInfoAct.this, getCurrentFocus());
-                break;
+//            case R.id.llayout_sex://用户性别
+//                ViewUtil.choiceSex(PersonalInfoAct.this, getCurrentFocus());
+//                break;
             case R.id.llayout_birthday://用户生日
                 ViewUtil.showDateDialog(PersonalInfoAct.this, tvBirthday, TextUtils.isEmpty(userEntity.getBirthday()) ? "1990-01-01" : userEntity.getBirthday());
                 break;

+ 1 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/RealNameAuthenAct.java

@@ -81,6 +81,7 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
         DaggerRealNameAutherComponent.builder().netComponent(SheepApp.getInstance().getNetComponent()).realNameAutherModule(new RealNameAutherModule(this)).build().inject(this);
         TitleBarUtils
                 .getInstance()
+                .setShowOrHide(this, true)
                 .setTitle(this, "实名认证")
                 .setTitleFinish(this);
 

+ 2 - 1
app/src/main/res/layout/act_modify_third.xml

@@ -3,8 +3,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/white"
+    android:fitsSystemWindows="true"
     android:orientation="vertical">
-    <include layout="@layout/title" />
+
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

+ 1 - 2
app/src/main/res/layout/change_tel_layout.xml

@@ -3,10 +3,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/bg_gray"
+    android:fitsSystemWindows="true"
     android:orientation="vertical">
 
-    <include layout="@layout/title" />
-
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

+ 1 - 3
app/src/main/res/layout/change_wx_tel_layout.xml

@@ -3,11 +3,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
+    android:fitsSystemWindows="true"
     android:background="@color/bg_gray">
 
-    <include
-        layout="@layout/title"/>
-
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

+ 0 - 2
app/src/main/res/layout/x_real_name_auther_layout.xml

@@ -5,8 +5,6 @@
     android:background="@color/white_light"
     android:orientation="vertical">
 
-    <include layout="@layout/title" />
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"