修改文本

jixin/src/main/java/com/jixin/RetrofitUtil/ApiUrl.java

@@ -62,7 +62,7 @@ public interface ApiUrl {
     @GET("/user/task/confirmTask")
     Call<ResponseBody> getAward(@QueryMap Map<String, String> options);
 
-    //获取即信币
+    //获取俊友币
     @GET("/user/coin/info")
     Call<ResponseBody> getCoin(@QueryMap Map<String, String> options);
 

jixin/src/main/java/com/jixin/im/bean/Friend.java

@@ -22,7 +22,7 @@ public class Friend implements Serializable {
     public static final int STATUS_ATTENTION = 1;// 关注
     public static final int STATUS_FRIEND = 2;// 好友
     public static final int STATUS_SYSTEM = 8;// 显示系统号
-    public static final int STATUS_AGENT = 101; //贷款客服\即信客服
+    public static final int STATUS_AGENT = 101; //贷款客服\俊友客服
     // 需要验证的
     public static final int STATUS_10 = 10; //显示  等待验证
     public static final int STATUS_11 = 11; //您好

jixin/src/main/java/com/jixin/im/fragment/Fragment4.java

@@ -417,7 +417,7 @@ public class Fragment4 extends EasyFragment implements AuthStateListener {
         }
         TextView my_id = findViewById(R.id.my_id);
         if (!TextUtils.isEmpty(mUser.getMembershipAccount())) {
-            my_id.setText("我的即信号：" + mUser.getMembershipAccount());
+            my_id.setText("我的俊友号：" + mUser.getMembershipAccount());
         }
         TextView ss = findViewById(R.id.search_edits);
         ss.setOnClickListener(new View.OnClickListener() {

jixin/src/main/java/com/jixin/im/fragment/MeFragment2.java

@@ -71,6 +71,7 @@ import com.jixin.im.ui.me.redpacket.WxPayBlance;
 import com.jixin.im.ui.message.ChatActivity;
 import com.jixin.im.ui.message.ChatActivityTemp;
 import com.jixin.im.ui.tool.WebViewActivity;
+import com.jixin.im.util.DeviceInfoUtil;
 import com.jixin.im.util.PreferenceUtils;
 import com.jixin.im.util.SkinUtils;
 import com.jixin.im.util.TimeUtils;
@@ -215,7 +216,7 @@ public class MeFragment2 extends EasyFragment implements View.OnClickListener {
 
         findViewById(R.id.tv_xiangqing).setOnClickListener(this);
 
-        findViewById(R.id.ll_tequan).setOnClickListener(this);
+        findViewById(R.id.ll_junyou_coin).setOnClickListener(this);
         findViewById(R.id.shangcheng).setOnClickListener(this);
         findViewById(R.id.tv_mywallet).setOnClickListener(this);
         findViewById(R.id.tv_mytouzhujilu).setOnClickListener(this);
@@ -226,8 +227,10 @@ public class MeFragment2 extends EasyFragment implements View.OnClickListener {
         findViewById(R.id.ll_bikan).setOnClickListener(this);
         findViewById(R.id.ll_companyjieshao).setOnClickListener(this);
         findViewById(R.id.ll_dailijieshao).setOnClickListener(this);
-        findViewById(R.id.ll_guanyujixin).setOnClickListener(this);
+        findViewById(R.id.ll_about_junyou).setOnClickListener(this);
 
+        TextView versionTv = findViewById(R.id.tv_version_info);
+        versionTv.setText("版本号: " + DeviceInfoUtil.getVersionName(getContext()));
 
         skyTv = (TextView) findViewById(R.id.MySky);
         setTv = (TextView) findViewById(R.id.SettingTv);
@@ -268,7 +271,7 @@ public class MeFragment2 extends EasyFragment implements View.OnClickListener {
 
         String loginUserId = coreManager.getSelf().getUserId();
         AvatarHelper.getInstance().displayAvatar(coreManager.getSelf().getNickName(), loginUserId, mAvatarImg, false);
-        tv_indate.setText("加入即信第" + TimeUtils.dateDiff((Long.valueOf(coreManager.getSelf().getCreateTime())) * 1000, System.currentTimeMillis()) + "天");
+        tv_indate.setText("加入俊友第" + TimeUtils.dateDiff((Long.valueOf(coreManager.getSelf().getCreateTime())) * 1000, System.currentTimeMillis()) + "天");
         mPhoneNumTv.setText(coreManager.getSelf().getNickName());
         if (0 == coreManager.getSelf().getSex()) {
             iv_sex.setImageDrawable(this.getResources().getDrawable(R.drawable.head_sex_mini));
@@ -475,16 +478,16 @@ public class MeFragment2 extends EasyFragment implements View.OnClickListener {
                 //vip详情
                 startActivity(new Intent(getActivity(), VipDetailsActivity.class));
                 break;
-            case R.id.ll_tequan:
+            case R.id.ll_junyou_coin:
                 //排行榜
                 startActivity(new Intent(getActivity(), MySuperiorActivity.class));
                 break;
             case R.id.shangcheng:
-                //即信钱包
+                //俊友钱包
                 startActivity(new Intent(getActivity(), WxPayBlance.class));
                 break;
             case R.id.tv_mywallet:
-                //即信客服
+                //俊友客服
 //                if (mCurrentLevel < 5) {
 ////                    Friend one2 = FriendDao.getInstance().getFriend(coreManager.getSelf().getUserId(),);
 //                    long nowTime2 = SystemClock.elapsedRealtime();
@@ -493,7 +496,7 @@ public class MeFragment2 extends EasyFragment implements View.OnClickListener {
 //                        mOldTime = nowTime2;
 //                        Friend friend = new Friend();
 //                        friend.setUserId("10000640");
-//                        friend.setNickName("即信客服");
+//                        friend.setNickName("俊友客服");
 //                        Intent intent11 = new Intent(getActivity(), ChatActivityTemp.class);
 //                        intent11.putExtra(ChatActivity.FRIEND, friend);
 //                        startActivity(intent11);
@@ -511,7 +514,7 @@ public class MeFragment2 extends EasyFragment implements View.OnClickListener {
 //                        mOldTime = nowTime2;
 //                        Friend friend = new Friend();
 //                        friend.setUserId("10000656");
-//                        friend.setNickName("即信客服");
+//                        friend.setNickName("俊友客服");
 //                        Intent intent11 = new Intent(getActivity(), ChatActivityTemp.class);
 //                        intent11.putExtra(ChatActivity.FRIEND, friend);
 //                        startActivity(intent11);
@@ -525,7 +528,7 @@ public class MeFragment2 extends EasyFragment implements View.OnClickListener {
                 if (MyApplication.currentVipInfo != null && !TextUtils.isEmpty(MyApplication.currentVipInfo.getQqService())) {
                     Friend friend = new Friend();
                     friend.setUserId(MyApplication.currentVipInfo.getJixinService());
-                    friend.setNickName("即信客服");
+                    friend.setNickName("俊友客服");
                     Intent intent11 = new Intent(getActivity(), ChatActivityTemp.class);
                     intent11.putExtra(ChatActivity.FRIEND, friend);
                     startActivity(intent11);
@@ -630,8 +633,8 @@ public class MeFragment2 extends EasyFragment implements View.OnClickListener {
                 //帮助中心
                 startActivity(new Intent(getActivity(), HelpCenterActivity.class));
                 break;
-            case R.id.ll_guanyujixin:
-                //关于即信
+            case R.id.ll_about_junyou:
+                //关于俊友
                 startActivity(new Intent(getActivity(), AboutActivity.class));
                 break;
 
@@ -654,7 +657,7 @@ public class MeFragment2 extends EasyFragment implements View.OnClickListener {
             AvatarHelper.getInstance().displayAvatar(coreManager.getSelf().getUserId(), mAvatarImg, true);
         }
         if (tv_indate != null) {
-            tv_indate.setText("加入即信第" + TimeUtils.dateDiff((Long.valueOf(coreManager.getSelf().getCreateTime())) * 1000, System.currentTimeMillis()) + "天");
+            tv_indate.setText("加入俊友第" + TimeUtils.dateDiff((Long.valueOf(coreManager.getSelf().getCreateTime())) * 1000, System.currentTimeMillis()) + "天");
         }
 //        if (iv_class != null) {
 //            if(coreManager.getSelf().getVipInfo()  != null && coreManager.getSelf().getVipInfo().getCurrent() != null){

jixin/src/main/java/com/jixin/im/fragment/MySuperiorFragment.java

@@ -54,7 +54,7 @@ public class MySuperiorFragment extends EasyFragment {
 
         tv_qq_fz = findViewById(R.id.tv_qq_fz);
         tvVersion = findViewById(R.id.tvVersion);
-        tvVersion.setText("即信版本号：" + BuildConfig.VERSION_NAME);
+        tvVersion.setText("俊友版本号：" + BuildConfig.VERSION_NAME);
         tv_qq_fz.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {

jixin/src/main/java/com/jixin/im/fragment/NewSeeFragment.java

@@ -155,8 +155,8 @@ public class NewSeeFragment extends EasyFragment {
         void bind(NewSee.DataBean friend, int position) {
 
             if(position == 0){
-                nick_name_tv.setText("玩转即信");
-                content_tv.setText("教您如何快速玩转即信");
+                nick_name_tv.setText("玩转俊友");
+                content_tv.setText("教您如何快速玩转俊友");
 //                avatar_img.setImageDrawable(mContext.getResources().getDrawable(R.drawable.wanzhuanjix));
             }else if(position == 1){
                 nick_name_tv.setText("吉利介绍");

jixin/src/main/java/com/jixin/im/ui/account/ChangeIDActivity.java

@@ -23,12 +23,12 @@ import java.util.Map;
 import okhttp3.Call;
 
 /**
- * 修改即信号(新)
+ * 修改俊友号(新)
  */
 public class ChangeIDActivity extends BaseActivity implements View.OnClickListener {
     private EditText mAuthCodeEdit;//验证码
     private TextView phone_number_tv; //手机号
-    private TextView tv_indate; //即信号
+    private TextView tv_indate; //俊友号
     private ImageView avatar_img; //头像
     private Button login_btn;
 
@@ -53,9 +53,9 @@ public class ChangeIDActivity extends BaseActivity implements View.OnClickListen
         tv_indate = (TextView) findViewById(R.id.tv_indate);
         avatar_img = (ImageView) findViewById(R.id.avatar_img);
         mAuthCodeEdit = (EditText) findViewById(R.id.auth_code_edit);
-        tvTitle.setText("修改即信号");
+        tvTitle.setText("修改俊友号");
         if (coreManager.getSelf() != null && !TextUtils.isEmpty(coreManager.getSelf().getMembershipAccount())) {
-            tv_indate.setText("即信号："+ coreManager.getSelf().getMembershipAccount());
+            tv_indate.setText("俊友号："+ coreManager.getSelf().getMembershipAccount());
         }
         if (coreManager.getSelf() != null && !TextUtils.isEmpty(coreManager.getSelf().getNickName())) {
             phone_number_tv.setText(""+coreManager.getSelf().getNickName());
@@ -86,7 +86,7 @@ public class ChangeIDActivity extends BaseActivity implements View.OnClickListen
         switch (view.getId()) {
             case R.id.login_btn:
                 if(TextUtils.isEmpty(mAuthCodeEdit.getText().toString().trim())){
-                    Toast.makeText(ChangeIDActivity.this, "请输入新即信号", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(ChangeIDActivity.this, "请输入新俊友号", Toast.LENGTH_SHORT).show();
                 }else {
                     //下一步
                     updateData();

jixin/src/main/java/com/jixin/im/ui/account/ChangePasswordActivityNew.java

@@ -111,11 +111,11 @@ public class ChangePasswordActivityNew extends BaseActivity implements View.OnCl
         jixin_numer_edit = (EditText) findViewById(R.id.jixin_numer_edit);
 
         if (coreManager.getSelf() != null && !TextUtils.isEmpty(coreManager.getSelf().getTelephone())) {
-            tvTitle.setText("即信密码");
+            tvTitle.setText("俊友密码");
             String telephone = coreManager.getSelf().getTelephoneNoAreaCode();
             mPhoneNumberEdit.setText(telephone);
         } else {
-            tvTitle.setText("即信密码");
+            tvTitle.setText("俊友密码");
             String userId = UserSp.getInstance(this).getUserId("");
             if (!TextUtils.isEmpty(userId)) {
                 User mLastLoginUser = UserDao.getInstance().getUserByUserId(userId);

jixin/src/main/java/com/jixin/im/ui/adapter/TaskTitleAdapter.java

@@ -52,7 +52,7 @@ public class TaskTitleAdapter extends BaseQuickAdapter<EverDayTaskBean.DataBean,
             helper.setProgress(R.id.item_task_progressbar, tempCurrent);
             String money = item.getAwardCoin();
             if ("-1".equals(money)) {
-                money = "?即信币";
+                money = "?俊友币";
             } else {
                 money = item.getAwardCoin() + mContext.getResources().getString(R.string.jixin_money);
             }

jixin/src/main/java/com/jixin/im/ui/dialog/WelfareDialog.java

@@ -18,7 +18,7 @@ import com.jixin.im.util.TimeUtils;
 import java.util.UUID;
 
 /**
- * 福利获取即信币dialog
+ * 福利获取俊友币dialog
  */
 public class WelfareDialog extends Dialog {
 
@@ -142,7 +142,7 @@ public class WelfareDialog extends Dialog {
             // set the dialog title
             ((TextView) layout.findViewById(R.id.tvAdOk)).setOnClickListener(new View.OnClickListener() {
                                 public void onClick(View v) {
-                                   String content="我在每日任务活动中获得"+message+"即信币，快来一起参与！";
+                                   String content="我在每日任务活动中获得"+message+"俊友币，快来一起参与！";
                                     initChatByContent(content, 1);
                                     dialog.dismiss();
 //                                    positiveButtonClickListener.onClick(dialog, DialogInterface.BUTTON_POSITIVE);
@@ -150,7 +150,7 @@ public class WelfareDialog extends Dialog {
                             });
 
             if (message != null) {
-                ((TextView) layout.findViewById(R.id.tvContent)).setText(message+"即信币");
+                ((TextView) layout.findViewById(R.id.tvContent)).setText(message+"俊友币");
             }
             dialog.setContentView(layout);
             dialog.setCanceledOnTouchOutside(false);

jixin/src/main/java/com/jixin/im/ui/me/AboutActivity.java

@@ -48,12 +48,14 @@ public class AboutActivity extends BaseActivity {
     };
 
     public void PrivacyAgree(View view) {
+        PrivacyAgreeActivity.startIntent(AboutActivity.this);
         if (UiUtils.isNormalClick(view) && !TextUtils.isEmpty(coreManager.getConfig().privacyPolicyPrefix)) {
             PrivacyAgreeActivity.startIntent(AboutActivity.this);
         }
     }
 
     public void Privacy(View view) {
+        PrivacyAgreeActivity.startPrivacy(AboutActivity.this);
         if (UiUtils.isNormalClick(view) && !TextUtils.isEmpty(coreManager.getConfig().privacyPolicyPrefix)) {
             PrivacyAgreeActivity.startPrivacy(AboutActivity.this);
         }
@@ -71,7 +73,7 @@ public class AboutActivity extends BaseActivity {
             }
         });
         TextView tvTitle = (TextView) findViewById(R.id.tv_title_center);
-        tvTitle.setText("关于即信");
+        tvTitle.setText("关于俊友");
         ImageView ivRight = (ImageView) findViewById(R.id.iv_title_right);
         ivRight.setImageResource(R.mipmap.share_icon);
         ivRight.setOnClickListener(new View.OnClickListener() {
@@ -91,10 +93,5 @@ public class AboutActivity extends BaseActivity {
         tvCompany.setText(coreManager.getConfig().companyName);
         tvCopyright.setText(coreManager.getConfig().copyright);
 
-        if (!AppConfig.isShiku()) {
-            tvCompany.setVisibility(View.GONE);
-            tvCopyright.setVisibility(View.GONE);
-            ivRight.setVisibility(View.GONE);
-        }
     }
 }

jixin/src/main/java/com/jixin/im/ui/me/EveryDayAnswerActivity.java

@@ -286,9 +286,9 @@ public class EveryDayAnswerActivity extends BaseActivity {
     //活动规则 死的
     private void initServerData() {
         rules.add("活动规则:");
-        rules.add("1.该活动为即信用户专享活动");
-        rules.add("2.该活动完成后获得相应数量的“即信币'");
-        rules.add("即信币为永久道具永不注销可以提现为彩金。3.该活动解释权为吉利彩票所有。");
+        rules.add("1.该活动为俊友用户专享活动");
+        rules.add("2.该活动完成后获得相应数量的“俊友币'");
+        rules.add("俊友币为永久道具永不注销可以提现为彩金。3.该活动解释权为吉利彩票所有。");
         rules.add("该活动解释权归吉利彩票所有");
         adapter = new RulesAdapter(R.layout.item_rules, rules);
         ruleslist.setLayoutManager(new LinearLayoutManager(this));

jixin/src/main/java/com/jixin/im/ui/me/EveryDayTaskActivity.java

@@ -192,7 +192,7 @@ public class EveryDayTaskActivity extends BaseActivity {
                     return;
                 }
                 if (isLingLe) {
-                    TipsDialogFragment dialogFragment = new TipsDialogFragment("恭喜您，您成功领取了今日任务奖励，\n赶紧去我的即信钱包查看。如果长时间\n未到账，请联系在线客服！");
+                    TipsDialogFragment dialogFragment = new TipsDialogFragment("恭喜您，您成功领取了今日任务奖励，\n赶紧去我的俊友钱包查看。如果长时间\n未到账，请联系在线客服！");
                     dialogFragment.show(getSupportFragmentManager(), null);
                     return;
                 }
@@ -339,7 +339,7 @@ public class EveryDayTaskActivity extends BaseActivity {
         super.onActivityResult(requestCode, resultCode, data);
         if (resultCode == -1) {
             if (requestCode == InstantMessageActivity2.INSTANTMESSAGEACTIVITY_CODE) {
-                TipsDialogFragment dialogFragment = new TipsDialogFragment("恭喜您，您成功领取了今日任务奖励，\n赶紧去我的即信钱包查看。如果长时间\n未到账，请联系在线客服！");
+                TipsDialogFragment dialogFragment = new TipsDialogFragment("恭喜您，您成功领取了今日任务奖励，\n赶紧去我的俊友钱包查看。如果长时间\n未到账，请联系在线客服！");
                 dialogFragment.show(getSupportFragmentManager(), null);
             }
         }

jixin/src/main/java/com/jixin/im/ui/me/GoldenButlerActivity.java

@@ -126,7 +126,7 @@ public class GoldenButlerActivity extends BaseActivity {
                     if (jsonObject.getInt("resultCode") == 1) {
                         JSONObject j = jsonObject.getJSONObject("data");
                         String wage = j.getString("coinNum");
-                        Toast.makeText(GoldenButlerActivity.this, "恭喜你获得" + wage + "即信币", Toast.LENGTH_SHORT).show();
+                        Toast.makeText(GoldenButlerActivity.this, "恭喜你获得" + wage + "俊友币", Toast.LENGTH_SHORT).show();
                         getLevelInfo();
                     } else {
                         Toast.makeText(GoldenButlerActivity.this, "领取异常" + jsonObject.getString("resultMsg"), Toast.LENGTH_SHORT).show();

jixin/src/main/java/com/jixin/im/ui/me/PullSurprisedActivity.java

@@ -28,7 +28,7 @@ public class PullSurprisedActivity extends BaseActivity {
         getSupportActionBar().hide();
         findViewById(R.id.iv_title_left).setOnClickListener(v -> finish());
         TextView tvTitle = (TextView) findViewById(R.id.tv_title_center);
-        tvTitle.setText("玩转即信");
+        tvTitle.setText("玩转俊友");
 
     }
 

jixin/src/main/java/com/jixin/im/ui/me/SignActivity.java

@@ -188,7 +188,7 @@ public class SignActivity extends BaseActivity {
                     if (jsonObject.getInt("resultCode") == 1) {
 //                        JSONObject js = jsonObject.getJSONObject("data");
 //                        String money = js.getString("signinCoin");
-//                        Toast.makeText(SignActivity.this, jsonObject.getString("resultMsg") + "获得" + money + "即信币", Toast.LENGTH_SHORT).show();
+//                        Toast.makeText(SignActivity.this, jsonObject.getString("resultMsg") + "获得" + money + "俊友币", Toast.LENGTH_SHORT).show();
                         Toast.makeText(SignActivity.this, "签到成功", Toast.LENGTH_SHORT).show();
 //                       重新请求签到记录
                         getSeverData();
@@ -337,7 +337,7 @@ public class SignActivity extends BaseActivity {
                     JSONObject jsonObject = new JSONObject(response.body().string());
                     if (jsonObject.getInt("resultCode") == 1) {
                         JSONObject jsonObject1 = jsonObject.getJSONObject("data");
-                        Toast.makeText(SignActivity.this, jsonObject.getString("resultMsg" + "获得" + jsonObject1.getString("continuousAwardCoin") + "即信币"), Toast.LENGTH_SHORT).show();
+                        Toast.makeText(SignActivity.this, jsonObject.getString("resultMsg" + "获得" + jsonObject1.getString("continuousAwardCoin") + "俊友币"), Toast.LENGTH_SHORT).show();
 
                     } else {
                         Toast.makeText(SignActivity.this, "领取异常" + jsonObject.getString("resultMsg"), Toast.LENGTH_SHORT).show();
@@ -377,9 +377,9 @@ public class SignActivity extends BaseActivity {
 
     private void loadrules() {
         rules.add("活动规则:");
-        rules.add("1.该活动为即信用户专享活动");
-        rules.add("2.该活动完成后获得相应数量的“即信币'");
-        rules.add("即信币为永久道具永不注销可以提现为彩金。3.该活动解释权为吉利彩票所有。");
+        rules.add("1.该活动为俊友用户专享活动");
+        rules.add("2.该活动完成后获得相应数量的“俊友币'");
+        rules.add("俊友币为永久道具永不注销可以提现为彩金。3.该活动解释权为吉利彩票所有。");
         rules.add("该活动解释权归吉利彩票所有");
         adapter = new RulesAdapter(R.layout.item_rules, rules);
         signRuleslist.setLayoutManager(new LinearLayoutManager(this));

jixin/src/main/java/com/jixin/im/ui/me/TiXianActivityNew.java

@@ -40,7 +40,7 @@ import retrofit2.Callback;
 import retrofit2.Response;
 
 /**
- * 提现即信币
+ * 提现俊友币
  */
 public class TiXianActivityNew extends BaseActivity implements View.OnClickListener {
 

jixin/src/main/java/com/jixin/im/ui/me/bubble/VipDetailsActivity.java

@@ -148,7 +148,7 @@ public class VipDetailsActivity extends BaseActivity {
         cardAdapter = new CardAdapter(mList);
         recyclerView.setAdapter(cardAdapter);
         AvatarHelper.getInstance().displayAvatar(coreManager.getSelf().getUserId(), findViewById(R.id.avatar_img), true);
-        recyclerView.setOnScrollListener(new RecyclerView.OnScrollListener() {
+        recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
             @Override
             public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
                 super.onScrollStateChanged(recyclerView, newState);

jixin/src/main/java/com/jixin/im/ui/me/redpackage/RedPackageDialog.java

@@ -103,7 +103,7 @@ public class RedPackageDialog extends DialogFragment implements View.OnClickList
         Log.e("dian", "userId:" + userId);
         num = getArguments().getString("num");
         gamePauseMenu = v.findViewById(R.id.gamePauseMenu);
-        gamePauseMenu.setText(num + "即信币");
+        gamePauseMenu.setText(num + "俊友币");
         gamePauseMenu.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -120,7 +120,7 @@ public class RedPackageDialog extends DialogFragment implements View.OnClickList
             @Override
             public void onend() {
                 if (!isCancel) {
-                    String content="我在红包雨活动中获得"+num+"即信币，快来一起参与！";
+                    String content="我在红包雨活动中获得"+num+"俊友币，快来一起参与！";
                      initChatByContent(content, 1);
 
 

jixin/src/main/java/com/jixin/im/util/AutoPollForZpAdapter.java

@@ -32,7 +32,7 @@ public class AutoPollForZpAdapter extends RecyclerView.Adapter<AutoPollForZpAdap
     @Override
     public void onBindViewHolder(BaseViewHolder holder, int position) {
         RewardHisteryBean.DataBean datasBean = mData.get(position % mData.size());
-        holder.content.setText("恭喜即信用户"+datasBean.getUserName() + " 获得 ");
+        holder.content.setText("恭喜俊友用户"+datasBean.getUserName() + " 获得 ");
         holder.content2.setText(datasBean.getMoney()+"元红包");
         holder.content3.setText(""+TimeUtils.f_long_3_str(datasBean.getGmtCreate()));
     }

jixin/src/main/res/layout/activity_about.xml

@@ -45,65 +45,13 @@
                 android:textColor="@color/black"
                 android:textSize="@dimen/about_us_size" />
             <TextView
+                android:layout_margin="8dp"
+                android:id="@+id/tv_content"
+                android:gravity="center_vertical"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="50dp"
-                android:text="官方认证"
-                android:textSize="16sp"
-                android:textColor="#1F1E1E"
-                android:gravity="center"/>
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
-                android:orientation="horizontal">
-                <ImageView
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/yinguo"/>
-                <ImageView
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/diyi"/>
-                <ImageView
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/diyi22"/>
-            </LinearLayout>
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/taizi"
-                android:paddingTop="20dp"
-                android:orientation="horizontal">
-                <TextView
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:text="英国曼岛博彩监督委员会"
-                    android:singleLine="true"
-                    android:gravity="center"
-                    android:textSize="8sp"
-                    android:layout_height="wrap_content"/>
-                <TextView
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:layout_height="wrap_content"
-                    android:text="第一卡格扬格"
-                    android:singleLine="true"
-                    android:textSize="8sp"/>
-                <TextView
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:layout_height="wrap_content"
-                    android:text="菲律宾PARCOR"
-                    android:singleLine="true"
-                    android:textSize="8sp"/>
-            </LinearLayout>
+                android:layout_height="match_parent"/>
+
+
         </LinearLayout>
 
         <TextView
@@ -139,32 +87,45 @@
             android:layout_marginTop="@dimen/dp5"
             android:layout_marginBottom="@dimen/dp15"
             android:gravity="center"
-            android:orientation="horizontal">
-
-            <TextView
+            android:orientation="vertical">
+            <LinearLayout
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:onClick="PrivacyAgree"
-                android:text="@string/yonghuxieyi"
-                android:visibility="gone"
-                android:textColor="#0066cc"
-                android:textSize="@dimen/about_us_size" />
+                android:orientation="horizontal"
+                android:layout_height="wrap_content">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:onClick="PrivacyAgree"
+                    android:text="@string/yonghuxieyi"
+                    android:visibility="visible"
+                    android:textColor="#559BF2"
+                    android:textSize="@dimen/about_us_size" />
+                <View
+                    android:layout_width="1px"
+                    android:background="#666666"
+                    android:layout_height="match_parent"/>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:visibility="visible"
+                    android:onClick="Privacy"
+                    android:text="@string/yinsizhengce"
+                    android:textColor="#559BF2"
+                    android:textSize="@dimen/about_us_size" />
+
+            </LinearLayout>
+
+
+
 
             <TextView
+                android:layout_marginTop="4dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text=" 让未来现在就来 "
                 android:textColor="@color/black"
                 android:textSize="@dimen/about_us_size" />
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:visibility="gone"
-                android:onClick="Privacy"
-                android:text="@string/yinsizhengce"
-                android:textColor="#0066cc"
-                android:textSize="@dimen/about_us_size" />
 
         </LinearLayout>
 

jixin/src/main/res/layout/activity_band_accountnew.xml

@@ -34,7 +34,7 @@
                         android:layout_height="wrap_content"
                         android:textColor="#000000"
                         android:textSize="16sp"
-                        android:text="即信号" />
+                        android:text="俊友号" />
                     <ImageView
                         android:layout_width="21dp"
                         android:layout_height="21dp"
@@ -177,7 +177,7 @@
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:gravity="center"
-                    android:text="即信密码"
+                    android:text="俊友密码"
                     android:textColor="@color/black"
                     android:textSize="@dimen/one_level_title" />
 

jixin/src/main/res/layout/activity_basic_info_new.xml

@@ -205,7 +205,7 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="即信号："
+                                android:text="俊友号："
                                 android:textSize="14dp" />
 
                             <TextView

jixin/src/main/res/layout/activity_change_id.xml

@@ -58,7 +58,7 @@
                 android:layout_height="wrap_content"
                 android:paddingTop="3dp"
                 android:textSize="10sp"
-                tools:text="即信号：435781651"/>
+                tools:text="俊友号：435781651"/>
         </LinearLayout>
     </LinearLayout>
 
@@ -83,7 +83,7 @@
                 android:layout_centerVertical="true"
                 android:layout_toLeftOf="@+id/send_again_btn"
                 android:digits="@string/digits"
-                android:hint="请输入新即信号"
+                android:hint="请输入新俊友号"
                 android:maxLength="18"
                 android:textSize="@dimen/one_level_title" />
 

jixin/src/main/res/layout/activity_change_passwordnew.xml

@@ -12,8 +12,8 @@
         android:layout_height="wrap_content"
         android:padding="15dp"
         android:textColor="@color/gray"
-        android:text="请设置即信密码。你可以用手机号+即信密码登录,比如
-使用手机号+即信密码登录即信，更快捷。"/>
+        android:text="请设置俊友密码。你可以用手机号+俊友密码登录,比如
+使用手机号+俊友密码登录俊友，更快捷。"/>
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -35,7 +35,7 @@
                 android:layout_margin="10dp"
                 android:enabled="false"
                 android:gravity="center"
-                android:text="即信号"
+                android:text="俊友号"
                 android:textSize="16sp" />
 
             <EditText

jixin/src/main/res/layout/activity_offer_apply_new.xml

@@ -31,7 +31,7 @@
                 <TextView
                     style="@style/IMTbleLine_TextKey"
                     android:drawablePadding="5dp"
-                    android:text="即信币余额：" />
+                    android:text="俊友币余额：" />
 
                 <TextView
                     android:id="@+id/tv_all"

jixin/src/main/res/layout/activity_register_user_basic_info.xml

@@ -28,7 +28,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:text="欢迎来到即信"
+                    android:text="欢迎来到俊友"
                     android:textColor="#000000"
                     android:textSize="33.33sp" />
 
@@ -255,7 +255,7 @@
                 android:paddingTop="10dp"
                 android:paddingRight="35dp"
                 android:paddingBottom="10dp"
-                android:text="欢迎来到即信"
+                android:text="欢迎来到俊友"
                 android:textColor="@color/white" />
 
         </LinearLayout>

jixin/src/main/res/layout/dialog_countdown.xml

@@ -65,14 +65,14 @@
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:text="欢迎登陆即信！\n"
+                    android:text="欢迎登陆俊友！\n"
                     android:textColor="@color/black_2" />
 
                 <TextView
                     android:id="@+id/tvContent"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:text="我们依据最新的监管要求更新了即信《用户协议》和《隐私政策》，特向您说明如下:"
+                    android:text="我们依据最新的监管要求更新了俊友《用户协议》和《隐私政策》，特向您说明如下:"
                     android:textColor="@color/black_2" />
 
                 <TextView

jixin/src/main/res/layout/dialog_welfare.xml

@@ -36,13 +36,13 @@
                 android:padding="25dp"
                 android:singleLine="true"
                 android:textSize="17sp"
-                android:text="20即信币"
+                android:text="20俊友币"
                 android:textColor="#905A2E" />
         <TextView
             android:layout_marginTop="20dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="可在“我-即信钱包”中查看奖励"
+            android:text="可在“我-俊友钱包”中查看奖励"
             android:textColor="#D5A063" />
 
         <TextView

jixin/src/main/res/layout/fragment_me_new.xml

@@ -162,7 +162,7 @@
                                             android:layout_marginBottom="5dp"
                                             android:textColor="#373737"
                                             android:textSize="13sp"
-                                            android:text="即信号：jx1234" />
+                                            android:text="俊友号：jx1234" />
                                         <TextView
                                             android:id="@+id/phone_birthday_tv"
                                             android:layout_width="wrap_content"
@@ -214,7 +214,7 @@
                                                 android:textSize="13sp"
                                                 android:drawableLeft="@drawable/jixingbi"
                                                 android:drawablePadding="5dp"
-                                                android:text="即信币: 0.00" />
+                                                android:text="俊友币: 0.00" />
                                         </LinearLayout>
 
                                         <LinearLayout

jixin/src/main/res/layout/fragment_mess.xml

@@ -64,7 +64,7 @@
             android:drawableLeft="@drawable/search"
             android:drawablePadding="9dp"
             android:gravity="center"
-            android:hint="搜索（即信号或手机号）"
+            android:hint="搜索（俊友号或手机号）"
             android:paddingLeft="9dp"
             android:paddingRight="9dp"
             android:textColor="@color/dark_grey"
@@ -83,7 +83,7 @@
                 android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true"
                 android:layout_centerVertical="true"
-                android:text="我的即信号：123456789"
+                android:text="我的俊友号：123456789"
                 android:textColor="#000000"
                 android:textSize="@dimen/iv_12" />
 

jixin/src/main/res/layout/head_for_my.xml

@@ -158,7 +158,7 @@
                                     android:maxEms="50"
                                     android:paddingRight="5dp"
                                     android:singleLine="true"
-                                    android:text="即信币: 0.0"
+                                    android:text="俊友币: 0.0"
                                     android:textColor="@color/black"
                                     android:textSize="13sp" />
                             </LinearLayout>
@@ -186,7 +186,7 @@
                                             android:layout_height="wrap_content"
                                             android:layout_marginBottom="5dp"
                                             android:singleLine="true"
-                                            android:text="即信号："
+                                            android:text="俊友号："
                                             android:textColor="#373737"
                                             android:textSize="13sp" />
 

jixin/src/main/res/layout/head_for_my2.xml

@@ -96,7 +96,7 @@
                         android:layout_height="wrap_content"
                         android:paddingTop="3dp"
                         android:textSize="10sp"
-                        android:text="加入即信第一天"/>
+                        android:text="加入俊友第一天"/>
 
                 </LinearLayout>
 
@@ -122,73 +122,73 @@
                     android:background="@drawable/my_b1"
                     android:gravity="center"
                     android:orientation="horizontal">
+
                     <LinearLayout
-                        android:id="@+id/ll_tequan"
+                        android:id="@+id/shangcheng"
                         android:layout_width="0dp"
                         android:layout_weight="1"
+                        android:layout_height="wrap_content"
                         android:gravity="center"
                         android:padding="5dp"
-                        android:layout_height="wrap_content"
                         android:orientation="horizontal">
                         <ImageView
                             android:layout_width="wrap_content"
-                            android:layout_height="match_parent"
-                            android:src="@drawable/my_paihang"/>
+                            android:layout_height="wrap_content"
+                            android:src="@drawable/my_shop"/>
                         <LinearLayout
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:gravity="center"
                             android:layout_marginLeft="5dp"
+                            android:gravity="center"
                             android:orientation="vertical">
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="我的上级"
+                                android:text="俊友钱包"
                                 android:textSize="16sp"
                                 android:textStyle="bold"/>
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:textSize="8sp"
-                                android:text="VIP LEADERBOARD"/>
+                                android:text="VIP WALLET"/>
 
                         </LinearLayout>
 
                     </LinearLayout>
                     <LinearLayout
-                        android:id="@+id/shangcheng"
+                        android:id="@+id/ll_junyou_coin"
                         android:layout_width="0dp"
                         android:layout_weight="1"
-                        android:layout_height="wrap_content"
                         android:gravity="center"
                         android:padding="5dp"
+                        android:layout_height="wrap_content"
                         android:orientation="horizontal">
                         <ImageView
                             android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:src="@drawable/my_shop"/>
+                            android:layout_height="match_parent"
+                            android:src="@drawable/icon_junyou_coin"/>
                         <LinearLayout
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginLeft="5dp"
                             android:gravity="center"
+                            android:layout_marginLeft="5dp"
                             android:orientation="vertical">
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="即信钱包"
+                                android:text="俊友币"
                                 android:textSize="16sp"
                                 android:textStyle="bold"/>
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:textSize="8sp"
-                                android:text="VIP WALLET"/>
+                                android:text="JUNYOUBI"/>
 
                         </LinearLayout>
 
                     </LinearLayout>
-
                 </LinearLayout>
             </LinearLayout>
             <LinearLayout
@@ -203,7 +203,7 @@
                     android:layout_height="wrap_content"
                     android:gravity="center"
                     android:layout_weight="1"
-                    android:text="即信客服"
+                    android:text="俊友客服"
                     android:paddingBottom="20dp"
                     android:paddingTop="20dp"
                     android:drawableTop="@drawable/my_wallet"
@@ -276,7 +276,7 @@
                     android:textColor="@color/gray"
                     android:gravity="right"
                     android:drawablePadding="17dp"
-                    android:text="教你快速玩转“即信”"
+                    android:text="教你快速玩转“俊友”"
                     android:drawableRight="@drawable/my_right_1"/>
             </LinearLayout>
             <LinearLayout
@@ -363,11 +363,11 @@
                     android:textColor="@color/gray"
                     android:gravity="right"
                     android:drawablePadding="17dp"
-                    android:text="存取款、 投注有疑问，看这里"
+                    android:text="有问题，看这里"
                     android:drawableRight="@drawable/my_right_1"/>
             </LinearLayout>
             <LinearLayout
-                android:id="@+id/ll_guanyujixin"
+                android:id="@+id/ll_about_junyou"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="0.5dp"
@@ -382,9 +382,10 @@
                     android:textColor="#351C1C"
                     android:gravity="center"
                     android:drawablePadding="17dp"
-                    android:text="关于即信"
+                    android:text="关于俊友"
                     android:drawableLeft="@drawable/gyjx1"/>
                 <TextView
+                    android:id="@+id/tv_version_info"
                     android:layout_width="0dp"
                     android:layout_weight="1"
                     android:layout_marginRight="15dp"
@@ -422,7 +423,7 @@
                     android:textColor="@color/gray"
                     android:gravity="right"
                     android:drawablePadding="17dp"
-                    android:text="修改即信号，关闭声音"
+                    android:text="修改俊友号，关闭声音"
                     android:drawableRight="@drawable/my_right_1"/>
             </LinearLayout>
         </LinearLayout>

jixin/src/main/res/layout/headview_logingonggao.xml

@@ -25,13 +25,13 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:text="欢迎登陆即信！\n"
+            android:text="欢迎登陆俊友！\n"
             android:textColor="@color/black_2" />
         <TextView
             android:id="@+id/tvContent"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:text="我们依据最新的监管要求更新了即信《用户协议》和《隐私政策》，特向您说明如下:"
+            android:text="我们依据最新的监管要求更新了俊友《用户协议》和《隐私政策》，特向您说明如下:"
             android:textColor="@color/black_2" />
         <TextView
             android:layout_width="match_parent"

jixin/src/main/res/layout/item_newsee.xml

@@ -32,14 +32,14 @@
             android:layout_height="wrap_content"
             android:textSize="16sp"
             android:textColor="#241717"
-            android:text="玩转即信"/>
+            android:text="玩转俊友"/>
         <TextView
             android:id="@+id/content_tv"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textSize="12sp"
             android:textColor="#5E5B5B"
-            android:text="教您如何快速玩转即信"/>
+            android:text="教您如何快速玩转俊友"/>
     </LinearLayout>
 
 </LinearLayout>

jixin/src/main/res/layout/layout_pullrefresh_list.xml

@@ -21,7 +21,7 @@
         android:drawableLeft="@drawable/search"
         android:drawablePadding="9dp"
         android:gravity="center"
-        android:hint="搜索（即信号或手机号）"
+        android:hint="搜索（俊友号或手机号）"
         android:paddingLeft="9dp"
         android:paddingRight="9dp"
         android:textColor="@color/dark_grey"

jixin/src/main/res/layout/notice_task_tips_dialog.xml

@@ -21,7 +21,7 @@
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="50dp"
             android:gravity="center_horizontal"
-            android:text="恭喜您，您成功领取了今日任务\n奖励，赶紧去我的即信钱包查看。\n如果长时间未到账，请联系在线客服！"
+            android:text="恭喜您，您成功领取了今日任务\n奖励，赶紧去我的俊友钱包查看。\n如果长时间未到账，请联系在线客服！"
             android:textColor="#FAE4E4"
             android:textSize="12sp" />
 

jixin/src/main/res/layout/view_fragment4_head.xml

@@ -169,7 +169,7 @@
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
                 android:singleLine="true"
-                android:text="即信"
+                android:text="俊友"
                 android:textColor="@color/black"
                 android:textSize="16sp"/>
             <TextView

jixin/src/main/res/values/strings.xml

@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" tools:ignore="MissingTranslation">
-    <!--    <string name="app_name">即信</string>-->
-    <string name="app_name">即信</string>
+    <!--    <string name="app_name">俊友</string>-->
+    <string name="app_name">俊友</string>
     <string name="data_exception">数据异常，请稍后重试</string>
     <string name="net_exception">网络异常，请稍后重试</string>
     <string name="please_wait">请稍等&#8230;</string>
@@ -46,7 +46,7 @@
     <string name="please_input_name">请输入昵称</string>
     <string name="please_input_new_password">请输入新密码</string>
     <string name="please_confirm_new_password">请确认新密码</string>
-    <string name="please_input_keyword">请输入即信号或手机号</string>
+    <string name="please_input_keyword">请输入俊友号或手机号</string>
 
     <!-- SpalshActivity -->
     <string name="login">登录</string>
@@ -508,9 +508,9 @@
 
     <string name="turn_on_vibration">消息来时振动</string>
 
-    <string name="my_purse">即信钱包</string>
+    <string name="my_purse">俊友钱包</string>
     <string name="expenses_record">消费记录</string>
-    <string name="my_change">我的即信币</string>
+    <string name="my_change">我的俊友币</string>
     <string name="recharge">充值</string>
     <string name="select_payment_method">选择支付方式</string>
     <string name="total">总计</string>
@@ -1419,9 +1419,9 @@
     <string name="tip_username_empty">用户名不能为空</string>
     <string name="tip_username_too_long">用户名不能超过10位</string>
     <string name="nickname_or_username">昵称或用户名</string>
-    <string name="nickname_or_phone_number">即信号或手机号</string>
+    <string name="nickname_or_phone_number">俊友号或手机号</string>
     <string name="hint_input_nickname_or_username">请输入昵称或用户名</string>
-    <string name="hint_input_nickname_or_phone_number">请输入即信号或手机号</string>
+    <string name="hint_input_nickname_or_phone_number">请输入俊友号或手机号</string>
     <string name="tip_not_allow_create_room">当前不允许普通用户建群</string>
     <string name="invite_code">邀请码</string>
     <string name="tip_invite_code_empty">请输入邀请码</string>
@@ -1724,7 +1724,7 @@
     <string name="more_info">更多信息</string>
     <string name="setting_nickname">备注和标签</string>
     <string name="nick_name">昵称：</string>
-    <string name="communication">即信号：</string>
+    <string name="communication">俊友号：</string>
     <string name="describe">描述</string>
 
     <string name="sync_friend">同步好友</string>
@@ -2101,7 +2101,7 @@
     <string name="skin_Chen_wen_Hui">沉稳灰</string>
     <string name="select_skin">来挑选符合你眼缘的颜色吧</string>
     <string name="my_phone_number">我的手机号</string>
-    <string name="label_communication">即信号</string>
+    <string name="label_communication">俊友号</string>
     <string name="label_avatar">头像</string>
     <string name="update">更新</string>
     <string name="share_circle">分享到朋友圈</string>
@@ -2271,8 +2271,8 @@
     <string name="get_perm">登录后应用将获得以下权限</string>
     <string name="sure_open_user">请确保开启了定位权限与位置信息服务，才能正常使用该功能</string>
     <string name="set_success">设置成功</string>
-    <string name="yinsizhengce">隐私政策</string>
-    <string name="yonghuxieyi">用户协议</string>
+    <string name="yinsizhengce">《隐私政策》</string>
+    <string name="yonghuxieyi">《用户协议》</string>
     <string name="Rcode">扫一扫上面的二维码图案，添加我为好友</string>
     <string name="toShare">分享到：</string>
     <string name="busy_me">对方忙线中</string>
@@ -2321,7 +2321,7 @@
     <string name="redpackage_share">分享给好友</string>
     <string name="num_times">剩余抢红包次数 :</string>
     <string name="everyday_task">每日任务</string>
-    <string name="my_jx_money">我的即信币:</string>
+    <string name="my_jx_money">我的俊友币:</string>
     <string name="withdraw_task"><u>提现</u></string>
     <string name="advisory_task">咨询QQ:0000000000</string>
     <string name="rule_task">活动规则 :</string>
@@ -2333,9 +2333,9 @@
     <string name="signed_sign">已完成</string>
     <string name="proxt_apply">申请代理</string>
     <string name="Level_description">等级说明</string>
-    <string name="jixin_money">即信币</string>
+    <string name="jixin_money">俊友币</string>
     <string name="submit">提交</string>
-    <string name="register_account_tips"><Data><![CDATA[即信号(您的吉利彩票会员账号)<font color="#FF0000">*</font>]]></Data></string>
+    <string name="register_account_tips"><Data><![CDATA[俊友号(您的吉利彩票会员账号)<font color="#FF0000">*</font>]]></Data></string>
 
     <string name="guanfang">官方彩</string>
     <string name="chuantong">传统彩</string>