Browse Source

1:添加了一个Activity的基类。

guiying712 8 years ago
parent
commit
8bf4d58660

+ 2 - 0
common/build.gradle

@@ -37,4 +37,6 @@ dependencies {
     //不稳定的
     compile "com.github.mzule.activityrouter:activityrouter:$rootProject.routerVersion"
     compile "com.jude:easyrecyclerview:$rootProject.easyRecyclerVersion"
+
+    compile 'com.github.GrenderG:Toasty:1.1.3'
 }

+ 46 - 0
common/src/main/java/com/guiying/common/base/BaseActionBarActivity.java

@@ -0,0 +1,46 @@
+/*
+ *  @ProjectName: ISMS_Petrel_MCU
+ *  @Copyright: 2017 HangZhou Hikvision System Technology Co., Ltd. All Right Reserved.
+ *  @address: http://www.hikvision.com
+ *  @Description: 本内容仅限于杭州海康威视系统技术公有限司内部使用,禁止转发.
+ */
+
+package com.guiying.common.base;
+
+import android.os.Bundle;
+import android.support.annotation.StringRes;
+import android.support.v7.app.ActionBar;
+
+/**
+ * BaseActionBarActivity继承于BaseActivity,封装了actionBar的逻辑;
+ * 继承于ActionBarBaseActivity的Activity都将默认带有ActionBar,并且只能使用AppTheme主题;
+ * 只有那些ActionBar只带有Title和返回按钮的Activity方可继承
+ *
+ * @author 张华洋 2017/3/7 18:36
+ * @version V1.2.0
+ * @name BaseActionBarActivity
+ */
+public abstract class BaseActionBarActivity extends BaseActivity {
+
+    protected abstract
+    @StringRes
+    int setTitleId();
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        //标题栏设置
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+            actionBar.setHomeButtonEnabled(true);
+            actionBar.setTitle(setTitleId());
+        }
+    }
+
+    @Override
+    public boolean onSupportNavigateUp() {
+        onBackPressed();
+        return true;
+    }
+}

+ 3 - 7
common/src/main/res/values/colors.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!--APP的主题色-->
-    <color name="colorPrimary">#3f85e4</color>
-    <color name="colorPrimaryDark">#3f85e4</color>
-    <color name="colorAccent">#3f85e4</color>
+    <color name="colorPrimary">#F44336</color>
+    <color name="colorPrimaryDark">#D32F2F</color>
+    <color name="colorAccent">#FF5252</color>
 
     <!--APP公用的一些颜色-->
     <color name="common_bg">#fff7f7f7</color>
@@ -63,8 +63,4 @@
     <color name="gray_fc">#fffcfcfc</color>
     <color name="gray_e0">#e0e0e0</color>
 
-    <!--消息中心-->
-    <color name="red_common">#dfca2c32</color>
-    <color name="message_detail_rb_red">#f74248</color>
-    <color name="message_detail_divider">#e1e3e6</color>
 </resources>

+ 7 - 17
girls/src/main/java/com/guiying/girls/main/GirlsActivity.java

@@ -1,40 +1,30 @@
 package com.guiying.girls.main;
 
 import android.os.Bundle;
-import android.support.v7.app.ActionBar;
 
 import com.github.mzule.activityrouter.annotation.Router;
-import com.guiying.common.base.BaseActivity;
+import com.guiying.common.base.BaseActionBarActivity;
 import com.guiying.girls.R;
 
 @Router("girls")
-public class GirlsActivity extends BaseActivity {
+public class GirlsActivity extends BaseActionBarActivity {
 
     private GirlsView mView;
     private GirlsContract.Presenter mPresenter;
 
+    @Override
+    protected int setTitleId() {
+        return R.string.girls_activity_title;
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mView = new GirlsView(this);
         setContentView(mView);
-
-        //标题栏设置
-        ActionBar actionBar = getSupportActionBar();
-        if (actionBar != null) {
-            actionBar.setDisplayHomeAsUpEnabled(true);
-            actionBar.setTitle(R.string.girls_activity_title);
-        }
-
         mPresenter = new GirlsPresenter(mView);
         mPresenter.start();
     }
 
 
-    @Override
-    public boolean onSupportNavigateUp() {
-        onBackPressed();
-        return true;
-    }
-
 }

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

@@ -1,10 +1,12 @@
 package com.guiying.news.main;
 
 import android.os.Bundle;
-import android.support.v7.app.ActionBar;
+import android.view.View;
+import android.widget.Button;
+import android.widget.Toast;
 
 import com.github.mzule.activityrouter.annotation.Router;
-import com.guiying.common.base.BaseActivity;
+import com.guiying.common.base.BaseActionBarActivity;
 import com.guiying.common.http.HttpClient;
 import com.guiying.common.http.OnResultListener;
 import com.guiying.common.utils.ToastUtils;
@@ -12,21 +14,24 @@ import com.guiying.news.Constants;
 import com.guiying.news.R;
 import com.orhanobut.logger.Logger;
 
+import es.dmoral.toasty.Toasty;
+
 @Router("news")
-public class NewsActivity extends BaseActivity {
+public class NewsActivity extends BaseActionBarActivity implements View.OnClickListener {
+
+    protected Button mButton;
+
+    @Override
+    protected int setTitleId() {
+        return R.string.news_activity_title;
+    }
 
     @Override
     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);
-        }
+        super.setContentView(R.layout.activity_news);
         login();
+        initView();
     }
 
 
@@ -43,7 +48,7 @@ public class NewsActivity extends BaseActivity {
 
             @Override
             public void onSuccess(String result) {
-                ToastUtils.showLongToast(result);
+                Toasty.info(NewsActivity.this, "Here is some info for you.", Toast.LENGTH_SHORT, true).show();
             }
 
             @Override
@@ -58,9 +63,16 @@ public class NewsActivity extends BaseActivity {
         });
     }
 
+
     @Override
-    public boolean onSupportNavigateUp() {
-        onBackPressed();
-        return true;
+    public void onClick(View view) {
+        if (view.getId() == R.id.button1) {
+            ToastUtils.showShortToast("kannidmfdsfsf ");
+        }
+    }
+
+    private void initView() {
+        mButton = (Button) findViewById(R.id.button1);
+        mButton.setOnClickListener(NewsActivity.this);
     }
 }

+ 7 - 8
news/src/main/res/layout/activity_news.xml

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/activity_news"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     tools:context="com.guiying.news.main.NewsActivity">
 
     <TextView
@@ -11,12 +12,10 @@
         android:layout_height="wrap_content"
         android:text="Hello World!" />
 
-    <DatePicker
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:calendarViewShown="false"
-        style="@android:style/Theme.Holo.Light">
 
-    </DatePicker>
+    <Button
+        android:id="@+id/button1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
 
-</RelativeLayout>
+</LinearLayout>