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

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

@@ -18,6 +18,7 @@ import com.sheep.gamegroup.event.ImageHeadChange;
 import com.sheep.gamegroup.event.MoneyChange;
 import com.sheep.gamegroup.event.RealNameAutehrChange;
 import com.sheep.gamegroup.event.UserNameChange;
+import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.entity.UserInfoEntity;
 import com.sheep.gamegroup.presenter.AccountAndSecuritContract;
 import com.sheep.gamegroup.presenter.AccountAndSecuritPresenter;
@@ -240,6 +241,16 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
 
     @Override
     public void showTask(final UserInfoEntity entity) {
+        UserEntity userEntity = null;
+        try{
+            userEntity = MyDbManager.getInstance()
+                    .dbFindUser();
+            if(userEntity == null){
+                userEntity = new UserEntity();
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
                 mEntity = entity;
                 tvName.setText(entity.getNickname());
                 tvLinkContent.setText("绵羊号:" + entity.getInvitation_code());
@@ -247,6 +258,7 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
                     tvPhone.setText("未绑定");
                 } else {
                     tvPhone.setText(entity.getMobile());
+                    userEntity.setMobile(entity.getMobile());
                 }
 
                 Glide.with(AccountAndSecurityAct.this)
@@ -257,6 +269,7 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
                     tvWx.setText("未绑定");
                 } else {
                     tvWx.setText(entity.getWx_nickname());
+                    userEntity.setWx_nickname(entity.getWx_nickname());
                 }
 
                 refalshAuther(entity);
@@ -266,6 +279,13 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
                 EventBus.getDefault().post(change);
 
 
+                //Todo user 类都没有统一，先这样
+                try{
+                    MyDbManager.getInstance()
+                            .saveOrUpdateUser(userEntity);
+                }catch (Exception e){
+                    e.printStackTrace();
+                }
 
 
     }

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

@@ -66,7 +66,7 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
     private ArrayList<Object> listData = new ArrayList<>();
     private int select;
     private String amount;
