bug修改

app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java

@@ -1,5 +1,6 @@
 package com.sheep.gamegroup.model.api;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.util.ConnectAddress;
@@ -184,5 +185,11 @@ public interface ApiService {
     @PUT(V1+"/app/user/change_base_info")
     Observable<BaseMessage> changeBaseInfo (@Body com.alibaba.fastjson.JSONObject jsonObject);
 
+    /**
+     * 更换手机号
+     */
+    @POST(V1 + "/app/user/switch_phone")
+    Observable<BaseMessage> switchPhone(@Body JSONObject jsonObject);
+
 
 }

app/src/main/java/com/sheep/gamegroup/model/entity/UserEntity.java

@@ -49,6 +49,16 @@ public class UserEntity {
     private String total_withdraw;//0,
     @Column(name = "wx_openid")
     private String wx_openid;//
+    @Column(name = "wx_nickname")
+    private String wx_nickname;//
+
+    public String getWx_nickname() {
+        return wx_nickname;
+    }
+
+    public void setWx_nickname(String wx_nickname) {
+        this.wx_nickname = wx_nickname;
+    }
 
     public String getId() {
         return id;

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

@@ -3,6 +3,7 @@ package com.sheep.gamegroup.view.activity;
 import android.app.Activity;
 import android.os.Bundle;
 import android.support.v7.widget.AppCompatEditText;
+import android.text.TextUtils;
 import android.view.View;
 import android.widget.TextView;
 
@@ -98,6 +99,10 @@ public class BindOrChangeWeixinAct extends BaseActivity implements BindOrChangeW
         switch (view.getId()){
             case R.id.bindweixin_sure_text:
                 code = weinxinEtAccount.getText().toString();
+                if(TextUtils.isEmpty(code)){
+                    G.showToast("请输入验证码");
+                    return;
+                }
                 submit();
                 break;
         }
@@ -121,6 +126,7 @@ public class BindOrChangeWeixinAct extends BaseActivity implements BindOrChangeW
         } catch (DbException e) {
             e.printStackTrace();
         }
+        finish();
         EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_FGT_FAMLLSHEEP));
     }
 

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

@@ -24,6 +24,7 @@ import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.bumptech.glide.Glide;
@@ -39,6 +40,7 @@ import com.sheep.gamegroup.presenter.TaskDialogContract;
 import com.sheep.gamegroup.presenter.TaskDialogPresenter;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyDbManager;
+import com.sheep.gamegroup.util.MyListview;
 import com.sheep.gamegroup.view.adapter.TaskStateAdapter;
 import com.sheep.gamegroup.view.customview.SProgress;
 import com.sheep.jiuyan.samllsheep.R;
@@ -95,7 +97,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
     @BindView(R.id.start_task_tv)
     TextView start_task_tv;
     @BindView(R.id.listview)
-    ListView listview;
+    MyListview listview;
     private TaskEty task_entity;
     private List<TaskState> stateList = new ArrayList<>();//状态列表
     private TaskStateAdapter stateAdapter;
@@ -433,7 +435,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
         }
         BaseMessage baseMessage = (BaseMessage) o;
 
-        List<TaskState> stateList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData() +""), TaskState.class);
+        List<TaskState> stateList = JSONArray.parseArray(JSON.toJSONString(baseMessage.getData()), TaskState.class);
 
         if(stateList != null && stateList.size()>0){
             this.stateList.clear();

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

@@ -149,8 +149,8 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
                 break;
             case R.id.phone_sure_tv:
                 if(BuildConfig.DEBUG){
-//                    goMain();
-//                    return;
+                    goMain();
+                    return;
                 }
                 etPhone = phoneEtAccount.getText().toString().trim();
                 etCode = phoneEtCode.getText().toString().trim();

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

@@ -15,9 +15,11 @@ import com.sheep.gamegroup.di.components.DaggerWithdrawalComponent;
 import com.sheep.gamegroup.di.modules.WithdrawalModule;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.GridViewEntity;
+import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.presenter.WithdrawalContract;
 import com.sheep.gamegroup.presenter.WithdrawalPresenter;
 import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.view.adapter.WithdrawalAdapter;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
@@ -26,6 +28,7 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import org.greenrobot.eventbus.EventBus;
+import org.xutils.ex.DbException;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -48,6 +51,8 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
     GridView withdrawalGreidview;
     @BindView(R.id.withdrawal_sure)
     TextView withdrawalSure;
+    @BindView(R.id.weixin_name_tv)
+    TextView weixin_name_tv;
 
     Activity activity;
     @Inject
@@ -104,6 +109,15 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
 
     @Override
     public void initData() {
+
+        try {
+            UserEntity userEntity = MyDbManager.getInstance().dbFindUser();
+            if(userEntity != null){
+                weixin_name_tv.setText(userEntity.getWx_nickname() +"");
+            }
+        } catch (DbException e) {
+            e.printStackTrace();
+        }
     }
 
 

app/src/main/java/com/sheep/gamegroup/view/adapter/TaskStateAdapter.java

@@ -69,6 +69,11 @@ public class TaskStateAdapter extends BaseAdapter {
             holder.line_view.setBackgroundColor(R.color.txt_black_9e9c9c);
             holder.name_tv.setTextColor(R.color.black);
         }
+        if(position == getCount()-1){
+            holder.line_view.setVisibility(View.GONE);
+        }else {
+            holder.line_view.setVisibility(View.VISIBLE);
+        }
 
         return convertView;
     }

