Browse Source

修改通讯录前备份

Bitliker 7 years ago
parent
commit
4a26741fb2

+ 3 - 3
WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu May 03 14:51:56 CST 2018
-debugName=192
+#Thu May 03 16:08:05 CST 2018
+debugName=194
 versionName=614
-debugCode=192
+debugCode=194
 versionCode=153

+ 3 - 2
app_modular/apputils/src/main/java/com/modular/apputils/activity/BaseNetActivity.java

@@ -25,6 +25,7 @@ import com.common.preferences.PreferenceUtils;
 import com.common.thread.ThreadPool;
 import com.core.app.ActionBackActivity;
 import com.core.app.MyApplication;
+import com.core.base.BaseActivity;
 import com.core.net.http.HttpUtil;
 import com.core.utils.CommonUtil;
 import com.core.widget.CustomProgressDialog;
@@ -53,7 +54,7 @@ import java.util.Locale;
  * Created by Bitlike on 2018/1/10.
  */
 
-public abstract class BaseNetActivity extends ActionBackActivity {
+public abstract class BaseNetActivity extends BaseActivity {
     protected Activity ct;
     private CustomProgressDialog progressDialog;
     protected HttpClient httpClient;
@@ -96,7 +97,7 @@ public abstract class BaseNetActivity extends ActionBackActivity {
         }
     }
 
-    protected void preOnCreacte() {
+    public void preOnCreacte() {
     }
 
     protected abstract int getLayoutId();

+ 157 - 0
app_modular/apputils/src/main/java/com/modular/apputils/activity/SupportToolBarActivity.java

@@ -0,0 +1,157 @@
+package com.modular.apputils.activity;
+
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.AppCompatTextView;
+import android.support.v7.widget.Toolbar;
+import android.text.TextUtils;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewStub;
+import android.widget.FrameLayout;
+import android.widget.TextView;
+
+import com.modular.apputils.R;
+
+/**
+ * Created by Bitlike on 2018/5/3.
+ */
+
+public class SupportToolBarActivity extends AppCompatActivity {
+    private FrameLayout contentFl;
+    private Toolbar commonToolBar;
+    private TextView commonTitleTv;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        super.setContentView(R.layout.base_bar_layout);
+        contentFl = findViewById(R.id.contentFl);
+        if (needCommonToolBar()) {
+            initCommonToolbar();
+        }
+    }
+
+    public void initCommonToolbar() {
+        ViewStub stub = findViewById(R.id.toolbarVs);
+        stub.inflate();
+        commonToolBar = findViewById(R.id.commonToolBar);
+        commonTitleTv = findViewById(R.id.commonTitleTv);
+        if (commonToolBar != null) {
+            setSupportActionBar(commonToolBar);
+            getSupportActionBar().setDisplayShowTitleEnabled(false);
+        }
+        if (needNavigation()) {
+            setNavigation(0, null,null);
+        }
+        commonTitleTv.setText(getTitle());
+    }
+
+    /**
+     * 初始化导航键
+     *
+     * @param iconId          返回图标(优先)
+     * @param icon            返回图标(当iconId小于0时)
+     * @param onClickListener 导航键监听事件
+     */
+    public  final void setNavigation(int iconId, Drawable icon, View.OnClickListener onClickListener) {
+        if (iconId > 0) {
+            commonToolBar.setNavigationIcon(iconId);
+        } else if (icon != null) {
+            commonToolBar.setNavigationIcon(icon);
+        } else {
+            commonToolBar.setNavigationIcon(R.drawable.ic_baseutil_back);
+        }
+        if (onClickListener == null) {
+            onClickListener = new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    onBackPressed();
+                }
+            };
+        }
+        //设置返回按钮的点击事件
+        commonToolBar.setNavigationOnClickListener(onClickListener);
+        setToolBarMenuClickListener(null);
+    }
+
+    //是否需要返回键
+    public boolean needNavigation() {
+        return true;
+    }
+
+    //是否需要通用的toolbar
+    public boolean needCommonToolBar() {
+        return true;
+    }
+
+    /*隐藏toolbar*/
+    protected final void hideToolBar() {
+        if (commonToolBar != null) {
+            commonToolBar.setVisibility(View.GONE);
+        }
+    }
+
+    /*显示toolbar*/
+    public final void showToolBar() {
+        if (commonToolBar != null && commonToolBar.getVisibility() == View.GONE) {
+            commonToolBar.setVisibility(View.VISIBLE);
+        }
+    }
+
+    /*设置toolbar的点击监听器*/
+    public final void setToolBarMenuClickListener(Toolbar.OnMenuItemClickListener onclick) {
+        if (commonToolBar != null) {
+            if (onclick == null) {
+                onclick = new Toolbar.OnMenuItemClickListener() {
+                    @Override
+                    public boolean onMenuItemClick(MenuItem item) {
+                        onOptionsItemSelected(item);
+                        return false;
+                    }
+                };
+            }
+            commonToolBar.setOnMenuItemClickListener(onclick);
+        }
+    }
+
+    /*设置标题*/
+    public final void setTitle(CharSequence title) {
+        super.setTitle(title);
+        if (!TextUtils.isEmpty(title)) {
+            if (commonTitleTv != null) {
+                commonTitleTv.setText(title);
+            }
+            getSupportActionBar().setTitle(title);
+        }
+    }
+
+    /**
+     * 更改为自定义的ToolBar,此时默认的Toobar将会制空
+     * TODO 存在问题:前面如果设置的返回键监听事件会失效
+     *
+     * @param toolBarId 当前布局里toolbar的资源id
+     * @return 返回新的Toobar
+     */
+    public final Toolbar updataToolBar(int toolBarId) {
+        Drawable navigationIcon = null;
+        if (commonToolBar != null) {
+            if (needNavigation()) {
+                navigationIcon = commonToolBar.getNavigationIcon();
+            }
+        }
+        commonToolBar = contentFl.findViewById(toolBarId);
+        if (commonToolBar != null) {
+            setSupportActionBar(commonToolBar);
+            //设置actionBar的标题是否显示,对应ActionBar.DISPLAY_SHOW_TITLE。
+            getSupportActionBar().setDisplayShowTitleEnabled(false);
+            if (needNavigation()) {
+                setNavigation(0, navigationIcon, null);
+            }
+        }
+        return commonToolBar;
+    }
+
+}

