Merge remote-tracking branch 'origin/sheep2.0' into sheep2.0

app/src/main/java/com/sheep/gamegroup/view/activity/TryMakeMoneyact.java

@@ -122,7 +122,7 @@ public class TryMakeMoneyact extends BaseActivity implements TryMakeMoneyContrac
 
     @Override
     public void initData() {
-        showProgress();
+        showProgress(false);
         position = 0;
         tryMakeMoneyAdp.clear();
         for (int i = 0; i < 2; i++) {

app/src/main/java/com/sheep/jiuyan/samllsheep/base/BaseActivity.java

@@ -50,6 +50,19 @@ public abstract class BaseActivity extends AppActivity  {
         mPd.show();
     }
 
+    protected void  showProgress(boolean cancel){
+        if(mPd!=null){
+            hideProgress();
+        }
+        mPd = new ProgressDialog(this);
+//        View view= LayoutInflater.from(this).inflate(R.layout.dialog_layout,null);
+//        mPd.setContentView(view);//自己定义布局
+        mPd.setMessage("数据加载中...");
+        mPd.setCancelable(cancel);//能否够被取消
+//        mPd.setProgressStyle(ProgressDialog.STYLE_SPINNER);//圆环风格
+        mPd.show();
+    }
+
 
     protected void  hideProgress(){
         if(mPd!=null){