app/src/main/res/layout/download_item_dialog.xml

@@ -68,11 +68,12 @@
                     android:visibility="gone">`
 
                 </WebView>
-                <ListView
+                <com.sheep.gamegroup.util.MyListview
                     android:id="@+id/listview"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:scrollbars="none"
+                    android:divider="@null"
                     android:layout_below="@+id/dialog_item_icon_iv"
                     android:layout_centerHorizontal="true"
                     android:layout_marginLeft="@dimen/content_padding_40"
@@ -105,7 +106,7 @@
                         app:startprogress="0"
                         app:textColor="@color/black"
                         app:textsize="18sp"
-                        android:visibility="visible"/>
+                        android:visibility="gone"/>
 
                     <TextView
                         android:id="@+id/start_task_tv"
@@ -139,7 +140,8 @@
                     android:minWidth="151dp"
                     android:text="领取奖励"
                     android:textSize="18sp"
-                    android:textColor="@color/txt_black" />
+                    android:textColor="@color/txt_black"
+                    android:visibility="gone"/>
 
             </RelativeLayout>
 

app/src/main/res/layout/homepage_act_layout.xml

@@ -116,8 +116,11 @@
                 android:id="@+id/couple_red_packets_iv"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="@dimen/content_padding_10"
-                android:src="@mipmap/couple_red_packets" />
+                android:layout_marginTop="@dimen/content_padding_10"
+                android:layout_marginBottom="@dimen/content_padding_10"
+                android:layout_marginLeft="@dimen/content_padding_20"
+                android:layout_marginRight="@dimen/content_padding_20"
+                android:background="@mipmap/couple_red_packets"  />
 
             <LinearLayout
                 android:layout_width="match_parent"

app/src/main/res/layout/personalcenter_act_layout.xml

@@ -39,7 +39,7 @@
             android:id="@+id/my_price"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="20.00 元"
+            android:text=""
             android:textColor="@color/black"
             android:textSize="25dp"
             android:layout_marginTop="12dp"
@@ -50,7 +50,7 @@
             android:id="@+id/my_all_price"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="累计资产 60.00 元"
+            android:text=""
             android:textColor="@color/black"
             android:textSize="12dp"/>
     </RelativeLayout>

app/src/main/res/layout/task_state_item.xml

@@ -29,6 +29,7 @@
         android:layout_weight="1"
         android:text=""
         android:textSize="@dimen/text_size_12"
-        android:textColor="@color/yellow2_end"/>
+        android:textColor="@color/yellow2_end"
+        android:layout_marginLeft="@dimen/content_padding_15"/>
 
 </LinearLayout>

app/src/main/res/layout/withdrawal_gridview_item.xml

@@ -9,6 +9,6 @@
     android:textSize="@dimen/text_size_3"
     android:textColor="@color/txt_black"
     android:padding="@dimen/content_padding_3"
-    android:background="@drawable/radidius_bg_tv_blue_gray_selector">
+    android:background="@color/white">
 
 </TextView>

app/src/main/res/layout/withdrawal_layout.xml

@@ -35,7 +35,7 @@
                     android:id="@+id/weixin_name_tv"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="微信帐号"
+                    android:text=""
                     app:layout_constraintTop_toBottomOf="@+id/withdrawal_wx_pre_notice_tv"
                     app:layout_constraintLeft_toLeftOf="@+id/withdrawal_wx_pre_notice_tv"
                     android:layout_marginLeft="36dp"
@@ -122,7 +122,8 @@
                     android:scrollbars="none"
                     android:numColumns="3"
                     android:layout_marginTop="@dimen/content_padding_20"
-                    android:visibility="visible"/>
+                    android:visibility="visible"
+                    android:background="@color/white"/>
             </android.support.constraint.ConstraintLayout>
             <TextView
                 android:id="@+id/withdrawal_sure"