Forráskód Böngészése

UI改版-更改设置标题栏

Arison 8 éve
szülő
commit
ac2991ed6e

+ 3 - 3
WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon May 14 14:12:43 CST 2018
-debugName=230
+#Mon May 14 16:26:14 CST 2018
+debugName=236
 versionName=629
 versionName=629
-debugCode=230
+debugCode=236
 versionCode=169
 versionCode=169

+ 1 - 0
app_modular/appme/src/main/AndroidManifest.xml

@@ -32,6 +32,7 @@
         <activity android:name=".settings.activity.SelectLanguageActivity" />
         <activity android:name=".settings.activity.SelectLanguageActivity" />
         <activity
         <activity
             android:name=".settings.activity.SettingActivity"
             android:name=".settings.activity.SettingActivity"
+            android:theme="@style/MainBaseTheme"
             android:configChanges="keyboardHidden|orientation"
             android:configChanges="keyboardHidden|orientation"
             android:screenOrientation="portrait" />
             android:screenOrientation="portrait" />
         <activity
         <activity

+ 4 - 3
app_modular/appme/src/main/java/com/uas/appme/settings/activity/SettingActivity.java

@@ -43,7 +43,7 @@ import com.core.app.AppConfig;
 import com.core.app.AppConstant;
 import com.core.app.AppConstant;
 import com.core.app.Constants;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.app.MyApplication;
-import com.core.base.BaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.dao.work.VideoFileDao;
 import com.core.dao.work.VideoFileDao;
 import com.core.dao.work.WorkModelDao;
 import com.core.dao.work.WorkModelDao;
 import com.core.model.OAConfig;
 import com.core.model.OAConfig;
@@ -75,7 +75,7 @@ import java.util.List;
 /**
 /**
  * 设置
  * 设置
  */
  */
-public class SettingActivity extends BaseActivity implements View.OnClickListener {
+public class SettingActivity extends SupportToolBarActivity implements View.OnClickListener {
 
 
     private TextView mExitBtn;
     private TextView mExitBtn;
     private TextView mCacheTv;
     private TextView mCacheTv;
@@ -112,7 +112,8 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
     protected void onCreate(Bundle savedInstanceState) {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_setting);
         setContentView(R.layout.activity_setting);
-        getSupportActionBar().setTitle(getString(R.string.user_setting));
+        //getSupportActionBar().setTitle(getString(R.string.user_setting));
+        super.setTitle(getString(R.string.user_setting));
         initView();
         initView();
     }
     }