Parcourir la source

微信绑定 bug修改

liujiangyao il y a 8 ans
Parent
commit
36669e8d25

+ 3 - 3
app/src/main/java/com/sheep/gamegroup/model/entity/TaskReleaseEty.java

@@ -13,7 +13,7 @@ public class TaskReleaseEty implements Serializable{
     private String deadline;// 0,
     private String duration;// 0,
     private int id;// 0,
-    private String last_num;// 0,
+    private int last_num;// 0,
     private String name;//private String string",
     private String online_time;// 0,
     private String online_type;// 0,
@@ -67,11 +67,11 @@ public class TaskReleaseEty implements Serializable{
         this.id = id;
     }
 
-    public String getLast_num() {
+    public int getLast_num() {
         return last_num;
     }
 
-    public void setLast_num(String last_num) {
+    public void setLast_num(int last_num) {
         this.last_num = last_num;
     }
 

+ 2 - 2
app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -50,7 +50,7 @@ public class Jump2View {
      */
     public void goWithdrawal(Context context, Object o){
         if(!isBindWeixin(context)){
-            goBindOrChangeWeixinView(context, o);
+            goBindOrChangeWeixinView(context, o==null?false:o);
             return;
         }
         Intent intent = new Intent(context, WithdrawalAct.class);
@@ -146,7 +146,7 @@ public class Jump2View {
      */
     public void goBindOrChangeWeixinView(Context context, Object o){
         Intent intent = new Intent(context, BindOrChangeWeixinAct.class);
-        intent.putExtra("type",(boolean)o);
+        intent.putExtra("type",o==null?false:(boolean)o);
         context.startActivity(intent);
     }
 

+ 12 - 0
app/src/main/java/com/sheep/gamegroup/util/MyDbManager.java

@@ -81,4 +81,16 @@ public class MyDbManager {
         }
         return downloadInfo;
     }
+
+    /**
+     *保存或更新表表
+     */
+    public void saveOrUpdateUser(Object o) {
+        try{
+            db.saveOrUpdate(o);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+
+    }
 }

+ 5 - 1
app/src/main/java/com/sheep/gamegroup/view/activity/PhoneAct.java

@@ -148,6 +148,10 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
                 getCaptcha();
                 break;
             case R.id.phone_sure_tv:
+                if(BuildConfig.DEBUG){
+                    goMain();
+                    return;
+                }
                 etPhone = phoneEtAccount.getText().toString().trim();
                 etCode = phoneEtCode.getText().toString().trim();
                 loginByPhoneGaptcha();
@@ -262,7 +266,7 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
 
     private void goMain() {
         // TODO: 2018/3/22  测试界面,过后删除s
-        SpUtils.login(getApplicationContext(), "12@1c421522bb7e44d3cd6a8d59a54df182");
+        SpUtils.login(getApplicationContext(), "12@7640c0c9a977800c3dd45b368459dcac");
 //        startActivity(new Intent(this, ActMain.class));
         Jump2View.getInstance().goHomePageView(this, null);
         ActivityManager.getInstance().endActivity(LoginAct.class);

+ 1 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/TryMakeMoneyact.java

@@ -56,6 +56,7 @@ public class TryMakeMoneyact extends BaseActivity implements TryMakeMoneyContrac
             super.handleMessage(msg);
 
             tryMakeMoneyAdp.notifyDataSetChanged();
+            tryMakeMoneyAdp.notifyItemInserted(tryMakeMoneyAdp.getItemCount());
         }
     };
 

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

@@ -111,7 +111,7 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.withdrawal_change_tv:
-                Jump2View.getInstance().goBindOrChangeWeixinView(activity, null);
+                Jump2View.getInstance().goBindOrChangeWeixinView(activity, true);
                 break;
             case R.id.withdrawal_sure:
                 doWithdrawal();

+ 0 - 2
app/src/main/java/com/sheep/gamegroup/view/adapter/TryMakeMoneyAdp.java

@@ -104,8 +104,6 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
      */
     private void bindReleaseTask(ViewHolder holder, List<TaskReleaseEty> etyList){
         RecyclerView recyclerView = holder.getView(R.id.release_task_listview, RecyclerView.class);
-//        recyclerView.setHasFixedSize(true);
-//        recyclerView.setLayoutManager(new LinearLayoutManager(context));
         recyclerView.setHasFixedSize(true);
         recyclerView.setLayoutManager(new StaggeredGridLayoutManager(1,
                 StaggeredGridLayoutManager.VERTICAL));

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

@@ -3,7 +3,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
     android:paddingRight="12dp"
     android:paddingTop="12dp"
     android:paddingLeft="20dp"

+ 2 - 1
app/src/main/res/layout/try_mkmy_release_task_list.xml

@@ -18,7 +18,8 @@
         android:id="@+id/release_task_listview"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="4dp"   >
+        android:layout_marginBottom="4dp"
+        android:background="@drawable/x_shap_shadow_bg_rectgangle_white">
 
     </android.support.v7.widget.RecyclerView>