utils抽离为module

.idea/codeStyles/Project.xml

@@ -1,116 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <codeStyleSettings language="XML">
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      </indentOptions>
-      <arrangement>
-        <rules>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:android</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:id</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>style</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>ANDROID_ATTRIBUTE_ORDER</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>.*</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-        </rules>
-      </arrangement>
-    </codeStyleSettings>
-  </code_scheme>
-</component>

.idea/dictionaries/liuyuqi.xml

@@ -1,3 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="liuyuqi" />
-</component>

.idea/encodings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8" addBOMForNewFiles="with NO BOM">
+  <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
     <file url="PROJECT" charset="UTF-8" />
   </component>
 </project>

.idea/gradle.xml

@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-5.1.1" />
+        <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
+            <option value="$PROJECT_DIR$/../ZZLibrary/utils" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
         <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
+    <option name="offlineMode" value="true" />
   </component>
 </project>

.idea/misc.xml

@@ -5,9 +5,6 @@
       <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
     </configurations>
   </component>
-  <component name="Kotlin2JsCompilerArguments">
-    <option name="sourceMapEmbedSources" />
-  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>

.idea/runConfigurations.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>

app/build.gradle

@@ -37,4 +37,5 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation project(":utils")
 }

app/src/main/java/me/yoqi/android/qrcode/service/QuickStartService.java

@@ -9,7 +9,7 @@ import androidx.annotation.RequiresApi;
 
 import me.yoqi.android.qrcode.CaptureActivity;
 import me.yoqi.android.utils.SPUtils;
-import me.yoqi.android.utils.SimplexToast;
+import me.yoqi.android.utils.ui.SimplexToast;
 
 /**
  * 下拉快速启动

app/src/main/java/me/yoqi/android/qrcode/ui/ResultActivity.java

@@ -8,21 +8,16 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
-import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.EditText;
-import android.widget.ListView;
-
 import androidx.appcompat.app.AppCompatActivity;
-
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.List;
 
 import me.yoqi.android.qrcode.R;
 import me.yoqi.android.qrcode.dao.ScanHistoryDao;
 import me.yoqi.android.qrcode.model.ScanHistory;
-import me.yoqi.android.qrcode.utils.StringUtils;
+import me.yoqi.android.utils.StringUtils;
 
 /**
  * 扫描结果页面

app/src/main/java/me/yoqi/android/qrcode/utils/StringUtils.java

@@ -1,30 +0,0 @@
-package me.yoqi.android.qrcode.utils;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class StringUtils {
-
-    /**
-     * 判断字符串是否为网址
-     *
-     * @param urls 链接字符串
-     * @return
-     */
-    public static boolean isHttpUrl(String urls) {
-        boolean isurl = false;
-        if (urls.startsWith("http://") || urls.startsWith("https://")) {
-            return true;
-        }
-        String regex = "(((https|http)?://)?([a-z0-9]+[.])|(www.))"
-                + "\\w+[.|\\/]([a-z0-9]{0,})?[[.]([a-z0-9]{0,})]+((/[\\S&&[^,;\u4E00-\u9FA5]]+)+)?([.][a-z0-9]{0,}+|/?)";//设置正则表达式
-
-        Pattern pat = Pattern.compile(regex.trim());//比对
-        Matcher mat = pat.matcher(urls.trim());
-        isurl = mat.matches();//判断是否匹配
-        if (isurl) {
-            isurl = true;
-        }
-        return isurl;
-    }
-}

app/src/main/java/me/yoqi/android/utils/NetUtils.java

@@ -1,12 +0,0 @@
-package me.yoqi.android.utils;
-
-/**
- * 网络检测工具类
- * @author liuyuqi.gov@msn.cn
- * @createTime 2020-08-18
- */
-public class NetUtils {
-    //检测网络是否可用，wifi or gps
-    
-}
-

app/src/main/java/me/yoqi/android/utils/RegexParser.java

@@ -1,22 +0,0 @@
-package me.yoqi.android.utils;
-
-import android.util.Patterns;
-
-/**
- * 常用正则表达式
- *
- * @author liuyuqi.gov@msn.cn
- * @createTime 2020-08-17
- */
-public class RegexParser {
-    static final String PHONE_PATTERN = Patterns.PHONE.pattern();
-    static final String EMAIL_PATTERN = Patterns.EMAIL_ADDRESS.pattern();
-
-    //at、话题、链接匹配表达式
-    static final String MENTION_PATTERN = "@.{1,15}?\\s";
-    static final String HASHTAG_PATTERN = "#.{1,15}?\\s";
-    static final String URL_PATTERN = "(http|https|ftp|svn)://([a-zA-Z0-9]+[/?.?])" +
-            "+[a-zA-Z0-9]*\\??([a-zA-Z0-9]*=[a-zA-Z0-9]*&?)*";
-
-}
-

app/src/main/java/me/yoqi/android/utils/SPUtils.java