-    private int balanceAmount = 0;//余额
+    private String balanceAmount = "0";//余额
 
     @Override
     protected int getLayoutId() {
@@ -218,7 +218,7 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
 
         hideProgress();
         String balanceA =  o.getData() +"";
-        balanceAmount = TextUtils.isEmpty(balanceA)?0:Integer.valueOf(balanceA);
+        balanceAmount = TextUtils.isEmpty(balanceA)?"0":balanceA;
 
         String sr = "可提现金额 <font color='#ff2d4b'><big>" + balanceAmount + "</big></font> 元";
         withdrawal_click_bindname_tv.setText(Html.fromHtml(sr));

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

@@ -79,7 +79,7 @@ public class TaskListItemAdp extends BaseAdapter {
         }
 
         final TaskAcceptedEty ety = (TaskAcceptedEty) getItem(position);
-        holder.name_tv.setText(ety.getRelease_task().getTask().getTask_name()+"");
+        holder.name_tv.setText(ety.getRelease_task().getTask().getName()+"");
         try {
             holder.date_tv.setText(TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(ety.getRelease_task().getTask().getUpdate_time()))+"");
         }catch (Exception e){

app/src/main/java/com/sheep/groups/creditcard/CITICBankOtherInfoActivity.java

@@ -1,8 +1,10 @@
 package com.sheep.groups.creditcard;
 
+import android.os.Bundle;
 import android.support.v4.app.FragmentTabHost;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.TabHost;
 import android.widget.TextView;
 
@@ -14,11 +16,21 @@ import com.sheep.jiuyan.samllsheep.R;
 
 import java.util.Locale;
 
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
 /**
  * Created by realicing on 2018/4/4.
  * realicing@sina.com
  */
 public class CITICBankOtherInfoActivity extends BaseActivity {
+
+    @BindView(R.id.txt_baseactivity_title)
+    TextView txtBaseactivityTitle;
+    @BindView(R.id.img_baseactivity_title)
+    ImageView imgBaseactivityTitle;
+
     @Override
     protected int getLayoutId() {
         return R.layout.activity_citic_bank_other_info;
@@ -27,6 +39,7 @@ public class CITICBankOtherInfoActivity extends BaseActivity {
     @Override
     public void initView() {
         initFragmentTabHost();
+
     }
 
     @Override
@@ -38,6 +51,7 @@ public class CITICBankOtherInfoActivity extends BaseActivity {
     public void initData() {
 
     }
+
     private FragmentTabHost mFragmentTabHost;
 
     public FragmentTabHost getmFragmentTabHost() {
@@ -45,6 +59,7 @@ public class CITICBankOtherInfoActivity extends BaseActivity {
     }
 
     private Class tabFragmentContentArray[] = {CITICBankOtherInfoFragment1.class, ZhongXinStep22Fragment.class, CiticStepThreeFragment.class};
+
     /**
      * 初始化的FragmentTabHost
      */
@@ -54,11 +69,41 @@ public class CITICBankOtherInfoActivity extends BaseActivity {
         mFragmentTabHost.getTabWidget().setDividerDrawable(android.R.color.transparent);
         for (int index = 0; index < tabFragmentContentArray.length; index++) {
             View view = LayoutInflater.from(this).inflate(R.layout.activity_citic_bank_other_info_tab, null);
-            String lable = String.format(Locale.CHINA, "%d", index+1);
+            String lable = String.format(Locale.CHINA, "%d", index + 1);
             ViewFindUtils.find(view, R.id.activity_citic_bank_other_info_tab_tv, TextView.class).setText(lable);
 
             TabHost.TabSpec tabSpec = mFragmentTabHost.newTabSpec(lable).setIndicator(view);
             mFragmentTabHost.addTab(tabSpec, tabFragmentContentArray[index], null);
         }
+        mFragmentTabHost.getTabWidget().setEnabled(false);
+        gotoNext(0);
+    }
+
+
+    public void gotoNext(int tab){
+        if(tab >= 0 && tab < 3) {
+//            mFragmentTabHost.getTabWidget().setCurrentTab(tab);
+            mFragmentTabHost.setCurrentTab(tab);
+        }
+        if(tab == 0){
+            txtBaseactivityTitle.setText("联系方式");
+        }else if(tab == 1){
+            txtBaseactivityTitle.setText("公司信息及办卡方式");
+        }else if(tab == 2){
+            txtBaseactivityTitle.setText("直系亲属及紧急联系人资料");
+        }
+    }
+
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        // TODO: add setContentView(...) invocation
+        ButterKnife.bind(this);
+    }
+
+    @OnClick(R.id.img_baseactivity_title)
+    public void onViewClicked() {
+        onBackPressed();
     }
 }

app/src/main/java/com/sheep/groups/creditcard/CITICBankOtherInfoFragment1.java

@@ -1,5 +1,6 @@
 package com.sheep.groups.creditcard;
 
+import android.app.Activity;
 import android.os.Bundle;
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
@@ -158,8 +159,11 @@ public class CITICBankOtherInfoFragment1 extends BaseFragment {
                     @Override
                     public void onNext(String s) {
                         /// ??? 提交完成后，去哪儿？？？？
-
-                        showToast("数据发送成功");
+                        Activity activity = getActivity();
+                        if(activity != null && activity instanceof CITICBankOtherInfoActivity){
+                            ((CITICBankOtherInfoActivity)activity).gotoNext(1);
+                        }
+//                        showToast("数据发送成功");
                     }
                 });
 

app/src/main/java/com/sheep/groups/creditcard/zx/ZXStep1Presenter.java

@@ -5,10 +5,14 @@ import android.util.Log;
 
 import com.kfzs.libs.IView;
 import com.kfzs.libs.di.http.HttpService;
+import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import org.json.JSONException;
 import org.json.JSONObject;
+
+import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
 import javax.inject.Inject;
@@ -128,6 +132,8 @@ public class ZXStep1Presenter implements ZXStep1Contact.Presenter {
 
     @Override
     public void getImageCode() {
+        Map<String,String> map = new HashMap<>();
+        map.put("token",SpUtils.getOpenId(SheepApp.mContext));
         httpService.commitCreditCardZXImageCode()
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -144,11 +150,11 @@ public class ZXStep1Presenter implements ZXStep1Contact.Presenter {
 
                     @Override
                     public void onNext(String str) {
-                        byte[] bytes = str.getBytes();
+                        Log.e(TAG, "onNext: "+str );
                         try {
                             JSONObject object = new JSONObject(str);
                            if( object.getBoolean("success")){
-                               view.showImageCode(object.getJSONObject("data").getString("img"));
+                               view.showImageCode(object.getJSONObject("data").getString("data"));
                            }
                            else {
                                view.showProgress(object.getString("errors"));
@@ -156,7 +162,7 @@ public class ZXStep1Presenter implements ZXStep1Contact.Presenter {
                         } catch (JSONException e) {
                             e.printStackTrace();
                         }
-                        Log.e(TAG, "onNext: "+ str );
+//                        Log.e(TAG, "onNext: "+ str );
                     }
                 });
     }

app/src/main/java/com/sheep/groups/creditcard/zx/ZhongXinCreditStep1Activity.java

@@ -162,7 +162,8 @@ public class ZhongXinCreditStep1Activity extends DaggerActivity implements ZXSte
             }
         });
 
-        test();
+        presenter.getImageCode();
+//        test();
     }
     private String is_invite = "N";
     private void zxBasic(){
@@ -215,11 +216,6 @@ public class ZhongXinCreditStep1Activity extends DaggerActivity implements ZXSte
         presenter.zxBasic(map);
     }
 
-    private void test(){
-        etName.setText("郭鑫");
-        etIdNo.setText("511023198811029192");
-        etMobile.setText("18608003614");
-    }
 
     private void sendDynamic(){
 
@@ -269,6 +265,7 @@ public class ZhongXinCreditStep1Activity extends DaggerActivity implements ZXSte
         map.put("mobile",etMobile.getText().toString());
         map.put("id_card",etIdNo.getText().toString());
         map.put("photo_num",etImage.getText().toString());
+        map.put("token",SpUtils.getOpenId(SheepApp.mContext));
 
         Log.e(TAG, "sendDynamic: "+map.toString());
         presenter.getDynamic(map);
@@ -346,13 +343,14 @@ public class ZhongXinCreditStep1Activity extends DaggerActivity implements ZXSte
     @Override
     public void goNext() {
 
-        startActivity(new Intent(ZhongXinCreditStep1Activity.this,CITICBankOtherInfoActivity.class));
+//        startActivity(new Intent(ZhongXinCreditStep1Activity.this,CITICBankOtherInfoActivity.class));
 
     }
 
     @Override
     public void showImageCode(String bitmap) {
-        Glide.with(this).download(bitmap).into(ivImage);
+        Log.e(TAG, "showImageCode: "+bitmap );
+        Glide.with(this).load(bitmap).into(ivImage);
     }
 
     private void setOnCompleteEdit(final CompleteCommitEditText et, final String key){

app/src/main/java/com/sheep/groups/creditcard/zx/ZhongXinStep22Fragment.java

@@ -1,5 +1,6 @@
 package com.sheep.groups.creditcard.zx;
 
+import android.app.Activity;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.FragmentTabHost;
@@ -189,8 +190,10 @@ public class ZhongXinStep22Fragment extends DaggerFragment implements ZXStep22Co
 
     @Override
     public void goNext() {
-        FragmentTabHost fragmentTabHost = ((CITICBankOtherInfoActivity)getActivity()).getmFragmentTabHost();
-        fragmentTabHost.setCurrentTab(2);
+        Activity activity = getActivity();
+        if(activity != null && activity instanceof CITICBankOtherInfoActivity){
+            ((CITICBankOtherInfoActivity)activity).gotoNext(2);
+        }
 
     }
 }

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

@@ -41,7 +41,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="2dp"
                 android:text="直系亲属联系人姓名："
-                android:textColor="@color/gray_4"/>
+                android:textColor="@color/gray_4"
+                android:textSize="13sp"/>
             <com.kfzs.libs.widget.CompleteCommitEditText
                 android:id="@+id/edt_citic_family_name"
                 android:layout_width="150dp"
@@ -70,7 +71,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="2dp"
                 android:text="直系亲属联系人关系："
-                android:textColor="@color/gray_4"/>
+                android:textColor="@color/gray_4"
+                android:textSize="13sp"/>
 
             <android.support.v7.widget.AppCompatSpinner
                 android:id="@+id/spinner_family_relation"
@@ -102,7 +104,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="2dp"
                 android:text="手机号码："
-                android:textColor="@color/gray_4"/>
+                android:textColor="@color/gray_4"
+                android:textSize="13sp"/>
             <com.kfzs.libs.widget.CompleteCommitEditText
                 android:id="@+id/edt_citic_family_mobile"
                 android:layout_width="150dp"
@@ -127,7 +130,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="2dp"
                 android:text="住宅电话："
-                android:textColor="@color/gray_4"/>
+                android:textColor="@color/gray_4"
+                android:textSize="13sp"/>
             <com.kfzs.libs.widget.CompleteCommitEditText
                 android:id="@+id/edt_citic_family_zone_code"
                 android:layout_width="80dp"
@@ -174,7 +178,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="2dp"
                 android:text="紧急联系人姓名："
-                android:textColor="@color/gray_4"/>
+                android:textColor="@color/gray_4"
+                android:textSize="13sp"/>
             <com.kfzs.libs.widget.CompleteCommitEditText
                 android:id="@+id/edt_citic_urgent_name"
                 android:layout_width="150dp"
@@ -202,7 +207,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="2dp"
                 android:text="紧急联系人关系："
-                android:textColor="@color/gray_4"/>
+                android:textColor="@color/gray_4"
+                android:textSize="13sp"/>
             <android.support.v7.widget.AppCompatSpinner
                 android:id="@+id/spinner_urgent_relation"
                 android:layout_width="100dp"
@@ -234,7 +240,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="2dp"
                 android:text="手机号码："
-                android:textColor="@color/gray_4"/>
+                android:textColor="@color/gray_4"
+                android:textSize="13sp"/>
             <com.kfzs.libs.widget.CompleteCommitEditText
                 android:id="@+id/edt_citic_urgent_mobile"
                 android:layout_width="150dp"
@@ -258,7 +265,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="2dp"
                 android:text="住宅电话："
-                android:textColor="@color/gray_4"/>
+                android:textColor="@color/gray_4"
+                android:textSize="13sp"/>
             <com.kfzs.libs.widget.CompleteCommitEditText
                 android:id="@+id/edt_citic_urgent_zone_code"
                 android:layout_width="80dp"

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

@@ -42,7 +42,7 @@
 
                    <ImageView
                        style="@style/creditCardTypeHeadArrowStyle"
-                       android:src="@drawable/ic_credit_right_black_arrow" />
+                       android:src="@drawable/ic_normal_credit_card2" />
 
                </RelativeLayout>
 

app/src/main/res/values/gx_strings.xml

@@ -62,7 +62,7 @@
 
     <color name="credit_blue_color">#0089ee</color>
 
-    <string name="ms_top_str">• 申请条件\n
+    <string name="ms_top_str">"• 申请条件\n
 1.申请主卡年龄要求18-60周岁；附属卡年龄要求16-65周岁;\n
 2.具有稳定的职业和收入，有良好的信用和还款能力（在校学生勿申请）；\n
 3.目前只支持二代中国居民身份证进行网络申请。\n

kfzslibrary/src/main/java/com/kfzs/libs/di/http/HttpModule.java

@@ -22,7 +22,10 @@ import retrofit2.converter.gson.GsonConverterFactory;
 public class HttpModule {
 
 //    public static final String BASE_URL = "http://10.8.240.165:7011/";
-    public static final String BASE_URL = "http://10.8.230.17:7011/";
+//    public static final String BASE_URL = "http://10.8.230.17:7011/";
+
+    public static final String BASE_URL = "http://credit.kfzs.com/";
+
 
     public static final int CONNECT_TIMEOUT = 15;
     public static final int READ_TIMEOUT = 15;

kfzslibrary/src/main/java/com/kfzs/libs/di/http/HttpService.java

@@ -1,6 +1,7 @@
 package com.kfzs.libs.di.http;
 
 
+import java.io.File;
 import java.util.Map;
 
 import retrofit2.Call;
@@ -40,7 +41,7 @@ public interface HttpService {
     @POST("credits/ecitic/code")
     Observable<String> commitCreditCardZXCode(@FieldMap Map<String, String> map);
 
-    @GET("credits/ecitic/img_code")
+    @POST("credits/ecitic/img_code")
     Observable<String> commitCreditCardZXImageCode();
 
     @FormUrlEncoded