变更开源库位置

.idea/gradle.xml

@@ -8,8 +8,8 @@
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/androidjava" />
             <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/baselib" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />

.idea/inspectionProfiles/Project_Default.xml

@@ -1,36 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="JavaDoc" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="TOP_LEVEL_CLASS_OPTIONS">
-        <value>
-          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
-          <option name="REQUIRED_TAGS" value="" />
-        </value>
-      </option>
-      <option name="INNER_CLASS_OPTIONS">
-        <value>
-          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
-          <option name="REQUIRED_TAGS" value="" />
-        </value>
-      </option>
-      <option name="METHOD_OPTIONS">
-        <value>
-          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
-          <option name="REQUIRED_TAGS" value="@return@param@throws or @exception" />
-        </value>
-      </option>
-      <option name="FIELD_OPTIONS">
-        <value>
-          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
-          <option name="REQUIRED_TAGS" value="" />
-        </value>
-      </option>
-      <option name="IGNORE_DEPRECATED" value="false" />
-      <option name="IGNORE_JAVADOC_PERIOD" value="true" />
-      <option name="IGNORE_DUPLICATED_THROWS" value="false" />
-      <option name="IGNORE_POINT_TO_ITSELF" value="false" />
-      <option name="myAdditionalJavadocTags" value="date" />
-    </inspection_tool>
-  </profile>
-</component>

.idea/misc.xml

@@ -25,7 +25,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

androidjava/bintrayUpload.gradle

@@ -0,0 +1,80 @@
+// 这里添加下面两行代码。
+apply plugin: 'com.github.dcendents.android-maven'
+apply plugin: 'com.jfrog.bintray'
+
+// 定义两个链接，下面会用到。
+def siteUrl = 'https://github.com/BenYanYi/BaseJava' // 项目主页。
+def gitUrl = 'https://github.com/BenYanYi/BaseJava.git' // Git仓库的url。
+
+group = "com.yanyi.benyanyi"// 唯一包名,比如compile 'com.ansen.http:okhttpencapsulation:1.0.1'中的com.ansen.http就是这里配置的。
+version = "1.0.1"//项目引用的版本号，比如compile 'com.ansen.http:okhttpencapsulation:1.0.1'中的1.0.1就是这里配置的。
+install {
+    repositories.mavenInstaller {
+        // This generates POM.xml with proper parameters
+        pom {
+            project {
+                packaging 'aar'
+                // Add your description here
+                name 'multi-format 1D/2D barcode image processing use zxing.'
+                url siteUrl
+                // Set your license
+                licenses {
+                    license {
+                        name 'The Apache Software License, Version 2.0'
+                        url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                    }
+                }
+                developers {
+                    developer {
+                        id 'benyanyi'     //填写的一些基本信息
+                        name 'benyanyi'
+                        email 'git@yanyi.red'
+                    }
+                }
+                scm {
+                    connection gitUrl
+                    developerConnection gitUrl
+                    url siteUrl
+                }
+            }
+        }
+    }
+}
+task sourcesJar(type: Jar) {
+    from android.sourceSets.main.java.srcDirs
+    classifier = 'sources'
+}
+task javadoc(type: Javadoc) {
+    source = android.sourceSets.main.java.srcDirs
+    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+}
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+}
+artifacts {
+    archives javadocJar
+    archives sourcesJar
+}
+Properties properties = new Properties()
+properties.load(project.rootProject.file('local.properties').newDataInputStream())
+bintray {
+    user = properties.getProperty("bintray.user")
+    key = properties.getProperty("bintray.apikey")
+    configurations = ['archives']
+    pkg {
+        repo = "BaseAndroidJava"
+        name = "BaseAndroidJava"   //发布到JCenter上的项目名字
+        websiteUrl = siteUrl
+        vcsUrl = gitUrl
+        licenses = ["Apache-2.0"]
+        publish = true
+    }
+}
+javadoc { //jav doc采用utf-8编码否则会报“GBK的不可映射字符”错误
+    options{
+        encoding "UTF-8"
+        charSet 'UTF-8'
+    }
+}
+//gradlew bintrayUpload    terminal中输入

baselib/build.gradle → androidjava/build.gradle

@@ -1,9 +1,5 @@
 apply plugin: 'com.android.library'
 
