Merge remote-tracking branch 'origin/master'

main/build.gradle

@@ -82,8 +82,6 @@ dependencies {
     implementation 'com.justkiddingbaby:slidemenu:1.3.0'
     implementation 'com.xj.marqueeView:marqueeView:0.1.20'
     implementation 'com.google.android.gms:play-services-auth:15.0.0'
-    //Google 繁體簡體轉換庫
-    implementation files('libs/jcc-bate-0.7.3.jar')
     //引导层
     implementation 'com.binioter:guideview:1.0.0'
 }

main/src/main/java/com/yunbao/main/activity/SearchActivity.java

@@ -26,12 +26,11 @@ import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.live.activity.LiveAudienceActivity;
 import com.yunbao.live.bean.LiveBean;
 import com.yunbao.live.http.LiveHttpUtil;
-import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
 import com.yunbao.main.R;
 import com.yunbao.main.event.JumpUserHomeEvent;
 import com.yunbao.main.fragment.SearchRecommendFragment;
 import com.yunbao.main.fragment.SearchResultsFragment;
-import com.yunbao.main.utils.WordsTypeUtil;
+import com.yunbao.common.utils.WordsTypeUtil;
 
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;

main/src/main/java/com/yunbao/main/fragment/SearchResultsItemFragment.java

@@ -20,7 +20,7 @@ import com.yunbao.common.views.weight.OnRecyclerViewScrollListener;
 import com.yunbao.main.R;
 import com.yunbao.main.adapter.SearchRecommendBodyAdapter;
 import com.yunbao.main.adapter.SearchResultsItemAdapter;
-import com.yunbao.main.utils.WordsTypeUtil;
+import com.yunbao.common.utils.WordsTypeUtil;
 
 import java.util.ArrayList;
 import java.util.List;

main/src/main/java/com/yunbao/main/utils/WordsTypeUtil.java

@@ -1,36 +0,0 @@
-package com.yunbao.main.utils;
-
-import java.io.IOException;
-
-import taobe.tec.jcc.JChineseConvertor;
-
-/**
- * 繁體簡體轉換類
- */
-public class WordsTypeUtil {
-    //繁体转成简体
-    public static String changeSimplified(String changeText) {
-        try {
-            JChineseConvertor jChineseConvertor = JChineseConvertor
-                    .getInstance();
-            changeText = jChineseConvertor.t2s(changeText);
-
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return changeText;
-    }
-
-    //简体转繁体
-    public static String changeTraditional(String changeText) {
-        try {
-            JChineseConvertor jChineseConvertor = JChineseConvertor
-                    .getInstance();
-            changeText = jChineseConvertor.s2t(changeText);
-
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return changeText;
-    }
-}

main/src/main/java/com/yunbao/main/views/SearchResultsViewHolder.java

@@ -21,7 +21,7 @@ import com.yunbao.common.utils.Bus;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
 import com.yunbao.main.R;
 import com.yunbao.main.event.JumpUserHomeEvent;
-import com.yunbao.main.utils.WordsTypeUtil;
+import com.yunbao.common.utils.WordsTypeUtil;
 
 public class SearchResultsViewHolder extends RecyclerView.ViewHolder {
     private ImageView avatar, isLive, sex, focusOn, contribute;