bugfix

app/accompany/release/output.json

@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":100,"versionName":"1.0.0","enabled":true,"outputFile":"accompany_release_v1.0.0-05152110.apk","fullName":"accompanyRelease","baseName":"accompany-release"},"path":"accompany_release_v1.0.0-05152110.apk","properties":{}}]

app/src/main/AndroidManifest.xml

@@ -1054,7 +1054,6 @@
             android:theme="@style/room_message_activity" />
         <activity
             android:name="com.yizhuan.tutu.room_chat.activity.RoomMsgActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/room_message_activity" />
         <activity
             android:name="com.yizhuan.tutu.room_chat.activity.NimTeamRoomMessageActivity"

app/src/main/java/com/yizhuan/erban/home/adapter/HomePlayAdapter.java

@@ -12,6 +12,7 @@ import com.yizhuan.erban.common.widget.CircleImageView;
 import com.yizhuan.xchat_android_core.home.bean.HomePlayInfo;
 import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2;
 import com.yizhuan.xchat_android_core.utils.TextUtils;
+import com.yizhuan.xchat_android_library.utils.ListUtils;
 
 /**
  * create by lvzebiao @2019/11/13
@@ -35,9 +36,10 @@ public class HomePlayAdapter extends BaseQuickAdapter<HomePlayInfo, BaseViewHold
         helper.setVisible(R.id.iv_tag,!TextUtils.isEmptyText(item.getTagPict()));
         ImageLoadUtilsV2.loadImage(helper.getView(R.id.iv_tag), item.getTagPict());
 
-        helper.setText(R.id.tv_online_num,item.getOnlineNum()+"")
+        helper.setText(R.id.tv_online_num,item.getMicUserCount()+"")
                 .setText(R.id.tv_title,item.getTitle());
-        if (item.getMicUsers().size() < 5){
+
+        if (!ListUtils.isListEmpty(item.getMicUsers()) && item.getMicUsers().size() < 5){
             for (int i = 0; i < 5 - item.getMicUserCount(); i++) {
                 HomePlayInfo.MicUsersBean micUsersBean = new HomePlayInfo.MicUsersBean();
                 micUsersBean.setAvatar("");

app/src/main/java/com/yizhuan/erban/ui/login/BindCodeActivity.java

@@ -160,7 +160,7 @@ public class BindCodeActivity extends BaseLoginAct  {
             return;
         }
         AuthModel.get()
-                .sendLoginCode(mPhone, CodeType.REGISTER)
+                .sendLoginCode(mPhone, CodeType.BIND_PHONE)
                 .observeOn(AndroidSchedulers.mainThread())
                 .compose(bindUntilEvent(ActivityEvent.DESTROY))
                 .subscribe(new SingleObserver<String>() {

app/src/main/java/com/yizhuan/erban/ui/setting/VerifyPhoneActivity.java

@@ -74,7 +74,8 @@ public class VerifyPhoneActivity extends BaseBindingActivity<ActivityVerifyPhone
         if (isForgetPwd) {
             type = CodeType.RESET_PAY_PSW;
         }
-        CodeModel.get().sendCode(mBinding.etPhone.getText().toString(), type)
+        AuthModel.get()
+                .sendLoginCode(mBinding.etPhone.getText().toString(), type)
                 .compose(bindToLifecycle())
                 .doOnError(new Consumer<Throwable>() {
                     @Override

app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java

@@ -98,7 +98,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
     private int identityState = IdentityState.NON;
 
     private UserInfoActivity mActivity;
-    private long userId;
+    private long userId = 0;
     private UserInfo userInfo;
     Drawable mAttenDrawable;
     Drawable mAttenedDrawable;
@@ -508,8 +508,6 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
                 break;
 
             case R.id.iv_edit:
-                editClick(identityState);
-                break;
 
             case R.id.tv_edit:
                 editClick(identityState);

app/src/main/java/com/yizhuan/erban/ui/withdraw/BinderAlipayActivity.java

@@ -92,7 +92,8 @@ public class BinderAlipayActivity extends BaseActivity {
                             if (userInfo.isBindPhone()){
                                 String phone = userInfo.getPhone();
                                 phoneSB.append(phone);
-                                return CodeModel.get().sendCode(phone, CodeType.BIND_ALI);
+                                return  AuthModel.get()
+                                        .sendLoginCode(phone, CodeType.BIND_ALI);
                             }else {
                                 return Single.error(new Throwable("没有绑定手机号。"));
                             }

app/src/main/res/drawable/bg_splash.xml

@@ -4,9 +4,9 @@
         android:drawable="@color/white"
         android:gravity="fill" />
 
-    <item android:top="70dp">
+    <item android:bottom="150dp">
         <bitmap
-            android:gravity="center_horizontal|top"
+            android:gravity="center"
             android:src="@drawable/splash_logo" />
     </item>
 </layer-list>

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

@@ -84,8 +84,8 @@
                 android:focusable="true"
                 android:onClick="@{click}"
                 android:text="@string/text_request_code"
-                android:textColor="@color/design_color"
-                android:textSize="@dimen/dp_15"
+                android:textColor="@color/appColor"
+                android:textSize="@dimen/dp_13"
                 app:layout_constraintBottom_toBottomOf="@+id/et_code_pay_pwd"
                 app:layout_constraintEnd_toEndOf="@+id/et_code_pay_pwd"
                 tools:ignore="SpUsage" />

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

@@ -168,7 +168,7 @@
                 android:id="@+id/text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="如果您的手机号已丢失\n请联系客服微信:erban2018"
+                android:text="如果您的手机号已丢失\n请联系客服微信:xingqiu66kefu"
                 android:textColor="@color/color_999999"
                 android:textSize="14sp" />
 

app/src/module_community/java/com/yizhuan/erban/community/square/adapter/SquareDynamicAdapter.java

@@ -124,7 +124,7 @@ public class SquareDynamicAdapter extends BaseQuickAdapter<WorldDynamicBean, Bas
         //时间
         helper.setText(R.id.tv_time, TimeUiUtils.getDynamicUi(item.getPublishTime()));
         //关注才显示时间
-        helper.setVisible(R.id.tv_time, squareType != SquareFragment.TAB_TYPE_NEW);
+//        helper.setVisible(R.id.tv_time, squareType != SquareFragment.TAB_TYPE_NEW);
 
         ExpandableTextView etvContent = helper.getView(R.id.etv_content);
         etvContent.setEventType(4);

app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/RoomMsgActivity.java

@@ -44,8 +44,6 @@ public class RoomMsgActivity extends BaseActivity implements CarMagicIndicator.O
     private int type = AbstractSelectFriendAction.ROOM_MSG;
     public static final String KEY_PRIVATE_CHAT_ACCOUNT = "key_private_chat_account";
 
-    private String account;
-
     public static void start(Context context) {
         Intent starter = new Intent(context, RoomMsgActivity.class);
         //starter.putExtra();
@@ -85,7 +83,7 @@ public class RoomMsgActivity extends BaseActivity implements CarMagicIndicator.O
         setContentView(R.layout.activity_room_message);
         ButterKnife.bind(this);
         init();
-        account = getIntent().getStringExtra(KEY_PRIVATE_CHAT_ACCOUNT);
+        String account = getIntent().getStringExtra(KEY_PRIVATE_CHAT_ACCOUNT);
         if (!TextUtils.isEmpty(account)) {
             NimRoomP2PMessageActivity.start(this, account);
         }