@@ -1,78 +0,0 @@
-package me.yoqi.android.utils;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
-
-import java.util.Map;
-import java.util.Set;
-
-public class SPUtils {
-    private static final String SP_NAME = "common";
-    private static SPUtils mSpUtils;
-    private SharedPreferences sp;
-    private Editor editor;
-
-    public SPUtils(Context mContext) {
-        sp = mContext.getSharedPreferences(SP_NAME, Context.MODE_PRIVATE);
-        editor = sp.edit();
-    }
-
-    public static SPUtils getInstance(Context context) {
-
-        if (mSpUtils == null) {
-            synchronized (SPUtils.class) {
-                if (mSpUtils == null) {
-                    mSpUtils = new SPUtils(context);
-                    return mSpUtils;
-                }
-            }
-        }
-
-        return mSpUtils;
-
-    }
-
-    public void putBoolean(String key, Boolean value) {
-        editor.putBoolean(key, value);
-        editor.commit();
-    }
-
-    public boolean getBoolean(String key, Boolean defValue) {
-        return sp.getBoolean(key, defValue);
-    }
-
-    public void putString(String key, String value) {
-        if (key == null) {
-            return;
-        }
-        editor.putString(key, value);
-        editor.commit();
-    }
-
-    public String getString(String key, String defValue) {
-        return sp.getString(key, defValue);
-    }
-
-    public Set<String> getStringSet(String key, Set<String> defValue) {
-        return sp.getStringSet(key, defValue);
-    }
-
-    public void putInt(String key, int value) {
-        editor.putInt(key, value);
-        editor.commit();
-    }
-
-    public int getInt(String key, int defValue) {
-        return sp.getInt(key, defValue);
-    }
-
-    public Map<String, ?> getAll() {
-        return sp.getAll();
-    }
-
-    public void remove(String key) {
-        sp.edit().remove(key).apply();
-    }
-
-}

app/src/main/java/me/yoqi/android/utils/SimplexToast.java

@@ -1,80 +0,0 @@
-package me.yoqi.android.utils;
-
-import android.content.Context;
-import android.view.Gravity;
-import android.widget.Toast;
-
-/**
- * 以后请用这个吐司，谢谢！！！
- * <p>
- * <p>
- * {@link Toast}的创建都是要inflate一个layout, findViewById之类的
- * 将一个吐司单例化，并且作防止频繁点击的处理。
- * <p>
- * <p>
- */
-@SuppressWarnings("all")
-public class SimplexToast {
-
-    private static Toast mToast;
-    private static long nextTimeMillis;
-    private static int yOffset;
-    static Context mContext;
-    private static SimplexToast simplexToast;
-
-    public synchronized static SimplexToast getInstance(Context context) {
-        if (simplexToast == null) {
-            simplexToast = new SimplexToast(context);
-        }
-        return simplexToast;
-    }
-
-    public SimplexToast(Context context) {
-        mContext = context;
-    }
-
-    public static Toast init(Context context) {
-        if (context == null) {
-            throw new IllegalArgumentException("Context should not be null!!!");
-        }
-        if (mToast == null) {
-            mToast = Toast.makeText(context, null, Toast.LENGTH_SHORT);
-            yOffset = mToast.getYOffset();
-        }
-        mToast.setDuration(Toast.LENGTH_SHORT);
-        mToast.setGravity(Gravity.BOTTOM, 0, yOffset);
-        mToast.setMargin(0, 0);
-        return mToast;
-    }
-
-    public static void show(String content) {
-        show(content, Toast.LENGTH_SHORT);
-    }
-
-    public static void show(String content, int duration) {
-        show(mContext, content, Gravity.BOTTOM, duration);
-    }
-
-    public static void show(Context context, int rid) {
-        show(context, context.getResources().getString(rid));
-    }
-
-    public static void show(Context context, String content) {
-        show(context, content, Gravity.BOTTOM);
-    }
-
-    public static void show(Context context, String content, int gravity) {
-        show(context, content, gravity, Toast.LENGTH_SHORT);
-    }
-
-    public static void show(Context context, String content, int gravity, int duration) {
-        long current = System.currentTimeMillis();
-        //if (current < nextTimeMillis) return;
-        if (mToast == null) init(context.getApplicationContext());
-        mToast.setText(content);
-        mToast.setDuration(duration);
-        mToast.setGravity(gravity, 0, yOffset);
-        nextTimeMillis = current + (duration == Toast.LENGTH_LONG ? 3500 : 2000);
-        mToast.show();
-    }
-}

app/src/main/java/me/yoqi/android/utils/StringUtils.java

@@ -1,10 +0,0 @@
-package me.yoqi.android.utils;
-
-/**
- * @author liuyuqi.gov@msn.cn
- * @createTime 2020-08-17
- */
-public class StringUtils {
-
-}
-

gradle.properties

@@ -0,0 +1,14 @@
+## For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+#
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx1024m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+#
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+#Mon Oct 19 07:47:07 CST 2020
+android.useAndroidX=true

settings.gradle

@@ -1 +1,4 @@
+include 'utils'
+project(":utils").projectDir = new File(settingsDir,"../ZZLibrary/utils")
+
 include ':app'