Browse Source

1:给组件Activity添加回退按钮。

guiying712 8 years ago
parent
commit
e5fc5aa71d

+ 1 - 1
common/src/main/java/com/guiying/common/http/HttpsUtil.java

@@ -35,7 +35,7 @@ import javax.net.ssl.X509TrustManager;
  * HttpsUtils来自于鸿洋的: https://github.com/hongyangAndroid/okhttputils;
  * 增加了主机名校验方法getHostnameVerifier();
  * 其他参考的文章有:http://android.jobbole.com/83787/;
- * <p>
+ *
  * Android 4.X 对TLS1.1、TLS1.2的支持参考了http://blog.csdn.net/joye123/article/details/53888252
  */
 public class HttpsUtil {

+ 1 - 1
girls/src/main/debug/AndroidManifest.xml

@@ -6,7 +6,7 @@
         android:name="debug.GirlsApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
+        android:label="@string/girls_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity

+ 16 - 0
girls/src/main/java/com/guiying/girls/GirlsActivity.java

@@ -1,6 +1,7 @@
 package com.guiying.girls;
 
 import android.os.Bundle;
+import android.support.v7.app.ActionBar;
 
 import com.github.mzule.activityrouter.annotation.Router;
 import com.guiying.common.base.BaseActivity;
@@ -12,5 +13,20 @@ public class GirlsActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_girls);
+
+        //标题栏设置
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+            actionBar.setTitle(R.string.girls_activity_title);
+        }
+    }
+
+
+    @Override
+    public boolean onSupportNavigateUp() {
+        onBackPressed();
+        return true;
     }
+
 }

+ 4 - 1
girls/src/main/res/values/strings.xml

@@ -1,3 +1,6 @@
 <resources>
-    <string name="app_name">Girls</string>
+    <string name="girls_name">Girls</string>
+
+    <string name="girls_activity_title">Girls</string>
+
 </resources>

+ 1 - 1
news/src/main/debug/AndroidManifest.xml

@@ -6,7 +6,7 @@
         android:name="debug.NewsApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
+        android:label="@string/news_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity

+ 15 - 0
news/src/main/java/com/guiying/news/NewsActivity.java

@@ -1,6 +1,7 @@
 package com.guiying.news;
 
 import android.os.Bundle;
+import android.support.v7.app.ActionBar;
 
 import com.github.mzule.activityrouter.annotation.Router;
 import com.guiying.common.base.BaseActivity;
@@ -12,5 +13,19 @@ public class NewsActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_news);
+
+        //标题栏设置
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+            actionBar.setTitle(R.string.news_activity_title);
+        }
+    }
+
+
+    @Override
+    public boolean onSupportNavigateUp() {
+        onBackPressed();
+        return true;
     }
 }

+ 4 - 1
news/src/main/res/values/strings.xml

@@ -1,3 +1,6 @@
 <resources>
-    <string name="app_name">News</string>
+    <string name="news_name">News</string>
+
+    <string name="news_activity_title">News</string>
+
 </resources>