diff --git a/MeteoriteLibrary/src/main/java/com/firelotus/meteoritelibrary/application/ErrorReportApplication.java b/MeteoriteLibrary/src/main/java/com/firelotus/meteoritelibrary/application/ErrorReportApplication.java
index 6688a2b..e6b885c 100644
--- a/MeteoriteLibrary/src/main/java/com/firelotus/meteoritelibrary/application/ErrorReportApplication.java
+++ b/MeteoriteLibrary/src/main/java/com/firelotus/meteoritelibrary/application/ErrorReportApplication.java
@@ -5,7 +5,6 @@
import android.os.Handler;
import com.blankj.utilcode.util.Utils;
-import com.firelotus.meteoritelibrary.tools.AppStatusTracker;
import com.firelotus.meteoritelibrary.utils.ExceptionWriter;
/**
@@ -34,7 +33,7 @@ public void onCreate() {
super.onCreate();
mContext = this;
mHandler = new Handler();
- AppStatusTracker.init(this);
+ //AppStatusTracker.init(this);
Utils.init(this);
exceptionHandler = Thread.getDefaultUncaughtExceptionHandler();
Thread.setDefaultUncaughtExceptionHandler(handler);
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e7da975..5d92914 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -31,6 +31,7 @@
+
\ No newline at end of file
diff --git a/app/src/main/java/com/firelotus/meteorite/ui/FeedBackActivity.java b/app/src/main/java/com/firelotus/meteorite/ui/FeedBackActivity.java
new file mode 100644
index 0000000..fd10596
--- /dev/null
+++ b/app/src/main/java/com/firelotus/meteorite/ui/FeedBackActivity.java
@@ -0,0 +1,67 @@
+package com.firelotus.meteorite.ui;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.view.View;
+import android.widget.TextView;
+
+import com.firelotus.meteorite.R;
+import com.firelotus.meteoritelibrary.base.BaseActivity;
+
+import butterknife.BindView;
+
+/**
+ * Created by firelotus on 2017/12/31.
+ */
+
+public class FeedBackActivity extends BaseActivity implements View.OnClickListener{
+ @BindView(R.id.tv_issues)
+ public TextView issues;
+
+ @BindView(R.id.tv_qq)
+ public TextView qq;
+
+ @BindView(R.id.tv_email)
+ public TextView email;
+
+ public static void start(Context mContext) {
+ Intent intent = new Intent(mContext, FeedBackActivity.class);
+ mContext.startActivity(intent);
+ }
+ @Override
+ protected int getLayoutId() {
+ return R.layout.activity_feedback;
+ }
+
+ @Override
+ protected void initView() {
+ setToolBarTitle("问题反馈");
+ issues.setOnClickListener(this);
+ qq.setOnClickListener(this);
+ email.setOnClickListener(this);
+ }
+
+ @Override
+ protected void initData() {
+
+ }
+
+ @Override
+ public void onClick(View v) {
+ switch (v.getId()){
+ case R.id.tv_issues:
+ WebActivity.loadUrl(v.getContext(),"https://github.com/firelotus/Meteorite/issues","Issues");
+ break;
+ case R.id.tv_qq:
+ String url = "mqqwpa://im/chat?chat_type=wpa&uin=271512473";
+ startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
+ break;
+ case R.id.tv_email:
+ Intent data = new Intent(Intent.ACTION_SENDTO);
+ data.setData(Uri.parse("mailto:271512473@qq.com"));
+ startActivity(data);
+ break;
+ }
+ }
+}
diff --git a/app/src/main/java/com/firelotus/meteorite/ui/ImageViewerActivity.java b/app/src/main/java/com/firelotus/meteorite/ui/ImageViewerActivity.java
index 1c1fde2..899059a 100644
--- a/app/src/main/java/com/firelotus/meteorite/ui/ImageViewerActivity.java
+++ b/app/src/main/java/com/firelotus/meteorite/ui/ImageViewerActivity.java
@@ -2,8 +2,6 @@
import android.content.Context;
import android.content.Intent;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
import com.bumptech.glide.Glide;
import com.firelotus.meteorite.R;
@@ -27,11 +25,6 @@ public static void start(Context context,String url){
context.startActivity(intent);
}
- @Override
- protected void onCreate(@Nullable Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- }
-
@Override
protected int getLayoutId() {
return R.layout.activity_imageviewer;
diff --git a/app/src/main/java/com/firelotus/meteorite/ui/MainActivity.java b/app/src/main/java/com/firelotus/meteorite/ui/MainActivity.java
index a336e4d..a030879 100644
--- a/app/src/main/java/com/firelotus/meteorite/ui/MainActivity.java
+++ b/app/src/main/java/com/firelotus/meteorite/ui/MainActivity.java
@@ -135,7 +135,6 @@ public boolean onNavigationItemSelected(MenuItem item) {
// Handle navigation view item clicks here.
int id = item.getItemId();
if (id == R.id.nav_home) {
- tv_content.setText("home");
} else if (id == R.id.nav_about) {
tv_content.setText("about");
AboutActivity.start(getApplicationContext());
@@ -144,7 +143,7 @@ public boolean onNavigationItemSelected(MenuItem item) {
} else if (id == R.id.nav_set) {
tv_content.setText("set");
} else if (id == R.id.nav_comments) {
- tv_content.setText("comments");
+ FeedBackActivity.start(getApplicationContext());
} else if (id == R.id.nav_logout) {
finish();
}
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index d73fe01..0604a07 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -1,9 +1,34 @@
-
+
+
+
+
+
+
-
\ No newline at end of file
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/ll_version"
+ android:layout_marginTop="60px"
+ android:gravity="center"
+ android:text="O(∩_∩)O图标还不能自给自足,见谅!很高兴您能关注,如果感到满意就Star一下吧,由于时间有限,部分功能还在完善中..."/>
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_feedback.xml b/app/src/main/res/layout/activity_feedback.xml
new file mode 100644
index 0000000..27eefdc
--- /dev/null
+++ b/app/src/main/res/layout/activity_feedback.xml
@@ -0,0 +1,85 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml
index 5065092..1b42b8e 100644
--- a/app/src/main/res/menu/activity_main_drawer.xml
+++ b/app/src/main/res/menu/activity_main_drawer.xml
@@ -9,7 +9,8 @@
- Close navigation drawer
Settings
- firelotus@126.com
+ 271512473@qq.com
Firelotus