Browse Source

界面优化

liujiangyao 8 years ago
parent
commit
d327f6ccd5

+ 32 - 0
app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java

@@ -4,6 +4,8 @@ import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.GradientDrawable;
+import android.os.Handler;
+import android.os.Message;
 import android.text.Html;
 import android.text.TextUtils;
 import android.view.ViewTreeObserver;
@@ -38,6 +40,8 @@ import com.umeng.socialize.bean.SHARE_MEDIA;
 
 import java.io.File;
 import java.lang.reflect.Field;
+import java.net.HttpURLConnection;
+import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -525,4 +529,32 @@ public class CommonUtil {
                     }
                 });
     }
+    /**
+     * 获取重定向后的url
+     */
+    public void getRedirectUrl(final Handler handler, final DownLoadInfo downLoadInfo){
+
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                try{
+                    URL url1 = new URL(downLoadInfo.getMDownloadUrl());
+                    HttpURLConnection connection = (HttpURLConnection) url1.openConnection();
+                    connection.setConnectTimeout(6*1000);
+                    connection.setRequestMethod("GET");
+                    if(connection.getResponseCode() >= 300 && connection.getResponseCode() < 400){
+                        downLoadInfo.setMDownloadUrl(connection.getHeaderField("Location"));
+                        getRedirectUrl(handler, downLoadInfo);
+                    }else if(connection.getResponseCode() == 200) {
+                        Message message = new Message();
+                        message.what = 1;
+                        message.obj =downLoadInfo;
+                        handler.sendMessage(message);
+                    }
+                }catch (Exception e){
+                    e.printStackTrace();
+                }
+            }
+        }).start();
+    }
 }

+ 36 - 4
app/src/main/java/com/sheep/gamegroup/view/activity/RealNameAuthenAct.java

@@ -4,21 +4,27 @@ import android.content.Intent;
 import android.widget.EditText;
 import android.widget.TextView;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.googlecode.protobuf.format.util.TextUtils;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.di.components.DaggerRealNameAutherComponent;
 import com.sheep.gamegroup.di.modules.RealNameAutherModule;
 import com.sheep.gamegroup.event.RealNameAutehrChange;
+import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.UserEntity;
+import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.presenter.RealNameAutherContract;
 import com.sheep.gamegroup.presenter.RealNameAutherPresenter;
 import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.StringUtils;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.gamegroup.view.dialog.DialogRealNameAuther;
 import com.sheep.jiuyan.samllsheep.R;
 
 import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import org.greenrobot.eventbus.EventBus;
@@ -29,6 +35,8 @@ import javax.inject.Inject;
 
 import butterknife.BindView;
 import butterknife.OnClick;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
 
 /**
  * Created by Administrator on 2018/3/26.
@@ -131,10 +139,34 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
 
          }
         EventBus.getDefault().post(change);
-           if(whereFrom == 1){
-               Jump2View.getInstance().goWithdrawal(RealNameAuthenAct.this, null);
-           }
-          finish();
+        SheepApp.get(RealNameAuthenAct.this)
+                .getNetComponent()
+                .getApiService()
+                .getInfo()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        G.showToast(baseMessage.getMsg() +"");
+                        finish();
+
+                    }
+
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        UserEntity userEntity = JSON.parseObject(JSONObject.toJSONString(baseMessage.getData()), UserEntity.class);
+                        try {
+                            MyDbManager.getInstance().saveOrUpdateUser(userEntity);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                        if(whereFrom == 1){
+                            Jump2View.getInstance().goWithdrawal(RealNameAuthenAct.this, 1);
+                        }
+                        finish();
+                    }
+                });
     }
 
     @Override

+ 7 - 7
app/src/main/java/com/sheep/gamegroup/view/activity/RechargeQAct.java

@@ -193,12 +193,12 @@ public class RechargeQAct extends BaseActivity implements RechargeQContract.View
      * 初始化写死充值数据
      */
     private void initRechargeDatas(){
-        wlLists.add(new RechargeQEntity(false,"10","10QB"));
-        wlLists.add(new RechargeQEntity(false,"20","20QB"));
-        wlLists.add(new RechargeQEntity(false,"50","50QB"));
-        wlLists.add(new RechargeQEntity(false,"100","100QB"));
-        wlLists.add(new RechargeQEntity(false,"200","200QB"));
-        wlLists.add(new RechargeQEntity(false,"500","500QB"));
+        wlLists.add(new RechargeQEntity(false,"10","10Q"));
+        wlLists.add(new RechargeQEntity(false,"20","20Q"));
+        wlLists.add(new RechargeQEntity(false,"50","50Q"));
+        wlLists.add(new RechargeQEntity(false,"100","100Q"));
+        wlLists.add(new RechargeQEntity(false,"200","200Q"));
+        wlLists.add(new RechargeQEntity(false,"500","500Q"));
     }
 
     @Override
@@ -223,7 +223,7 @@ public class RechargeQAct extends BaseActivity implements RechargeQContract.View
                     text_QBNumber = etQbNumber.getText().toString().trim();
                 }
                 if(TextUtils.isEmpty(text_QBNumber)){
-                    G.showToast("请选择充值QB数量");
+                    G.showToast("请选择充值Q数量");
                     return;
                 }
                 text_qq = etQq.getText().toString().trim();

+ 1 - 0
app/src/main/res/layout/rechargeq_layout.xml

@@ -82,6 +82,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="40dp"
                         android:background="@null"
+                        android:inputType="number"
                         android:hint="请输入充值Q币数"
                         android:textColor="@color/black_444444"
                         android:textColorHint="@color/disenable_color"