+ 4 - 0
app_modular/apputils/src/main/res/drawable/ic_baseutil_back.xml

@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="1024.0"
+    android:viewportWidth="1024.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M363.8,473C336.9,497.4 337.3,537.5 364.7,561.5L674,832.1C682.8,839.8 696.3,838.9 704.1,830 711.8,821.2 710.9,807.7 702,799.9L392.8,529.4C384.6,522.2 384.5,511.8 392.5,504.6L702.3,223.8C711.1,215.9 711.7,202.4 703.8,193.7 695.9,184.9 682.4,184.3 673.7,192.2L363.8,473Z"/>
+</vector>

+ 20 - 0
app_modular/apputils/src/main/res/layout/base_bar_layout.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <ViewStub
+        android:id="@+id/toolbarVs"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:layout="@layout/common_toolbar" />
+
+    <FrameLayout
+        android:id="@+id/contentFl"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal" />
+
+
+</LinearLayout>

+ 16 - 0
app_modular/apputils/src/main/res/layout/common_toolbar.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/commonToolBar"
+    android:layout_width="match_parent"
+    android:layout_height="?attr/actionBarSize"
+    android:background="?attr/colorPrimary">
+
+    <TextView
+        android:id="@+id/commonTitleTv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="left|center_vertical"
+        android:text="@string/app_name"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textSize="18sp" />
+</android.support.v7.widget.Toolbar>