-apply plugin: 'com.github.dcendents.android-maven'
-
-group='com.github.BenYanYi'
-
 android {
     compileSdkVersion 27
 
@@ -41,15 +37,12 @@ dependencies {
     annotationProcessor 'com.github.bumptech.glide:compiler:4.3.1'
     implementation 'com.android.support:recyclerview-v7:27.1.1'
     api 'com.google.code.gson:gson:+'
-    implementation 'com.squareup.retrofit2:retrofit:2.3.0'
-    implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
-    implementation 'com.squareup.retrofit2:adapter-rxjava:2.3.0'
-    implementation files('libs/pinyin4j-2.5.0.jar')
     //okhttp
-    api 'com.github.BenYanYi:OkHttp:+'
+    api 'com.yanyi.benyanyi:okhttplib:1.0.1'
     //log
-    api 'com.github.BenYanYi:Logger:+'
-    api 'com.github.BenYanYi:DateSelect:+'
-    implementation 'com.didikee:permissionsHelper:+'
+    api 'com.yanyi.benyanyi:loglib:1.0.0'
+    api 'com.yanyi.benyanyi:datelib:1.0.0'
+    api 'com.yanyi.benyanyi:permissionlib:1.0.1'
     api 'com.readystatesoftware.systembartint:systembartint:1.0.3'
 }
+apply from: 'bintrayUpload.gradle'

baselib/src/main/java/com/mylove/baselib/activity/BaseActivity.java → androidjava/src/main/java/com/mylove/baselib/activity/BaseActivity.java

@@ -26,9 +26,6 @@ import butterknife.ButterKnife;
 
 /**
  * @author myLove
- * @time 2018/1/8 13:55
- * @e-mail love@yanyi.red
- * @overview
  */
 
 public abstract class BaseActivity extends AppCompatActivity {

baselib/src/main/java/com/mylove/baselib/activity/BaseActivityLoad.java → androidjava/src/main/java/com/mylove/baselib/activity/BaseActivityLoad.java

@@ -15,7 +15,6 @@ import com.mylove.baselib.utils.StringUtil;
 import com.mylove.baselib.viewholder.RecyclerHolder;
 import com.mylove.baselib.widget.RecyclerViewAnimation;
 import com.mylove.loglib.JLog;
-import com.mylove.okhttp.ResultMsg;
 import com.mylove.okhttp.onOkHttpListener;
 
 import java.util.ArrayList;
@@ -23,9 +22,6 @@ import java.util.List;
 
 /**
  * @author myLove
- * @time 2018-01-10 15:05
- * @e-mail love@yanyi.red
- * @overview
  */
 
 public abstract class BaseActivityLoad<T> extends BaseActivity implements onOkHttpListener {
@@ -109,11 +105,6 @@ public abstract class BaseActivityLoad<T> extends BaseActivity implements onOkHt
 
     /**
      * item设置参数
-     *
-     * @param mHolder
-     * @param item
-     * @param position
-     * @param isScrolling
      */
     protected abstract void adapterConvert(RecyclerHolder mHolder, T item, int position, boolean isScrolling);
 
@@ -290,8 +281,8 @@ public abstract class BaseActivityLoad<T> extends BaseActivity implements onOkHt
     }
 
     @Override
-    public void onSuccess(ResultMsg resultMsg) {
-        disposeResultData(resultMsg.getResult());
+    public void onSuccess(String str) {
+        disposeResultData(str);
         status();
     }
 

androidjava/src/main/java/com/mylove/baselib/activity/permission/BasePermissionsActivity.java

@@ -0,0 +1,60 @@
+package com.mylove.baselib.activity.permission;
+
+import android.content.Intent;
+import android.support.annotation.NonNull;
+
+import com.mylove.baselib.activity.BaseActivity;
+import com.yanyi.permissionlib.PermissionDialogInfo;
+import com.yanyi.permissionlib.PermissionHelper;
+
+
+/**
+ * @author myLove
+ * 获取权限activity
+ */
+
+public abstract class BasePermissionsActivity extends BaseActivity {
+    private PermissionHelper permissionHelper;
+
+    protected abstract String[] setPermissions();
+
+    @Override
+    protected void init() {
+        permissionHelper = new PermissionHelper(mActivity, setPermissions());
+        permissionHelper.setDialogInfo(setDialogInfo());
+        permissionHelper.hasPermission(new PermissionHelper.OnPermissionListener() {
+            @Override
+            public void onAllPermissionSuccess() {
+                allPermissionSuccess();
+            }
+
+            @Override
+            public void onAllPermissionFailure() {
+                allPermissionFailure();
+            }
+        });
+    }
+
+    protected abstract void allPermissionSuccess();
+
+    public void allPermissionFailure() {
+        finish();
+    }
+
+    public PermissionDialogInfo setDialogInfo() {
+        return null;
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,
+                                           @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        permissionHelper.onRequestPermissionsResult(requestCode, permissions, grantResults);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        permissionHelper.onActivityResult(requestCode, resultCode, data);
+    }
+}

baselib/src/main/java/com/mylove/baselib/adapter/CommonRecyclerAdapter.java → androidjava/src/main/java/com/mylove/baselib/adapter/CommonRecyclerAdapter.java

@@ -13,9 +13,6 @@ import java.util.List;
 
 /**
  * @author LYjw
- * @time 2017/3/20 14:23
- * @e-mail love@yanyi.red
- * @overview
  */
 
 public abstract class CommonRecyclerAdapter<T> extends RecyclerView.Adapter<RecyclerHolder> {
@@ -185,9 +182,6 @@ public abstract class CommonRecyclerAdapter<T> extends RecyclerView.Adapter<Recy
 
     /**
      * 插入一项
-     *
-     * @param item
-     * @param position
      */
     public void insert(T item, int position) {
         list.add(position, item);

baselib/src/main/java/com/mylove/baselib/adapter/TabStripPagerAdapter.java → androidjava/src/main/java/com/mylove/baselib/adapter/TabStripPagerAdapter.java

@@ -8,9 +8,6 @@ import java.util.List;
 
 /**
  * @author myLove
- * @time 2018-01-15 15:29
- * @e-mail love@yanyi.red
- * @overview
  */
 
 public class TabStripPagerAdapter extends FragmentPagerAdapter {

baselib/src/main/java/com/mylove/baselib/db/DBHelper.java → androidjava/src/main/java/com/mylove/baselib/db/DBHelper.java

@@ -10,9 +10,6 @@ import java.util.Map;
 
 /**
  * @author myLove
- * @time 2017/10/31 13:46
- * @e-mail mylove.520.y@gmail.com
- * @overview
  */
 
 class DBHelper extends SQLiteOpenHelper {

baselib/src/main/java/com/mylove/baselib/db/DBUtil.java → androidjava/src/main/java/com/mylove/baselib/db/DBUtil.java

@@ -18,9 +18,7 @@ import java.util.Map;
 
 /**
  * @author myLove
- * @time 2017/10/31 14:00
- * @e-mail mylove.520.y@gmail.com
- * @overview sqlite工具类
+ * sqlite工具类
  */
 
 public class DBUtil {

baselib/src/main/java/com/mylove/baselib/fragment/BaseFragment.java → androidjava/src/main/java/com/mylove/baselib/fragment/BaseFragment.java

@@ -19,9 +19,6 @@ import butterknife.Unbinder;
 
 /**
  * @author myLove
- * @time 2017/11/1 14:16
- * @e-mail mylove.520.y@gmail.com
- * @overview
  */
 
 public abstract class BaseFragment extends Fragment {

baselib/src/main/java/com/mylove/baselib/fragment/BaseFragmentLoad.java → androidjava/src/main/java/com/mylove/baselib/fragment/BaseFragmentLoad.java

@@ -15,7 +15,6 @@ import com.mylove.baselib.utils.StringUtil;
 import com.mylove.baselib.viewholder.RecyclerHolder;
 import com.mylove.baselib.widget.RecyclerViewAnimation;
 import com.mylove.loglib.JLog;
-import com.mylove.okhttp.ResultMsg;
 import com.mylove.okhttp.onOkHttpListener;
 
 import java.util.ArrayList;
@@ -23,9 +22,6 @@ import java.util.List;
 
 /**
  * @author myLove
- * @time 2018-01-16 09:26
- * @e-mail love@yanyi.red
- * @overview
  */
 
 public abstract class BaseFragmentLoad<T> extends BaseFragment implements onOkHttpListener {
@@ -284,8 +280,8 @@ public abstract class BaseFragmentLoad<T> extends BaseFragment implements onOkHt
     }
 
     @Override
-    public void onSuccess(ResultMsg resultMsg) {
-        disposeResultData(resultMsg.getResult());
+    public void onSuccess(String str) {
+        disposeResultData(str);
         status();
     }
 

baselib/src/main/java/com/mylove/baselib/grobal/AppManager.java → androidjava/src/main/java/com/mylove/baselib/grobal/AppManager.java

@@ -8,9 +8,7 @@ import java.util.Stack;
 
 /**
  * @author myLove
- * @time 2017/10/31 12:18
- * @e-mail mylove.520.y@gmail.com
- * @overview 应用程序Activity管理类：用于Activity管理和应用程序退出
+ * 应用程序Activity管理类：用于Activity管理和应用程序退出
  */
 
 public class AppManager {
@@ -25,12 +23,13 @@ public class AppManager {
      */
     public static AppManager getInstance() {
         if (instance == null) {
-            synchronized (AppManager.class){
+            synchronized (AppManager.class) {
                 instance = new AppManager();
             }
         }
         return instance;
     }
+
     /**
      * 添加Activity到堆栈
      *

baselib/src/main/java/com/mylove/baselib/utils/AndroidUtil.java → androidjava/src/main/java/com/mylove/baselib/utils/AndroidUtil.java

@@ -4,9 +4,6 @@ import android.content.Context;
 
 /**
  * @author myLove
- * @time 2017/11/15 9:51
- * @e-mail mylove.520.y@gmail.com
- * @overview
  */
 
 public class AndroidUtil {

baselib/src/main/java/com/mylove/baselib/utils/ArrayUtil.java → androidjava/src/main/java/com/mylove/baselib/utils/ArrayUtil.java

@@ -4,20 +4,12 @@ import java.util.Arrays;
 
 /**
  * @author myLove
- * @time 2017/11/15 9:37
- * @e-mail mylove.520.y@gmail.com
- * @overview
  */
 
 public class ArrayUtil {
 
     /**
      * 将多个数组合并成一个数组
-     *
-     * @param first
-     * @param rest
-     * @param <T>
-     * @return
      */
     public static <T> T[] concatAll(T[] first, T[]... rest) {
         int totalLength = first.length;

baselib/src/main/java/com/mylove/baselib/utils/DateUtil.java → androidjava/src/main/java/com/mylove/baselib/utils/DateUtil.java

@@ -10,18 +10,12 @@ import java.util.Date;
 
 /**
  * @author myLove
- * @time 2017/11/15 10:15
- * @e-mail mylove.520.y@gmail.com
- * @overview
  */
 
 public class DateUtil {
     /**
      * 时间戳转换成日期格式字符串
-     *
-     * @param seconds 精确到秒的字符串
-     * @param
-     * @return
+     * seconds 精确到秒的字符串
      */
     public static String timeStamp2Date(String seconds, String format) {
         if (seconds == null || seconds.isEmpty() || seconds.equals("null")) {
@@ -35,9 +29,6 @@ public class DateUtil {
 
     /**
      * 计算两个日期型的时间相差多少时间
-     *
-     * @param
-     * @return
      */
     @SuppressLint("SimpleDateFormat")
     public static String twoDateDistance(String endDates) {
@@ -107,7 +98,6 @@ public class DateUtil {
      * 时间戳转换成日期格式字符串
      *
      * @param seconds 精确到秒的字符串
-     * @return
      */
     public static String timeStamp2Date(String seconds) {
         if (seconds == null || seconds.isEmpty() || seconds.equals("null")) {
@@ -121,9 +111,7 @@ public class DateUtil {
     /**
      * 日期格式字符串转换成时间戳
      *
-     * @param
      * @param format 如：yyyy-MM-dd HH:mm:ss
-     * @return
      */
     public static String date2TimeStamp(String date_str, String format) {
         // 2016-03-13 03:29:00
@@ -138,8 +126,6 @@ public class DateUtil {
 
     /**
      * 取得当前时间戳（精确到秒）
-     *
-     * @return
      */
     public static String timeStamp() {
         long time = System.currentTimeMillis();
@@ -161,9 +147,6 @@ public class DateUtil {
 
     /**
      * 得到当前的时间
-     *
-     * @param format
-     * @return
      */
     public static String getStringDate(String format) {
         Date currentTime = new Date();
@@ -174,11 +157,6 @@ public class DateUtil {
 
     /**
      * 计算时间差
-     *
-     * @param startTime
-     * @param endTime
-     * @param format
-     * @return
      */
     public static String TimeDifference(String startTime, String endTime, String format) {
         String str = "";
@@ -213,10 +191,6 @@ public class DateUtil {
 
     /**
      * 计算时间差
-     *
-     * @param startTime
-     * @param endTime
-     * @return
      */
     public static String TimeDifference(String startTime, String endTime) {
         String str = "剩余";
@@ -326,8 +300,6 @@ public class DateUtil {
 
     /**
      * 获取时间 小时:分;秒 HH:mm:ss
-     *
-     * @return
      */
     public static String getTimeShort() {
         SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss");
@@ -338,9 +310,6 @@ public class DateUtil {
 
     /**
      * 将长时间格式字符串转换为时间 yyyy-MM-dd HH:mm:ss
-     *
-     * @param strDate
-     * @return
      */
     public static Date strToDateLong(String strDate) {
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -351,9 +320,6 @@ public class DateUtil {
 
     /**
      * 将长时间格式时间转换为字符串 yyyy-MM-dd HH:mm:ss
-     *
-     * @param dateDate
-     * @return
      */
     public static String dateToStrLong(Date dateDate) {
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -363,10 +329,6 @@ public class DateUtil {
 
     /**
      * 将短时间格式时间转换为字符串 yyyy-MM-dd
-     *
-     * @param dateDate
-     * @param
-     * @return
      */
     public static String dateToStr(Date dateDate) {
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
@@ -376,9 +338,6 @@ public class DateUtil {
 
     /**
      * 将短时间格式字符串转换为时间 yyyy-MM-dd
-     *
-     * @param strDate
-     * @return
      */
     public static Date strToDate(String strDate) {
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
@@ -389,8 +348,6 @@ public class DateUtil {
 
     /**
      * 得到现在时间
-     *
-     * @return
      */
     public static Date getNow() {
         Date currentTime = new Date();
@@ -399,9 +356,6 @@ public class DateUtil {
 
     /**
      * 提取一个月中的最后一天
-     *
-     * @param day
-     * @return
      */
     public static Date getLastDate(long day) {
         Date date = new Date();
@@ -436,8 +390,6 @@ public class DateUtil {
 
     /**
      * 得到现在分钟
-     *
-     * @return
      */
     public static String getTime() {
         Date currentTime = new Date();
@@ -450,9 +402,6 @@ public class DateUtil {
 
     /**
      * 根据用户传入的时间表示格式，返回当前时间的格式 如果是yyyyMMdd，注意字母y不能大写。
-     *
-     * @param sformat yyyyMMddhhmmss
-     * @return
      */
     public static String getUserDate(String sformat) {
         Date currentTime = new Date();
@@ -464,7 +413,6 @@ public class DateUtil {
     /**
      * @param strDate 当前时间
      * @param pattern 时间格式
-     * @return
      */
     public static Date strToDate(String strDate, String pattern) {
         SimpleDateFormat formatter = new SimpleDateFormat(pattern);
@@ -476,7 +424,6 @@ public class DateUtil {
     /**
      * @param strDate 时间
      * @param pattern 时间格式
-     * @return
      */
     public static String getDate(String strDate, String pattern) {
         Date currentTime = strToDate(strDate, pattern);
@@ -487,8 +434,6 @@ public class DateUtil {
 
     /**
      * 判断星期几
-     * @param date
-     * @return
      */
     public static String getWeek(String date) {
         String week = "";

baselib/src/main/java/com/mylove/baselib/utils/DpAndPxUtil.java → androidjava/src/main/java/com/mylove/baselib/utils/DpAndPxUtil.java

@@ -4,18 +4,12 @@ import android.content.Context;
 
 /**
  * @author myLove
- * @time 2017/11/15 9:45
- * @e-mail mylove.520.y@gmail.com
- * @overview
  */
 
 public class DpAndPxUtil {
     /**
      * sp转px
      *
-     * @param context
-     * @param spValue
-     * @return
      */
     public static int sp2px(Context context, Float spValue) {
         float fontScale = context.getResources().getDisplayMetrics().scaledDensity;

baselib/src/main/java/com/mylove/baselib/utils/ImageUtil.java → androidjava/src/main/java/com/mylove/baselib/utils/ImageUtil.java

@@ -4,18 +4,12 @@ import android.graphics.Bitmap;
 
 /**
  * @author myLove
- * @time 2017/11/15 9:57
- * @e-mail mylove.520.y@gmail.com
- * @overview
  */
 
 public class ImageUtil {
     /**
      * 计较两张图片是否一样
      *
-     * @param b1
-     * @param b2
-     * @return
      */
     public boolean isEquals(Bitmap b1, Bitmap b2) {
         //先判断宽高是否一致，不一致直接返回false

baselib/src/main/java/com/mylove/baselib/utils/InternetUtil.java → androidjava/src/main/java/com/mylove/baselib/utils/InternetUtil.java

@@ -9,9 +9,7 @@ import android.net.wifi.WifiManager;
 
 /**
  * @author myLove
- * @time 2017/11/7 16:08
- * @e-mail mylove.520.y@gmail.com
- * @overview 网络工具类
+ * 网络工具类
  */
 
 public class InternetUtil {
@@ -29,8 +27,8 @@ public class InternetUtil {
 
     /**
      * 判断WIFI网络是否可用
-     *
-     * @msg 测试没用
+     * <p>
+     * 测试没用
      */
     public static boolean isWifiConnected(Context context) {
         ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
@@ -43,8 +41,8 @@ public class InternetUtil {
 
     /**
      * 判断MOBILE网络是否可用
-     *
-     * @msg 测试没用
+     * <p>
+     * 测试没用
      */
     public static boolean isMobileConnected(Context context) {
         ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
@@ -83,9 +81,6 @@ public class InternetUtil {
 
     /**
      * 获取当前ip地址
-     *
-     * @param context
-     * @return
      */
     public static String getLocalIpAddress(Context context) {
         try {
@@ -103,9 +98,6 @@ public class InternetUtil {
 
     /**
      * 将ip的整数形式转换成ip形式
-     *
-     * @param ipInt
-     * @return
      */
     private static String int2ip(int ipInt) {
         return String.valueOf(ipInt & 0xFF) + "." +

baselib/src/main/java/com/mylove/baselib/utils/OnClickTime.java → androidjava/src/main/java/com/mylove/baselib/utils/OnClickTime.java

@@ -2,9 +2,7 @@ package com.mylove.baselib.utils;
 
 /**
  * @author myLove
- * @time 2017/11/15 9:54
- * @e-mail mylove.520.y@gmail.com
- * @overview 用于判断是否点击两次
+ * 用于判断是否点击两次
  */
 
 public class OnClickTime {

baselib/src/main/java/com/mylove/baselib/utils/SharedUtil.java → androidjava/src/main/java/com/mylove/baselib/utils/SharedUtil.java

@@ -17,8 +17,6 @@ import java.util.Set;
 
 /**
  * @author myLove
- * @time 2017/10/24 9:47
- * @overview
  */
 
 public class SharedUtil {

baselib/src/main/java/com/mylove/baselib/utils/StatusBarUtil.java → androidjava/src/main/java/com/mylove/baselib/utils/StatusBarUtil.java

@@ -15,9 +15,7 @@ import java.lang.reflect.Method;
 
 /**
  * @author myLove
- * @date 2018-04-28 13:13
- * @e-mail love@yanyi.red
- * @overview 管理手机状态栏
+ * 管理手机状态栏
  */
 public class StatusBarUtil {
     /**

baselib/src/main/java/com/mylove/baselib/utils/StringsUtil.java → androidjava/src/main/java/com/mylove/baselib/utils/StringsUtil.java

@@ -2,9 +2,6 @@ package com.mylove.baselib.utils;
 
 /**
  * @author myLove
- * @time 2017/11/15 9:34
- * @e-mail mylove.520.y@gmail.com
- * @overview
  */
 
 public class StringsUtil {

baselib/src/main/java/com/mylove/baselib/utils/file/FileSizeUtil.java → androidjava/src/main/java/com/mylove/baselib/utils/file/FileSizeUtil.java

@@ -61,10 +61,6 @@ public class FileSizeUtil {
 
     /**
      * 获取指定文件大小
-     *
-     * @param file
-     * @return
-     * @throws Exception
      */
     public static long getFileSize(File file) {
         long size = 0;
@@ -87,10 +83,6 @@ public class FileSizeUtil {
 
     /**
      * 获取指定文件夹
-     *
-     * @param f
-     * @return
-     * @throws Exception
      */
     public static long getFileSizes(File f) {
         long size = 0;
@@ -112,9 +104,6 @@ public class FileSizeUtil {
 
     /**
      * 转换文件大小
-     *
-     * @param fileS
-     * @return
      */
     private static String FormatFileSize(long fileS) {
         DecimalFormat df = new DecimalFormat("#.00");
@@ -137,10 +126,6 @@ public class FileSizeUtil {
 
     /**
      * 转换文件大小,指定转换的类型
-     *
-     * @param fileS
-     * @param sizeType
-     * @return
      */
     private static double FormatFileSize(long fileS, SizeType sizeType) {
         DecimalFormat df = new DecimalFormat("#.00");

baselib/src/main/java/com/mylove/baselib/utils/file/SizeType.java → androidjava/src/main/java/com/mylove/baselib/utils/file/SizeType.java

@@ -2,9 +2,6 @@ package com.mylove.baselib.utils.file;
 
 /**
  * @author myLove
- * @time 2017/11/15 10:00
- * @e-mail mylove.520.y@gmail.com
- * @overview
  */
 
 public enum SizeType {

baselib/src/main/java/com/mylove/baselib/utils/toast/ShowMsg.java → androidjava/src/main/java/com/mylove/baselib/utils/toast/ShowMsg.java

@@ -5,9 +5,7 @@ import android.widget.Toast;
 
 /**
  * @author myLove
- * @time 2017/11/3 13:42
- * @e-mail mylove.520.y@gmail.com
- * @overview 吐司显示位置类
+ * 吐司显示位置类
  */
 
 class ShowMsg {

baselib/src/main/java/com/mylove/baselib/utils/toast/ShowToast.java → androidjava/src/main/java/com/mylove/baselib/utils/toast/ShowToast.java

@@ -6,9 +6,7 @@ import android.widget.Toast;
 
 /**
  * @author myLove
- * @time 2017/10/31 12:24
- * @e-mail mylove.520.y@gmail.com
- * @overview 吐司工具类
+ * 吐司工具类
  */
 
 public class ShowToast {

baselib/src/main/java/com/mylove/baselib/utils/toast/ToastType.java → androidjava/src/main/java/com/mylove/baselib/utils/toast/ToastType.java

@@ -2,9 +2,7 @@ package com.mylove.baselib.utils.toast;
 
 /**
  * @author myLove
- * @time 2017/11/1 9:47
- * @e-mail mylove.520.y@gmail.com
- * @overview 吐司常量
+ * 吐司常量
  */
 
 public enum ToastType {

baselib/src/main/java/com/mylove/baselib/viewholder/RecyclerHolder.java → androidjava/src/main/java/com/mylove/baselib/viewholder/RecyclerHolder.java

@@ -9,7 +9,6 @@ import android.util.SparseArray;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
@@ -21,7 +20,6 @@ import java.util.Random;
  * 万能的RecyclerView的ViewHolder
  *
  * @author myLove
- * @date 2017/3/20
  */
 
 public class RecyclerHolder extends RecyclerView.ViewHolder {
@@ -77,10 +75,6 @@ public class RecyclerHolder extends RecyclerView.ViewHolder {
 
     /**
      * 设置字体文字颜色
-     *
-     * @param viewId
-     * @param colorID
-     * @return
      */
     public RecyclerHolder setTextColor(int viewId, int colorID) {
         TextView textView = getView(viewId);
@@ -90,60 +84,14 @@ public class RecyclerHolder extends RecyclerView.ViewHolder {
 
     /**
      * 设置控件显示隐藏
-     *
-     * @param viewID
-     * @param visibility
-     * @return
      */
     public RecyclerHolder setVisibility(int viewID, int visibility) {
         getView(viewID).setVisibility(visibility);
         return this;
     }
 
-    /**
-     * 多个recycler嵌套设置显示隐藏
-     */
-    public RecyclerHolder setVisibility(int viewID, boolean isVisible) {
-        View view = getView(viewID);
-        LinearLayout.LayoutParams param = (LinearLayout.LayoutParams) view.getLayoutParams();
-        if (isVisible) {
-            param.height = LinearLayout.LayoutParams.WRAP_CONTENT;
-            param.width = LinearLayout.LayoutParams.MATCH_PARENT;
-            view.setVisibility(View.VISIBLE);
-        } else {
-            view.setVisibility(View.GONE);
-            param.height = 0;
-            param.width = 0;
-        }
-        view.setLayoutParams(param);
-        return this;
-    }
-
-    /**
-     * 一个recycler设置显示隐藏
-     */
-    public RecyclerHolder setVisibility2(int viewID, boolean isVisible) {
-        View view = getView(viewID);
-        RecyclerView.LayoutParams param = (RecyclerView.LayoutParams) view.getLayoutParams();
-        if (isVisible) {
-            param.height = LinearLayout.LayoutParams.WRAP_CONTENT;
-            param.width = LinearLayout.LayoutParams.MATCH_PARENT;
-            view.setVisibility(View.VISIBLE);
-        } else {
-            view.setVisibility(View.GONE);
-            param.height = 0;
-            param.width = 0;
-        }
-        view.setLayoutParams(param);
-        return this;
-    }
-
     /**
      * check设置选中事件
-     *
-     * @param viewID
-     * @param boo
-     * @return
      */
     public RecyclerHolder setCheck(int viewID, boolean boo) {
         CheckBox cb = getView(viewID);
@@ -186,7 +134,7 @@ public class RecyclerHolder extends RecyclerView.ViewHolder {
         return this;
     }
 
-    public RecyclerHolder setImage(int viewID, String url, int width, int height){
+    public RecyclerHolder setImage(int viewID, String url, int width, int height) {
         Glide.with(context).load(url).into((ImageView) getView(viewID));
         return this;
     }

baselib/src/main/java/com/mylove/baselib/widget/BaseView.java → androidjava/src/main/java/com/mylove/baselib/widget/BaseView.java

@@ -8,9 +8,6 @@ import android.view.View;
 
 /**
  * @author myLove
- * @time 2017/11/15 10:37
- * @e-mail mylove.520.y@gmail.com
- * @overview
  */
 
 abstract class BaseView extends View {

baselib/src/main/java/com/mylove/baselib/widget/FullyGridLayoutManager.java → androidjava/src/main/java/com/mylove/baselib/widget/FullyGridLayoutManager.java

@@ -8,9 +8,7 @@ import android.view.ViewGroup;
 
 /**
  * @author myLove
- * @time 2018-01-17 11:36
- * @e-mail love@yanyi.red
- * @overview 重写GridLayoutManager，解决gird样式下的recyclerView与scrollView的冲突
+ * 重写GridLayoutManager，解决gird样式下的recyclerView与scrollView的冲突
  */
 
 public class FullyGridLayoutManager extends GridLayoutManager {

baselib/src/main/java/com/mylove/baselib/widget/FullyLinearLayoutManager.java → androidjava/src/main/java/com/mylove/baselib/widget/FullyLinearLayoutManager.java

@@ -8,9 +8,7 @@ import android.view.ViewGroup;
 
 /**
  * @author myLove
- * @time 2018-01-17 11:36
- * @e-mail love@yanyi.red
- * @overview 重写LinearLayoutManager, 解决水平样式recyclerView与scrollView的冲突
+ * 重写LinearLayoutManager, 解决水平样式recyclerView与scrollView的冲突
  */
 
 public class FullyLinearLayoutManager extends LinearLayoutManager {

baselib/src/main/java/com/mylove/baselib/widget/GridRecyclerView.java → androidjava/src/main/java/com/mylove/baselib/widget/GridRecyclerView.java

@@ -10,9 +10,7 @@ import android.view.animation.GridLayoutAnimationController;
 
 /**
  * @author myLove
- * @time 2018-01-12 09:49
- * @e-mail love@yanyi.red
- * @overview 解决RecyclerView设置成grid的情况下添加动画问题
+ * 解决RecyclerView设置成grid的情况下添加动画问题
  */
 
 public class GridRecyclerView extends RecyclerView {

baselib/src/main/java/com/mylove/baselib/widget/RecyclerViewAnimation.java → androidjava/src/main/java/com/mylove/baselib/widget/RecyclerViewAnimation.java

@@ -12,9 +12,7 @@ import java.util.List;
 
 /**
  * @author myLove
- * @date 2018-04-12 10:10
- * @e-mail love@yanyi.red
- * @overview RecyclerView动画
+ * RecyclerView动画
  */
 public class RecyclerViewAnimation {
 

baselib/src/main/java/com/mylove/baselib/widget/ScrollForRecycler.java → androidjava/src/main/java/com/mylove/baselib/widget/ScrollForRecycler.java

@@ -8,9 +8,6 @@ import android.widget.ScrollView;
 
 /**
  * @author myLove
- * @time 2018-01-16 16:38
- * @e-mail love@yanyi.red
- * @overview
  */
 
 public class ScrollForRecycler extends ScrollView {

baselib/src/main/java/com/mylove/baselib/widget/ScrollTextView.java → androidjava/src/main/java/com/mylove/baselib/widget/ScrollTextView.java

@@ -7,9 +7,7 @@ import android.util.AttributeSet;
 
 /**
  * @author myLove
- * @time 2017/11/15 11:13
- * @e-mail mylove.520.y@gmail.com
- * @overview 横向自动滚动的文字
+ * 横向自动滚动的文字
  */
 
 public class ScrollTextView extends AppCompatTextView {

baselib/src/main/java/com/mylove/baselib/widget/TouchImageView.java → androidjava/src/main/java/com/mylove/baselib/widget/TouchImageView.java

@@ -13,9 +13,7 @@ import android.widget.ImageView;
 
 /**
  * @author myLove
- * @time 2017/11/21 10:16
- * @e-mail mylove.520.y@gmail.com
- * @overview 图片手势旋转与缩放
+ * 图片手势旋转与缩放
  */
 
 @SuppressLint("AppCompatCustomView")

baselib/src/main/java/com/mylove/baselib/widget/VerticalScrollLayout.java → androidjava/src/main/java/com/mylove/baselib/widget/VerticalScrollLayout.java

@@ -14,9 +14,7 @@ import com.mylove.baselib.R;
 
 /**
  * @author myLove
- * @time 2017/11/15 11:21
- * @e-mail mylove.520.y@gmail.com
- * @overview 自动滚动布局
+ * 自动滚动布局
  */
 
 public class VerticalScrollLayout extends ViewFlipper {

baselib/src/main/java/com/mylove/baselib/widget/VerticalScrollTextView.java → androidjava/src/main/java/com/mylove/baselib/widget/VerticalScrollTextView.java

@@ -21,9 +21,7 @@ import java.util.List;
 
 /**
  * @author myLove
- * @time 2017/11/15 11:16
- * @e-mail mylove.520.y@gmail.com
- * @overview 竖直方向自动滚动文字
+ * 竖直方向自动滚动文字
  */
 
 public class VerticalScrollTextView extends RelativeLayout {

app/build.gradle

@@ -26,5 +26,5 @@ dependencies {
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
     implementation 'com.jakewharton:butterknife:8.8.1'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
-    implementation project(':baselib')
+    implementation project(':androidjava')
 }

app/src/main/java/com/mylove/basejava/MainActivity.java

@@ -1,13 +1,10 @@
 package com.mylove.basejava;
 
 import com.mylove.baselib.activity.permission.BasePermissionsActivity;
-import com.mylove.baselib.activity.permission.PermissionType;
+import com.yanyi.permissionlib.PermissionType;
 
 /**
  * @author myLove
- * @date 2018-05-08 15:04
- * @e-mail love@yanyi.red
- * @overview
  */
 public class MainActivity extends BasePermissionsActivity {
     @Override
@@ -16,7 +13,7 @@ public class MainActivity extends BasePermissionsActivity {
     }
 
     @Override
-    protected void setDate() {
+    protected void allPermissionSuccess() {
 
     }
 

baselib/src/main/java/com/mylove/baselib/activity/permission/BasePermissionsActivity.java

@@ -1,94 +0,0 @@
-package com.mylove.baselib.activity.permission;
-
-import android.content.Intent;
-import android.support.annotation.NonNull;
-
-import com.mylove.baselib.activity.BaseActivity;
-import com.mylove.loglib.JLog;
-
-import didikee.com.permissionshelper.PermissionsHelper;
-import didikee.com.permissionshelper.info.DialogInfo;
-
-/**
- * @author myLove
- * @time 2017/11/24 16:33
- * @e-mail mylove.520.y@gmail.com
- * @overview 获取权限activity
- */
-
-public abstract class BasePermissionsActivity extends BaseActivity {
-    private PermissionsHelper permissionsHelper;
-
-//    protected abstract PermissionType[] setPermissions();
-
-    protected abstract String[] setPermissions();
-
-    @Override
-    protected void init() {
-//        permissionsHelper = new PermissionsHelper(mActivity, permissions(), true);
-//        if (permissionsHelper.checkAllPermissions(permissions())) {
-        permissionsHelper = new PermissionsHelper(mActivity, setPermissions(), true);
-        if (permissionsHelper.checkAllPermissions(setPermissions())) {
-            permissionsHelper.onDestroy();
-            setDate();
-        } else {
-            //申请权限
-            permissionsHelper.startRequestNeedPermissions();
-            permissionsHelper.setParams(setDialogInfo(new DialogInfo()));
-        }
-        permissionsHelper.setonAllNeedPermissionsGrantedListener(new PermissionsHelper.onAllNeedPermissionsGrantedListener() {
-            //全部许可了,已经获得了所有权限
-            @Override
-            public void onAllNeedPermissionsGranted() {
-                //做原先的业务代码
-                setDate();
-            }
-
-            //被拒绝了,只要有一个权限被拒绝那么就会调用
-            @Override
-            public void onPermissionsDenied() {
-                //拒绝了,如何处理?(视情况而定)
-                JLog.d();
-                permissionsHelper.setParams(null);
-            }
-
-            //用户已经永久的拒绝了
-            @Override
-            public void hasLockForever() {
-                JLog.i("hasLockForever");
-                permissionsHelper.setParams(null);
-            }
-
-            //被拒绝后,在最后一次申请权限之前
-            @Override
-            public void onBeforeRequestFinalPermissions(PermissionsHelper helper) {
-                JLog.i();
-                helper.continueRequestPermissions();
-            }
-        });
-    }
-
-    protected abstract void setDate();
-
-    private DialogInfo setDialogInfo(DialogInfo dialogInfo) {
-        dialogInfo.setTitle("权限不足");
-        dialogInfo.setContent("需要必须的权限才能正常使用本应用");
-        dialogInfo.setPositiveButtonText("去设置");
-        dialogInfo.setNegativeButtonText("取消");
-        dialogInfo.showDialog(true);
-        return dialogInfo;
-    }
-
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,
-                                           @NonNull int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        permissionsHelper.onRequestPermissionsResult(requestCode, permissions, grantResults);
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        permissionsHelper.onActivityResult(requestCode, resultCode, data);
-    }
-}

baselib/src/main/java/com/mylove/baselib/activity/permission/PermissionBean.java

@@ -1,81 +0,0 @@
-package com.mylove.baselib.activity.permission;
-
-import android.Manifest;
-
-/**
- * @author myLove
- * @time 2017/11/24 16:51
- * @e-mail mylove.520.y@gmail.com
- * @overview 危险权限
- */
-
-final class PermissionBean {
-    /*
-   *   permission group : PHONE
-   * 	READ_PHONE_STATE
-   *   CALL_PHONE
-   *   READ_CALL_LOG
-   *   WRITE_CALL_LOG
-   *   ADD_VOICEMAIL
-   *   USE_SIP
-   *   PROCESS_OUTGOING_CALLS
-   */
-    static final String PHONE = Manifest.permission.READ_PHONE_STATE;
-
-    /**
-     * permission group : CALENDAR
-     * READ_CALENDAR
-     * WRITE_CALENDAR
-     */
-    static final String CALENDAR = Manifest.permission.READ_CALENDAR;
-
-    /**
-     * permission group : CAMERA
-     * CAMERA
-     */
-    static final String CAMERA = Manifest.permission.CAMERA;
-
-    /**
-     * permission group : CONTACTS
-     * READ_CONTACTS
-     * WRITE_CONTACTS
-     * GET_ACCOUNTS
-     */
-    static final String CONTACTS = Manifest.permission.READ_CONTACTS;
-
-    /**
-     * permission group : LOCATION
-     * ACCESS_FINE_LOCATION
-     * ACCESS_COARSE_LOCATION
-     */
-    static final String LOCATION = Manifest.permission.ACCESS_FINE_LOCATION;
-
-    /**
-     * permission group : MICROPHONE
-     * RECORD_AUDIO
-     */
-    static final String MICROPHONE = Manifest.permission.RECORD_AUDIO;
-
-    /**
-     * permission group : SENSORS
-     * BODY_SENSORS
-     */
-    static final String SENSORS = Manifest.permission.BODY_SENSORS;
-
-    /**
-     * permission group : SMS
-     * SEND_SMS
-     * RECEIVE_SMS
-     * READ_SMS
-     * RECEIVE_WAP_PUSH
-     * RECEIVE_MMS
-     */
-    static final String SMS = Manifest.permission.SEND_SMS;
-
-    /**
-     * permission group : STORAGE
-     * READ_EXTERNAL_STORAGE
-     * WRITE_EXTERNAL_STORAGE
-     */
-    static final String STORAGE = Manifest.permission.WRITE_EXTERNAL_STORAGE;
-}

baselib/src/main/java/com/mylove/baselib/activity/permission/PermissionType.java

@@ -1,91 +0,0 @@
-package com.mylove.baselib.activity.permission;
-
-import android.Manifest;
-
-/**
- * @author myLove
- * @time 2017/11/24 16:51
- * @e-mail mylove.520.y@gmail.com
- * @overview
- */
-public final class PermissionType {
-    /*
- *   permission group : PHONE
- * 	READ_PHONE_STATE
- *   CALL_PHONE
- *   READ_CALL_LOG
- *   WRITE_CALL_LOG
- *   ADD_VOICEMAIL
- *   USE_SIP
- *   PROCESS_OUTGOING_CALLS
- */
-    public static final String PHONE = Manifest.permission.READ_PHONE_STATE;
-
-    /**
-     * permission group : CALENDAR
-     * READ_CALENDAR
-     * WRITE_CALENDAR
-     */
-    public static final String CALENDAR = Manifest.permission.READ_CALENDAR;
-
-    /**
-     * permission group : CAMERA
-     * CAMERA
-     */
-    public static final String CAMERA = Manifest.permission.CAMERA;
-
-    /**
-     * permission group : CONTACTS
-     * READ_CONTACTS
-     * WRITE_CONTACTS
-     * GET_ACCOUNTS
-     */
-    public static final String CONTACTS = Manifest.permission.READ_CONTACTS;
-
-    /**
-     * permission group : LOCATION
-     * ACCESS_FINE_LOCATION
-     * ACCESS_COARSE_LOCATION
-     */
-    public static final String LOCATION = Manifest.permission.ACCESS_FINE_LOCATION;
-
-    /**
-     * permission group : MICROPHONE
-     * RECORD_AUDIO
-     */
-    public static final String MICROPHONE = Manifest.permission.RECORD_AUDIO;
-
-    /**
-     * permission group : SENSORS
-     * BODY_SENSORS
-     */
-    public static final String SENSORS = Manifest.permission.BODY_SENSORS;
-
-    /**
-     * permission group : SMS
-     * SEND_SMS
-     * RECEIVE_SMS
-     * READ_SMS
-     * RECEIVE_WAP_PUSH
-     * RECEIVE_MMS
-     */
-    public static final String SMS = Manifest.permission.SEND_SMS;
-
-    /**
-     * permission group : STORAGE
-     * READ_EXTERNAL_STORAGE
-     * WRITE_EXTERNAL_STORAGE
-     */
-    public static final String STORAGE = Manifest.permission.WRITE_EXTERNAL_STORAGE;
-}
-//public enum PermissionType {
-//    PHONE,
-//    CALENDAR,
-//    CAMERA,
-//    CONTACTS,
-//    LOCATION,
-//    MICROPHONE,
-//    SENSORS,
-//    SMS,
-//    STORAGE
-//}

baselib/src/main/java/com/mylove/baselib/utils/PingYinUtil.java

@@ -1,76 +0,0 @@
-package com.mylove.baselib.utils;
-
-import net.sourceforge.pinyin4j.PinyinHelper;
-import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType;
-import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat;
-import net.sourceforge.pinyin4j.format.HanyuPinyinToneType;
-import net.sourceforge.pinyin4j.format.HanyuPinyinVCharType;
-import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * @author myLove
- * @time 2017/11/15 10:19
- * @e-mail mylove.520.y@gmail.com
- * @overview
- */
-
-public class PingYinUtil {
-
-    /**
-     * 将字符串中的中文转化为拼音,其他字符不变
-     */
-    public static String getPingYin(String inputString) {
-        HanyuPinyinOutputFormat format = new HanyuPinyinOutputFormat();
-        format.setCaseType(HanyuPinyinCaseType.LOWERCASE);
-        format.setToneType(HanyuPinyinToneType.WITHOUT_TONE);
-        format.setVCharType(HanyuPinyinVCharType.WITH_V);
-
-        Pattern p = Pattern.compile("^[\u4E00-\u9FA5A-Za-z_]+$");
-        Matcher matcher = p.matcher(inputString.substring(0, 1));
-        if (matcher.find()) {
-            char[] input = inputString.trim().toCharArray();
-            StringBuilder output = new StringBuilder();
-            try {
-                for (char anInput : input) {
-                    if (Character.toString(anInput).matches(
-                            "[\\u4E00-\\u9FA5]+")) {
-                        String[] temp = PinyinHelper.toHanyuPinyinStringArray(
-                                anInput, format);
-                        output.append(temp[0]);
-                    } else
-                        output.append(Character.toString(anInput));
-                }
-            } catch (BadHanyuPinyinOutputFormatCombination e) {
-                e.printStackTrace();
-            }
-            return output.toString();
-        } else {
-            return "";
-        }
-    }
-
-    public static String converterToFirstSpell(String chines) {
-        StringBuilder pinyinName = new StringBuilder();
-        char[] nameChar = chines.toCharArray();
-        HanyuPinyinOutputFormat defaultFormat = new HanyuPinyinOutputFormat();
-        defaultFormat.setCaseType(HanyuPinyinCaseType.UPPERCASE);
-        defaultFormat.setToneType(HanyuPinyinToneType.WITHOUT_TONE);
-        for (char aNameChar : nameChar) {
-            if (aNameChar > 128) {
-                try {
-                    pinyinName.append(PinyinHelper.toHanyuPinyinStringArray(
-                            aNameChar, defaultFormat)[0].charAt(0));
-                } catch (BadHanyuPinyinOutputFormatCombination e) {
-                    e.printStackTrace();
-                }
-            } else {
-                pinyinName.append(aNameChar);
-            }
-        }
-        return pinyinName.toString();
-    }
-
-}

build.gradle

@@ -8,7 +8,8 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.1.2'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0' // Add this line
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.2'
         classpath 'com.jakewharton:butterknife-gradle-plugin:8.4.0'
         
 
@@ -21,9 +22,6 @@ allprojects {
     repositories {
         google()
         jcenter()
-        maven {
-            url 'https://jitpack.io'
-        }
     }
 }
 

settings.gradle

@@ -1 +1 @@
-include ':app', ':baselib'
+include ':app', ':androidjava'