FIX BUG

SiberiaDante · Sep 21, 2017 · 76dd52e · 76dd52e
1 parent 4be12b6
commit 76dd52e
Show file tree

Hide file tree

Showing 51 changed files with 171 additions and 197 deletions.
diff --git a/customapp/src/main/java/com/siberiadante/custom/http/RetrofitManager.java b/customapp/src/main/java/com/siberiadante/custom/http/RetrofitManager.java
@@ -6,7 +6,7 @@
 import com.siberiadante.custom.constant.Constants;
 import com.siberiadante.custom.http.manager.NetException;
 import com.siberiadante.lib.util.StringUtil;
-import com.siberiadante.lib.util.ToastUtil;
+import com.siberiadante.lib.util.SDToast;
 
 import java.util.concurrent.TimeUnit;
 
@@ -98,9 +98,9 @@ public boolean test(@NonNull T t) throws Exception {
                                 if (((WrapResult) t).getCode() != 200) {
                                     final String errorMsg = ((WrapResult) t).getInfo();
                                     if (StringUtil.isEmpty(errorMsg)) {
-                                        ToastUtil.toast("服务器内部错误");
+                                        SDToast.toast("服务器内部错误");
                                     } else {
-                                        ToastUtil.toast(errorMsg);
+                                        SDToast.toast(errorMsg);
                                     }
                                 }
                                 return ((WrapResult) t).getCode() == 200;

diff --git a/customapp/src/main/java/com/siberiadante/custom/ui/activity/MainActivity.java b/customapp/src/main/java/com/siberiadante/custom/ui/activity/MainActivity.java
@@ -5,13 +5,10 @@
 import android.support.v4.app.FragmentTransaction;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.widget.RadioGroup;
-import android.widget.Toast;
 
 import com.siberiadante.custom.R;
 import com.siberiadante.custom.bean.QuestionData;
@@ -24,20 +21,16 @@
 import com.siberiadante.custom.ui.fragment.ThreeFragment;
 import com.siberiadante.custom.ui.fragment.TwoFragment;
 import com.siberiadante.lib.util.LogUtil;
-import com.siberiadante.lib.util.ScreenUtil;
-import com.siberiadante.lib.util.ToastUtil;
-import com.siberiadante.lib.util.TransitionTools;
+import com.siberiadante.lib.util.SDToast;
 import com.siberiadante.lib.widget.TabRadioButton;
 
 import java.util.List;
 
 import butterknife.BindView;
 import butterknife.BindViews;
-import io.reactivex.Observable;
 import io.reactivex.Observer;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.annotations.NonNull;
-import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
 
@@ -179,8 +172,8 @@ private void exitDoubleClick() {
         long currentTime = System.currentTimeMillis();
         Log.d(TAG, "onBackPressed: " + currentTime);
         if (currentTime - tempTime > 2000) {
-            ToastUtil.toast("再按一次退出应用");
-            ToastUtil.resetToast();
+            SDToast.toast("再按一次退出应用");
+            SDToast.resetToast();
             tempTime = currentTime;
         } else {
             System.exit(0);

diff --git a/customapp/src/main/java/com/siberiadante/custom/ui/fragment/FourFragment.java b/customapp/src/main/java/com/siberiadante/custom/ui/fragment/FourFragment.java
@@ -4,7 +4,7 @@
 import android.util.Log;
 
 import com.siberiadante.custom.R;
-import com.siberiadante.lib.util.ToastUtil;
+import com.siberiadante.lib.util.SDToast;
 
 /**
  * @Created SiberiaDante
@@ -31,7 +31,7 @@ public void onCreate(Bundle savedInstanceState) {
     protected void onCreateViewLazy(Bundle savedInstanceState) {
         super.onCreateViewLazy(savedInstanceState);
         setContentView(R.layout.fragment_four);
-        ToastUtil.toast("第四个页面");
+        SDToast.toast("第四个页面");
 
         Log.d(TAG, "onCreateViewLazy: FragmentFour");
     }

diff --git a/customapp/src/main/java/com/siberiadante/custom/ui/fragment/OneFragment.java b/customapp/src/main/java/com/siberiadante/custom/ui/fragment/OneFragment.java
@@ -10,7 +10,7 @@
 import com.siberiadante.custom.ui.activity.Main2Activity;
 import com.siberiadante.custom.util.ImageLoadUtil;
 import com.siberiadante.lib.util.LogUtil;
-import com.siberiadante.lib.util.ToastUtil;
+import com.siberiadante.lib.util.SDToast;
 
 import java.util.concurrent.TimeUnit;
 
@@ -43,7 +43,7 @@ public void onCreate(Bundle savedInstanceState) {
     protected void onCreateViewLazy(Bundle savedInstanceState) {
         super.onCreateViewLazy(savedInstanceState);
         setContentView(R.layout.fragment_one);
-        ToastUtil.toast("第一个页面");
+        SDToast.toast("第一个页面");
         Log.d(TAG, "onCreateViewLazy: FragmentOne");
         initView();
     }

diff --git a/customapp/src/main/java/com/siberiadante/custom/ui/fragment/ThreeFragment.java b/customapp/src/main/java/com/siberiadante/custom/ui/fragment/ThreeFragment.java
@@ -4,7 +4,7 @@
 import android.util.Log;
 
 import com.siberiadante.custom.R;
-import com.siberiadante.lib.util.ToastUtil;
+import com.siberiadante.lib.util.SDToast;
 
 /**
  * @Created SiberiaDante
@@ -31,7 +31,7 @@ public void onCreate(Bundle savedInstanceState) {
     protected void onCreateViewLazy(Bundle savedInstanceState) {
         super.onCreateViewLazy(savedInstanceState);
         setContentView(R.layout.fragment_three);
-        ToastUtil.toast("第三个页面");
+        SDToast.toast("第三个页面");
 
         Log.d(TAG, "onCreateViewLazy: FragmentThree");
     }

diff --git a/customapp/src/main/java/com/siberiadante/custom/ui/fragment/TwoFragment.java b/customapp/src/main/java/com/siberiadante/custom/ui/fragment/TwoFragment.java
@@ -9,18 +9,16 @@
 
 import com.siberiadante.custom.R;
 import com.siberiadante.custom.bean.LoginResponse;
-import com.siberiadante.custom.bean.NewsData;
 import com.siberiadante.custom.bean.base.WrapResult;
 import com.siberiadante.custom.constant.Constants;
 import com.siberiadante.custom.http.ApiService;
 import com.siberiadante.custom.http.Request;
 import com.siberiadante.custom.http.RetrofitManager;
 import com.siberiadante.lib.util.LogUtil;
-import com.siberiadante.lib.util.ToastUtil;
-import com.siberiadante.lib.view.TitleBar;
+import com.siberiadante.lib.util.SDToast;
+import com.siberiadante.lib.view.titlebar.SDTitleBar;
 
 import java.util.HashMap;
-import java.util.List;
 
 import io.reactivex.Observer;
 import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -39,7 +37,7 @@
 public class TwoFragment extends LazyFragment {
     public static final String TAG = TwoFragment.class.getSimpleName();
     private int mPage = 1;
-    TitleBar mTitleBar;
+    SDTitleBar mSDTitleBar;
     private LinearLayout mLLProgress;
     private RecyclerView recyclerView;
 
@@ -58,18 +56,18 @@ protected void onCreateViewLazy(Bundle savedInstanceState) {
         super.onCreateViewLazy(savedInstanceState);
         Log.d(TAG, "onCreateViewLazy: 2");
         setContentView(R.layout.fragment_two);
-        ToastUtil.toast("第二个页面");
+        SDToast.toast("第二个页面");
         Log.d(TAG, "onCreateViewLazy: FragmentTwo");
         initView();
         initIntent();
         initData();
     }
 
     private void initView() {
-        mTitleBar = (TitleBar) findViewById(R.id.title_bar);
+        mSDTitleBar = (SDTitleBar) findViewById(R.id.title_bar);
         mLLProgress = ((LinearLayout) findViewById(R.id.ll_progress_bar));
-        mTitleBar.setTitle("SiberiaDante-ZCL");
-        mTitleBar.setRightImage(R.mipmap.ic_recommend_default);
+        mSDTitleBar.setTitle("SiberiaDante-ZCL");
+        mSDTitleBar.setRightImage(R.mipmap.ic_recommend_default);
         recyclerView = (RecyclerView) findViewById(R.id.rv_fragment_two);
         recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
     }

diff --git a/customapp/src/main/res/layout/fragment_two.xml b/customapp/src/main/res/layout/fragment_two.xml
@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.siberiadante.lib.view.TitleBar
+    <com.siberiadante.lib.view.titlebar.SDTitleBar
         android:id="@+id/title_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

diff --git a/customapp/src/main/res/layout/title_bar_base.xml b/customapp/src/main/res/layout/title_bar_base.xml
@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.siberiadante.lib.view.TitleBar
+    <com.siberiadante.lib.view.titlebar.SDTitleBar
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/action_sheet_blue" />

diff --git a/sample/src/main/java/com/sample/ui/activity/MainActivity.java b/sample/src/main/java/com/sample/ui/activity/MainActivity.java
@@ -24,8 +24,8 @@
 import com.sample.ui.fragment.ViewFragment;
 import com.siberiadante.lib.manager.PermissionManager;
 import com.siberiadante.lib.util.LogUtil;
-import com.siberiadante.lib.util.ToastUtil;
-import com.siberiadante.lib.view.SDTitleLayout;
+import com.siberiadante.lib.util.SDToast;
+import com.siberiadante.lib.view.titlebar.SDTitleLayout;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -98,7 +98,7 @@ public void onClick(View view) {
         mMianTitle.setLeftClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                ToastUtil.toast("back");
+                SDToast.toast("back");
             }
         });
     }
@@ -203,7 +203,7 @@ private void exitBy2Click() {
         Timer tExit = null;
         if (!isExit) {
             isExit = true; // 准备退出
-            ToastUtil.toastCenterShort("再按一次退出程序");
+            SDToast.toastCenterShort("再按一次退出程序");
             tExit = new Timer();
             tExit.schedule(new TimerTask() {
                 @Override

diff --git a/sample/src/main/java/com/sample/ui/activity/WebViewActivity.java b/sample/src/main/java/com/sample/ui/activity/WebViewActivity.java
@@ -12,13 +12,13 @@
 
 import com.sample.R;
 import com.siberiadante.lib.util.ScreenUtil;
-import com.siberiadante.lib.view.TitleBar;
+import com.siberiadante.lib.view.titlebar.SDTitleBar;
 
 public class WebViewActivity extends BaseActivity {
 
     private String url;
     private WebView mWebView;
-    private TitleBar mTitleBar;
+    private SDTitleBar mSDTitleBar;
     private String title;
 
     @Override
@@ -38,8 +38,8 @@ private void initIntent() {
     }
 
     private void initView() {
-        mTitleBar = (TitleBar) findViewById(R.id.title_bar_web_view);
-        setTitleBar(mTitleBar);
+        mSDTitleBar = (SDTitleBar) findViewById(R.id.title_bar_web_view);
+        setTitleBar(mSDTitleBar);
         mWebView = (WebView) findViewById(R.id.wv_web_view);
         setWebView();
 
@@ -64,11 +64,11 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
         });
     }
 
-    private void setTitleBar(TitleBar mTitleBar) {
-        mTitleBar.setImmersive(true);
-        mTitleBar.setTitle(title);
-        mTitleBar.setLeftText("返回");
-        mTitleBar.setLeftListener(new View.OnClickListener() {
+    private void setTitleBar(SDTitleBar mSDTitleBar) {
+        mSDTitleBar.setImmersive(true);
+        mSDTitleBar.setTitle(title);
+        mSDTitleBar.setLeftText("返回");
+        mSDTitleBar.setLeftListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 WebViewActivity.this.finish();

diff --git a/sample/src/main/java/com/sample/ui/activity/util/NumberActivity.java b/sample/src/main/java/com/sample/ui/activity/util/NumberActivity.java
@@ -8,7 +8,7 @@
 import com.sample.R;
 import com.sample.ui.activity.BaseActivity;
 import com.siberiadante.lib.util.NumberUtil;
-import com.siberiadante.lib.view.TitleBar;
+import com.siberiadante.lib.view.titlebar.SDTitleBar;
 
 import butterknife.ButterKnife;
 
@@ -26,10 +26,10 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     private void initView() {
-        TitleBar mTitleBar = (TitleBar) findViewById(R.id.title_bar_number);
-        mTitleBar.setBackgroundResource(R.color.red);
-        mTitleBar.setTitle("NumberUtil测试");
-        mTitleBar.setImmersive(true);
+        SDTitleBar mSDTitleBar = (SDTitleBar) findViewById(R.id.title_bar_number);
+        mSDTitleBar.setBackgroundResource(R.color.red);
+        mSDTitleBar.setTitle("NumberUtil测试");
+        mSDTitleBar.setImmersive(true);
         edtInput = (EditText) findViewById(R.id.edt_input);
         mBtnOne = ((Button) findViewById(R.id.btn_number_test_one));
 

diff --git a/sample/src/main/java/com/sample/ui/activity/util/PermissionManagerActivity.java b/sample/src/main/java/com/sample/ui/activity/util/PermissionManagerActivity.java
@@ -2,17 +2,14 @@
 
 import android.Manifest;
 import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
-import android.widget.Toast;
 
 import com.sample.R;
 import com.sample.ui.activity.BaseActivity;
-import com.sample.ui.activity.MainActivity;
 import com.siberiadante.lib.manager.PermissionManager;
-import com.siberiadante.lib.util.ToastUtil;
+import com.siberiadante.lib.util.SDToast;
 
 public class PermissionManagerActivity extends BaseActivity {
     private Button record;
@@ -54,19 +51,19 @@ private void initListener() {
             @Override
             public void onClick(View v) {
                 if (PermissionManager.getInstance(getApplicationContext()).getGrantedInfo(Manifest.permission.RECORD_AUDIO)) {
-                    ToastUtil.toast("录音权限已经获取");
+                    SDToast.toast("录音权限已经获取");
                 } else {
-                    ToastUtil.toast("你还没有获取录音权限");
+                    SDToast.toast("你还没有获取录音权限");
                 }
             }
         });
         sd.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 if (PermissionManager.getInstance(getApplicationContext()).getGrantedInfo(Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
-                    ToastUtil.toast("SD权限已经获取");
+                    SDToast.toast("SD权限已经获取");
                 } else {
-                    ToastUtil.toast("你还没有获取SD权限");
+                    SDToast.toast("你还没有获取SD权限");
                 }
             }
         });