Merge branch 'master' of http://10.8.230.114:3000/kemllor/small_sheep_android

app/src/main/java/com/sheep/jiuyan/samllsheep/page/BindWxActivity.java

@@ -3,7 +3,6 @@ package com.sheep.jiuyan.samllsheep.page;
 import android.support.design.widget.TextInputEditText;
 import android.text.TextUtils;
 import android.view.View;
-import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -13,12 +12,11 @@ import com.sheep.jiuyan.samllsheep.net.NetManager;
 import com.sheep.jiuyan.samllsheep.net.SheepCallback;
 import com.sheep.jiuyan.samllsheep.net.Url;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import java.util.HashMap;
 
 public class BindWxActivity extends BaseActivity implements View.OnClickListener {
-    private ImageView mBack;
-    private TextView mTitle;
     private TextInputEditText mEtWx;
     private TextView mTvWx;
     private TextView mRobot;
@@ -32,17 +30,15 @@ public class BindWxActivity extends BaseActivity implements View.OnClickListener
     public void initView() {
         mEtWx =(TextInputEditText) findViewById(R.id.et_wx);
         mTvWx = (TextView) findViewById(R.id.tv_wx);
-        mBack = (ImageView) findViewById(R.id.img_baseactivity_title);
-        mTitle = (TextView) findViewById(R.id.txt_baseactivity_title);
         mRobot = (TextView) findViewById(R.id.tv_robot);
-        mTitle.setText("绑定微信");
+        TitleBarUtils.getInstance()
+                .setTitle(this,"绑定微信")
+                .setTitleFinish(this);
     }
 
     @Override
     public void initListener() {
-        mBack.setOnClickListener(this);
         mTvWx.setOnClickListener(this);
-
     }
 
     @Override
@@ -59,12 +55,8 @@ public class BindWxActivity extends BaseActivity implements View.OnClickListener
     @Override
     public void onClick(View v) {
         int i = v.getId();
-        if (i == R.id.img_baseactivity_title) {
-            finish();
-
-        } else if (i == R.id.tv_wx) {
+        if (i == R.id.tv_wx) {
             bindWx();
-
         }
     }
 

app/src/main/java/com/sheep/jiuyan/samllsheep/page/DownloadActivity.java

@@ -5,21 +5,21 @@ import android.os.Bundle;
 import android.os.Environment;
 import android.os.SystemClock;
 import android.support.annotation.Nullable;
-import android.view.View;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
+import com.liulishuo.filedownloader.BaseDownloadTask;
+import com.liulishuo.filedownloader.FileDownloadListener;
+import com.liulishuo.filedownloader.FileDownloader;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
 import com.sheep.jiuyan.samllsheep.page.entry.Task;
 import com.sheep.jiuyan.samllsheep.utils.FileUtil;
 import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
-import com.liulishuo.filedownloader.BaseDownloadTask;
-import com.liulishuo.filedownloader.FileDownloadListener;
-import com.liulishuo.filedownloader.FileDownloader;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import java.io.File;
 
@@ -39,8 +39,6 @@ public class DownloadActivity extends BaseActivity {
     private ProgressBar mPbDownload;
     private ImageView mImgIcon;
     private TextView mTvTime;
-    private TextView mTvTitle;
-    private View mBack;
     private TextView mTvPercent;
 
 
@@ -60,17 +58,11 @@ public class DownloadActivity extends BaseActivity {
 
     @Override
     public void initListener() {
-        mBack.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                finish();
-            }
-        });
+
     }
 
     @Override
     public void initData() {
-        mTvTitle.setText("任务下载");
         Intent intent = getIntent();
         Task task = (Task) intent.getSerializableExtra("task");
         mPath = Environment.getExternalStorageDirectory().getAbsolutePath() + "/"
@@ -96,6 +88,9 @@ public class DownloadActivity extends BaseActivity {
     @Override
     public void initView() {
         findViews();
+        TitleBarUtils.getInstance()
+                .setTitle(this,"任务下载")
+                .setTitleFinish(this);
     }
 
 
@@ -104,8 +99,6 @@ public class DownloadActivity extends BaseActivity {
         mPbDownload = (ProgressBar) findViewById(R.id.pb_download);
         mImgIcon = (ImageView) findViewById(R.id.img_icon);
         mTvTime = (TextView) findViewById(R.id.tv_time);
-        mTvTitle = (TextView) findViewById(R.id.txt_baseactivity_title);
-        mBack = findViewById(R.id.img_baseactivity_title);
     }
 
 

app/src/main/java/com/sheep/jiuyan/samllsheep/page/InputWXAccountActivity.java

@@ -14,6 +14,7 @@ import com.sheep.jiuyan.samllsheep.net.NetManager;
 import com.sheep.jiuyan.samllsheep.net.SheepCallback;
 import com.sheep.jiuyan.samllsheep.net.Url;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import java.util.HashMap;
 
@@ -41,9 +42,6 @@ public class InputWXAccountActivity extends BaseActivity implements View.OnClick
     private TextView tv_wx;
 
 
-    private TextView mTitle;
-    private ImageView img_back;
-
     @Override
     protected int getLayoutId() {
         return R.layout.input_wx_account_activity;
@@ -52,15 +50,12 @@ public class InputWXAccountActivity extends BaseActivity implements View.OnClick
     @Override
     public void initView() {
 
-        mTitle=(TextView) findViewById(R.id.txt_baseactivity_title);
         mLl1=(LinearLayout)findViewById(R.id.ll_1);
         mLl2=(LinearLayout)findViewById(R.id.ll_2);
         mLl3=(LinearLayout)findViewById(R.id.ll_3);
         mLl4=(LinearLayout)findViewById(R.id.ll_4);
 
 
-        img_back=(ImageView) findViewById(R.id.img_baseactivity_title);
-
         et_account_1=(TextInputEditText)findViewById(R.id.et_account_1);
         et_account_2=(TextInputEditText)findViewById(R.id.et_account_2);
         et_account_3=(TextInputEditText)findViewById(R.id.et_account_3);
@@ -72,17 +67,18 @@ public class InputWXAccountActivity extends BaseActivity implements View.OnClick
         et_pwd_4=(TextInputEditText)findViewById(R.id.et_pwd_4);
 
         tv_wx=(TextView) findViewById(R.id.tv_wx);
+        TitleBarUtils.getInstance()
+                .setTitle(this,"账户信息")
+                .setTitleFinish(this);
     }
 
     @Override
     public void initListener() {
         tv_wx.setOnClickListener(this);
-        img_back.setOnClickListener(this);
     }
 
     @Override
     public void initData() {
-        mTitle.setText("账户信息");
         Intent i=getIntent();
         int  count =i.getIntExtra("count",0);
 
@@ -142,10 +138,6 @@ public class InputWXAccountActivity extends BaseActivity implements View.OnClick
         if (i == R.id.tv_wx) {
             upload();
 
-        }else if(i==R.id.img_baseactivity_title){
-            finish();
         }
-
-
     }
 }

app/src/main/java/com/sheep/jiuyan/samllsheep/page/MoneyHistroyActivity.java

@@ -1,10 +1,7 @@
 package com.sheep.jiuyan.samllsheep.page;
 
 import android.text.TextUtils;
-import android.view.View;
-import android.widget.ImageView;
 import android.widget.ListView;
-import android.widget.TextView;
 
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
@@ -13,6 +10,7 @@ import com.sheep.jiuyan.samllsheep.net.SheepCallback;
 import com.sheep.jiuyan.samllsheep.net.Url;
 import com.sheep.jiuyan.samllsheep.page.entry.MoneyHistroy;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 import com.zhy.adapter.abslistview.CommonAdapter;
 import com.zhy.adapter.abslistview.ViewHolder;
 
@@ -25,8 +23,6 @@ import java.util.List;
 
 public class MoneyHistroyActivity extends BaseActivity {
     private ListView mLv;
-    private TextView mTitle;
-    private ImageView mImgBack;
     private CommonAdapter<MoneyHistroy> mAdapter;
 
     @Override
@@ -37,19 +33,13 @@ public class MoneyHistroyActivity extends BaseActivity {
     @Override
     public void initView() {
         mLv = (ListView) findViewById(R.id.lv);
-        mTitle = (TextView) findViewById(R.id.txt_baseactivity_title);
-        mImgBack = (ImageView) findViewById(R.id.img_baseactivity_title);
-
+        TitleBarUtils.getInstance()
+                .setTitle(this,"资金记录")
+                .setTitleFinish(this);
     }
 
     @Override
     public void initListener() {
-        mImgBack.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                finish();
-            }
-        });
     }
     private  void  showView(List<MoneyHistroy> orders){
         mAdapter=new CommonAdapter<MoneyHistroy>(MoneyHistroyActivity.this,R.layout.money_history_item, orders) {
@@ -90,7 +80,6 @@ public class MoneyHistroyActivity extends BaseActivity {
     }
     @Override
     public void initData() {
-        mTitle.setText("资金记录");
         getTask();
     }
 }

app/src/main/java/com/sheep/jiuyan/samllsheep/page/TaskRecordActivity.java

@@ -20,6 +20,7 @@ import com.sheep.jiuyan.samllsheep.net.Url;
 import com.sheep.jiuyan.samllsheep.page.entry.Commit;
 import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 import com.zhy.adapter.abslistview.CommonAdapter;
 import com.zhy.adapter.abslistview.ViewHolder;
 
@@ -32,8 +33,6 @@ import java.util.List;
 
 public class TaskRecordActivity extends BaseActivity {
     private ListView mLvTask;
-    private TextView mTvTitle;
-    private View mBack;
     private CommonAdapter mAdapter;
     private List<Commit> mCommits;
     private AlertDialog mDialog;
@@ -48,19 +47,13 @@ public class TaskRecordActivity extends BaseActivity {
     public void initView() {
         mLvTask = (ListView) findViewById(R.id.lv_task);
         mLvTask.setDividerHeight(0);
-        mTvTitle = (TextView) findViewById(R.id.txt_baseactivity_title);
-        mBack = findViewById(R.id.img_baseactivity_title);
-
+        TitleBarUtils.getInstance()
+                .setTitle(this,"任务记录")
+                .setTitleFinish(this);
     }
 
     @Override
     public void initListener() {
-        mBack.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                finish();
-            }
-        });
         mLvTask.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
@@ -170,8 +163,6 @@ public class TaskRecordActivity extends BaseActivity {
 
     @Override
     public void initData() {
-        mTvTitle.setText("任务记录");
-
         HashMap<String, String> map = new HashMap<>();
         map.put("wx_open_id", SpUtils.getOpenId(this));
         NetManager.get(Url.USER_COMMIT, map, getApplicationContext(), new SheepCallback<List<Commit>>(this) {

app/src/main/java/com/sheep/jiuyan/samllsheep/page/UserCenterActivity.java

@@ -3,7 +3,6 @@ package com.sheep.jiuyan.samllsheep.page;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -15,6 +14,7 @@ import com.sheep.jiuyan.samllsheep.net.SheepCallback;
 import com.sheep.jiuyan.samllsheep.net.Url;
 import com.sheep.jiuyan.samllsheep.page.entry.User;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import java.util.HashMap;
 
@@ -35,8 +35,6 @@ import de.hdodenhof.circleimageview.CircleImageView;
 
 public class UserCenterActivity extends BaseActivity implements View.OnClickListener {
     private CircleImageView mImgIcon;
-    private ImageView mBack;
-    private TextView mTitle;
     private TextView mTvNick;
     private TextView mTvLevel;
     private TextView mTvMoney;
@@ -66,14 +64,12 @@ public class UserCenterActivity extends BaseActivity implements View.OnClickList
         mTvWithdraw.setOnClickListener(this);
         mTvTask.setOnClickListener(this);
         mTvWithdrawHostroy.setOnClickListener(this);
-        mBack.setOnClickListener(this);
         mLlMoneyHostroy.setOnClickListener(this);
         tv_wx_aacount.setOnClickListener(this);
     }
 
     @Override
     public void initData() {
-        mTitle.setText("个人中心");
         HashMap<String, String> map = new HashMap<>();
         map.put("wx_open_id", SpUtils.getOpenId(this));
         NetManager.get(Url.USER_INFO, map, getApplicationContext(), new SheepCallback<User>(this) {
@@ -99,11 +95,13 @@ public class UserCenterActivity extends BaseActivity implements View.OnClickList
         mTvWithdraw = (TextView) findViewById(R.id.tv_withdraw);
         mTvTask = (TextView) findViewById(R.id.tv_task);
         mTvWithdrawHostroy = (TextView) findViewById(R.id.tv_withdraw_hostroy);
-        mBack = (ImageView) findViewById(R.id.img_baseactivity_title);
-        mTitle = (TextView) findViewById(R.id.txt_baseactivity_title);
         tv_wx_aacount = (TextView) findViewById(R.id.tv_wx_aacount);
 
         mLlMoneyHostroy = (LinearLayout) findViewById(R.id.ll_money_hostroy);
+
+        TitleBarUtils.getInstance()
+                .setTitle(this,"个人中心")
+                .setTitleFinish(this);
     }
 
     @Override
@@ -153,9 +151,6 @@ public class UserCenterActivity extends BaseActivity implements View.OnClickList
             }
 
 
-        } else if (i == R.id.img_baseactivity_title) {
-            finish();
-
         }
     }
 

app/src/main/java/com/sheep/jiuyan/samllsheep/page/WXAccountActivity.java

@@ -1,7 +1,5 @@
 package com.sheep.jiuyan.samllsheep.page;
 
-import android.view.View;
-import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 
@@ -12,6 +10,7 @@ import com.sheep.jiuyan.samllsheep.net.SheepCallback;
 import com.sheep.jiuyan.samllsheep.net.Url;
 import com.sheep.jiuyan.samllsheep.page.entry.WXAccount;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 import com.zhy.adapter.abslistview.CommonAdapter;
 import com.zhy.adapter.abslistview.ViewHolder;
 
@@ -24,8 +23,6 @@ import java.util.List;
 
 public class WXAccountActivity extends BaseActivity {
     private ListView mLv;
-    private TextView mTitle;
-    private ImageView mImgBack;
     private CommonAdapter<WXAccount> mAdapter;
 
     @Override
@@ -36,19 +33,13 @@ public class WXAccountActivity extends BaseActivity {
     @Override
     public void initView() {
         mLv = (ListView) findViewById(R.id.lv);
-        mTitle = (TextView) findViewById(R.id.txt_baseactivity_title);
-        mImgBack = (ImageView) findViewById(R.id.img_baseactivity_title);
-
+        TitleBarUtils.getInstance()
+                .setTitle(this,"账户信息")
+                .setTitleFinish(this);
     }
 
     @Override
     public void initListener() {
-        mImgBack.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                finish();
-            }
-        });
     }
     private  void  showView(List<WXAccount> orders){
         mAdapter=new CommonAdapter<WXAccount>(WXAccountActivity.this,R.layout.wx_account_item, orders) {
@@ -97,7 +88,6 @@ public class WXAccountActivity extends BaseActivity {
     }
     @Override
     public void initData() {
-        mTitle.setText("账户信息");
         getTask();
     }
 }

app/src/main/java/com/sheep/jiuyan/samllsheep/page/WebActivity.java

@@ -11,6 +11,7 @@ import android.widget.TextView;
 
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 /**
  * Created by kemllor on 2018/1/2.
@@ -19,8 +20,6 @@ import com.sheep.jiuyan.samllsheep.base.BaseActivity;
 public class WebActivity extends BaseActivity {
 
     private WebView mWeb;
-    private TextView mTitle;
-    private View mBack;
 
     @Override
     protected int getLayoutId() {
@@ -30,8 +29,6 @@ public class WebActivity extends BaseActivity {
     @Override
     public void initView() {
         mWeb = (WebView) findViewById(R.id.web);
-        mTitle = (TextView) findViewById(R.id.txt_baseactivity_title);
-        mBack = findViewById(R.id.img_baseactivity_title);
         mWeb.setWebChromeClient(new WebChromeClient() {
 
         });
@@ -43,22 +40,17 @@ public class WebActivity extends BaseActivity {
                 return true;
             }
         });
-
+        TitleBarUtils.getInstance()
+                .setTitle(this,"任务攻略")
+                .setTitleFinish(this);
     }
 
     @Override
     public void initListener() {
-        mBack.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                finish();
-            }
-        });
     }
 
     @Override
     public void initData() {
-        mTitle.setText("任务攻略");
         Intent intent = getIntent();
         String url = intent.getStringExtra("url");
         mWeb.loadUrl(url);

app/src/main/java/com/sheep/jiuyan/samllsheep/page/WithdrawActivity.java

@@ -7,7 +7,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.GridView;
-import android.widget.ImageView;
 import android.widget.RadioButton;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -19,6 +18,7 @@ import com.sheep.jiuyan.samllsheep.net.SheepCallback;
 import com.sheep.jiuyan.samllsheep.net.Url;
 import com.sheep.jiuyan.samllsheep.page.entry.User;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import java.util.HashMap;
 
@@ -27,8 +27,6 @@ import java.util.HashMap;
  */
 
 public class WithdrawActivity extends BaseActivity implements View.OnClickListener {
-    private ImageView mBack;
-    private TextView mTitle;
     private TextView mMoney;
     private GridView mGvMoney;
     int[] mMoneys = new int[]{5, 10, 20, 50, 100, 500};
@@ -47,7 +45,6 @@ public class WithdrawActivity extends BaseActivity implements View.OnClickListen
 
     @Override
     public void initListener() {
-        mBack.setOnClickListener(this);
         mTvWx.setOnClickListener(this);
     }
 
@@ -65,25 +62,21 @@ public class WithdrawActivity extends BaseActivity implements View.OnClickListen
 
     @Override
     public void initView() {
-        mBack = (ImageView) findViewById(R.id.img_baseactivity_title);
-        mTitle = (TextView) findViewById(R.id.txt_baseactivity_title);
         mMoney = (TextView) findViewById(R.id.tv_money);
         mTvWx = (TextView) findViewById(R.id.tv_wx);
         mGvMoney = (GridView) findViewById(R.id.gv_money);
-        mTitle.setText("提  现");
         mAdapter = new GvAdapter();
         mGvMoney.setAdapter(mAdapter);
+        TitleBarUtils.getInstance()
+                .setTitle(this,"提  现")
+                .setTitleFinish(this);
     }
 
     @Override
     public void onClick(View v) {
         int i = v.getId();
-        if (i == R.id.img_baseactivity_title) {
-            finish();
-
-        } else if (i == R.id.tv_wx) {
+        if (i == R.id.tv_wx) {
             commit();
-
         }
     }
 

app/src/main/java/com/sheep/jiuyan/samllsheep/page/WithdrawRecordActivity.java

@@ -13,6 +13,7 @@ import com.sheep.jiuyan.samllsheep.net.SheepCallback;
 import com.sheep.jiuyan.samllsheep.net.Url;
 import com.sheep.jiuyan.samllsheep.page.entry.Order;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 import com.zhy.adapter.abslistview.CommonAdapter;
 import com.zhy.adapter.abslistview.ViewHolder;
 
@@ -25,8 +26,6 @@ import java.util.List;
 
 public class WithdrawRecordActivity extends BaseActivity {
     private ListView mLvRecord;
-    private TextView mTvTitle;
-    private ImageView mImgBack;
     private CommonAdapter<Order> mAdapter;
 
     @Override
@@ -37,23 +36,17 @@ public class WithdrawRecordActivity extends BaseActivity {
     @Override
     public void initView() {
         mLvRecord = (ListView) findViewById(R.id.lv_record);
-        mTvTitle = (TextView) findViewById(R.id.txt_baseactivity_title);
-        mImgBack = (ImageView) findViewById(R.id.img_baseactivity_title);
+        TitleBarUtils.getInstance()
+                .setTitle(this,"提现记录")
+                .setTitleFinish(this);
     }
 
     @Override
     public void initListener() {
-        mImgBack.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                finish();
-            }
-        });
     }
 
     @Override
     public void initData() {
-        mTvTitle.setText("提现记录");
         final HashMap<String, String> map = new HashMap<>();
         map.put("wx_open_id", SpUtils.getOpenId(this));
         NetManager.get(Url.USER_WITHDRAW_RECORD, map, getApplicationContext(), new SheepCallback<List<Order>>(this) {