Android 修复个人信息修改等问题

o2android/app/build.gradle

@@ -105,7 +105,7 @@ android {
     buildTypes {
         debug {
             signingConfig signingConfigs.debug
-            buildConfigField "Boolean", "InnerServer", "false"
+            buildConfigField "Boolean", "InnerServer", "true"
             buildConfigField "Boolean", "LOG_ENABLE", "true"
             buildConfigField "Boolean", "LOG_FILE", "true"
             manifestPlaceholders = [JPUSH_PKGNAME      : defaultConfig.applicationId,

o2android/app/src/main/java/net/zoneland/x/bpm/mobile/v1/zoneXBPM/app/bluetooth/BlueToothClientActivity.kt

@@ -82,7 +82,7 @@ class BlueToothClientActivity : BaseMVPActivity<BlueToothContract.View, BlueToot
             val ssid = wifiSSIDs[position]
             XLog.info("ssid:$ssid")
 
-            val dialog = O2DialogSupport.openCustomViewDialog(this@BlueToothClientActivity, "请输入wifi密码", R.layout.dialog_wifi, { dialog ->
+            val dialog = O2DialogSupport.openCustomViewDialog(this@BlueToothClientActivity, "请输入wifi密码", R.layout.dialog_wifi) { dialog ->
                 val wifiPasswordTv = dialog.findViewById<EditText>(R.id.dialog_wifi_password)
                 val password = wifiPasswordTv.text.toString()
                 if (TextUtils.isEmpty(password)) {
@@ -90,7 +90,7 @@ class BlueToothClientActivity : BaseMVPActivity<BlueToothContract.View, BlueToot
                 } else {
                     sendInfo2AIDevice(ssid, password)
                 }
-            })
+            }
             val wifiSSIDTv = dialog.findViewById<TextView>(R.id.dialog_wifi_ssid)
             wifiSSIDTv.text = ssid
 

o2android/app/src/main/java/net/zoneland/x/bpm/mobile/v1/zoneXBPM/app/o2/bind/BindPhoneActivity.kt

@@ -127,7 +127,6 @@ class BindPhoneActivity: AppCompatActivity(), BindPhoneContract.View , DialogInt
     private fun goFinish() {
         if (goToMain) {
             goThenKill<MainActivity>()
-            O2App.instance._JMLoginInner()
         } else {
             goThenKill<LoginActivity>(LoginActivity.startBundleData(phone))
         }

o2android/app/src/main/java/net/zoneland/x/bpm/mobile/v1/zoneXBPM/app/o2/launch/LaunchActivity.kt

@@ -361,7 +361,6 @@ class LaunchActivity : BaseMVPActivity<LaunchContract.View, LaunchContract.Prese
     }
 
     private fun gotoMain() {
-        O2App.instance._JMLoginInner()//im
         circleProgressBar_launch.gone()
         if (mStyleUpdate) {
             goAndClearBefore<MainActivity>()

o2android/app/src/main/java/net/zoneland/x/bpm/mobile/v1/zoneXBPM/app/o2/login/LoginActivity.kt

@@ -248,7 +248,6 @@ class LoginActivity: BaseMVPActivity<LoginContract.View, LoginContract.Presenter
         }
         hideLoadingDialog()
         O2SDKManager.instance().setCurrentPersonData(data)
-        O2App.instance._JMLoginInner()
         goThenKill<MainActivity>()
     }
 

o2android/app/src/main/java/net/zoneland/x/bpm/mobile/v1/zoneXBPM/app/o2/main/IndexFragment.kt

@@ -268,8 +268,8 @@ class IndexFragment : BaseMVPViewPagerFragment<IndexContract.View, IndexContract
             isLoadMoreList = false
             hiddenObtainMoreDataAnimation()
         }
-        if (!taskList.isEmpty()) {
-            lastTaskId = taskList[taskList.size - 1].id
+        if (list.isNotEmpty()) {
+            lastTaskId = list[list.size - 1].id
         }
         refreshRecyclerView()
     }
@@ -299,8 +299,8 @@ class IndexFragment : BaseMVPViewPagerFragment<IndexContract.View, IndexContract
             isLoadMoreList = false
             hiddenObtainMoreDataAnimation()
         }
-        if (!newsList.isEmpty()) {
-            lastNewsId = newsList[newsList.size - 1].id
+        if (list.isNotEmpty()) {
+            lastNewsId = list[list.size - 1].id
         }
         refreshRecyclerView()
     }

o2android/app/src/main/java/net/zoneland/x/bpm/mobile/v1/zoneXBPM/app/o2/main/IndexPresenter.kt

@@ -40,6 +40,7 @@ class IndexPresenter : BasePresenterImpl<IndexContract.View>(), IndexContract.Pr
         status.add("published")
         wrapIn["statusList"] = status
         val json = O2SDKManager.instance().gson.toJson(wrapIn)
+
         val body = RequestBody.create(MediaType.parse("text/json"), json)
         getCMSAssembleControlService(mView?.getContext())?.let { service ->
             service.filterDocumentList(body, lastId, O2.DEFAULT_PAGE_NUMBER)

o2android/app/src/main/java/net/zoneland/x/bpm/mobile/v1/zoneXBPM/app/o2/main/SettingsFragment.kt

@@ -131,7 +131,6 @@ class SettingsFragment : BaseMVPViewPagerFragment<SettingsContract.View, Setting
 
     private fun logoutThenJump2Login() {
         O2SDKManager.instance().logoutCleanCurrentPerson()
-        O2App.instance._JMLogout()
         activity?.goAndClearBefore<LoginActivity>()
     }
 }

o2android/app/src/main/java/net/zoneland/x/bpm/mobile/v1/zoneXBPM/app/o2/my/MyInfoActivity.kt

@@ -23,9 +23,7 @@ import net.zoneland.x.bpm.mobile.v1.zoneXBPM.core.component.api.APIAddressHelper
 import net.zoneland.x.bpm.mobile.v1.zoneXBPM.core.component.enums.GenderTypeEnums
 import net.zoneland.x.bpm.mobile.v1.zoneXBPM.model.bo.api.main.person.PersonJson
 import net.zoneland.x.bpm.mobile.v1.zoneXBPM.utils.*
-import net.zoneland.x.bpm.mobile.v1.zoneXBPM.utils.extension.goThenKill
-import net.zoneland.x.bpm.mobile.v1.zoneXBPM.utils.extension.goWithRequestCode
-import net.zoneland.x.bpm.mobile.v1.zoneXBPM.utils.extension.o2Subscribe
+import net.zoneland.x.bpm.mobile.v1.zoneXBPM.utils.extension.*
 import net.zoneland.x.bpm.mobile.v1.zoneXBPM.utils.imageloader.O2ImageLoaderManager
 import net.zoneland.x.bpm.mobile.v1.zoneXBPM.utils.imageloader.O2ImageLoaderOptions
 import net.zoneland.x.bpm.mobile.v1.zoneXBPM.utils.permission.PermissionRequester
@@ -111,7 +109,7 @@ class MyInfoActivity : BaseMVPActivity<MyInfoContract.View, MyInfoContract.Prese
                     data?.let {
                         val result = it.extras?.getString(PicturePicker.FANCY_PICTURE_PICKER_SINGLE_RESULT_KEY, "")
                         if (!TextUtils.isEmpty(result)){
-                            val uri = Uri.fromFile(File(result))
+                            val uri = Uri.fromFile(File(result!!))
                             startClipAvatar(uri)
                         }
                     }
@@ -163,8 +161,8 @@ class MyInfoActivity : BaseMVPActivity<MyInfoContract.View, MyInfoContract.Prese
         person = personal
         switchStatus(false)
         tv_myInfo_name.text = personal.name
-        tv_myInfo_name_edit.text = personal.name
-        edit_myInfo_name.setText(personal.name)
+        myInfo_officePhone_value_id.text = personal.officePhone
+        edit_myInfo_officePhone.setText(personal.officePhone)
         tv_myInfo_sign_edit.text = personal.signature
         tv_myInfo_sign.text = personal.signature
         edit_myInfo_sign.setText(personal.signature)
@@ -174,6 +172,8 @@ class MyInfoActivity : BaseMVPActivity<MyInfoContract.View, MyInfoContract.Prese
         edit_myInfo_email.setText(personal.mail)
         myInfo_qq_value_id.text = personal.qq
         edit_myInfo_qq.setText(personal.qq)
+        myInfo_weixin_value_id.text = personal.weixin
+        edit_myInfo_weixin.setText(personal.weixin)
         if (GenderTypeEnums.MALE.key == personal.genderType) {
             image_myInfo_gender_men.setImageResource(R.mipmap.icon_gender_men_enable_50dp)
             image_myInfo_gender_women.setImageResource(R.mipmap.icon_gender_women_disable_50dp)
@@ -224,15 +224,17 @@ class MyInfoActivity : BaseMVPActivity<MyInfoContract.View, MyInfoContract.Prese
         if (flag) {
             tv_myInfo_sign_edit.visibility = View.GONE
             edit_myInfo_sign.visibility = View.VISIBLE
-            tv_myInfo_name_edit.visibility = View.GONE
-            edit_myInfo_name.visibility = View.VISIBLE
+            myInfo_officePhone_value_id.visibility = View.GONE
+            edit_myInfo_officePhone.visibility = View.VISIBLE
             myInfo_mobile_value_id.visibility = View.GONE
             edit_myInfo_mobile.visibility = View.VISIBLE
             myInfo_email_value_id.visibility = View.GONE
             edit_myInfo_email.visibility = View.VISIBLE
             myInfo_qq_value_id.visibility = View.GONE
             edit_myInfo_qq.visibility = View.VISIBLE
-            if (GenderTypeEnums.MALE.key.equals(person?.genderType)) {
+            myInfo_weixin_value_id.gone()
+            edit_myInfo_weixin.visible()
+            if (GenderTypeEnums.MALE.key == person?.genderType) {
                 image_myInfo_gender_men_edit.visibility = View.VISIBLE
                 image_myInfo_gender_women_edit.visibility = View.GONE
             } else {
@@ -246,14 +248,16 @@ class MyInfoActivity : BaseMVPActivity<MyInfoContract.View, MyInfoContract.Prese
         } else {
             tv_myInfo_sign_edit.visibility = View.VISIBLE
             edit_myInfo_sign.visibility = View.GONE
-            tv_myInfo_name_edit.visibility = View.VISIBLE
-            edit_myInfo_name.visibility = View.GONE
+            myInfo_officePhone_value_id.visibility = View.VISIBLE
+            edit_myInfo_officePhone.visibility = View.GONE
             myInfo_mobile_value_id.visibility = View.VISIBLE
             edit_myInfo_mobile.visibility = View.GONE
             myInfo_email_value_id.visibility = View.VISIBLE
             edit_myInfo_email.visibility = View.GONE
             myInfo_qq_value_id.visibility = View.VISIBLE
             edit_myInfo_qq.visibility = View.GONE
+            myInfo_weixin_value_id.visible()
+            edit_myInfo_weixin.gone()
             image_myInfo_gender_men_edit.visibility = View.GONE
             image_myInfo_gender_women_edit.visibility = View.GONE
             image_myInfo_edit_avatar.visibility = View.GONE
@@ -340,17 +344,15 @@ class MyInfoActivity : BaseMVPActivity<MyInfoContract.View, MyInfoContract.Prese
 
     private fun switchTheStatusAndUpdateTheData() {
         if (isEdit) {
-            val name = edit_myInfo_name.text.toString()
-            if (TextUtils.isEmpty(name)) {
-                XToast.toastShort(this, "姓名不能为空")
-                return
-            }
+
             if (person != null) {
-                person?.name = name
+                person?.name = tv_myInfo_name.text.toString()
                 person?.signature = edit_myInfo_sign.text.toString()
                 person?.mobile = edit_myInfo_mobile.text.toString()
                 person?.mail = edit_myInfo_email.text.toString()
                 person?.qq = edit_myInfo_qq.text.toString()
+                person?.officePhone = edit_myInfo_officePhone.text.toString()
+                person?.weixin = edit_myInfo_weixin.text.toString()
                 if (View.VISIBLE == image_myInfo_gender_men_edit.visibility) {
                     person?.genderType = GenderTypeEnums.MALE.key
                 } else {
@@ -371,7 +373,7 @@ class MyInfoActivity : BaseMVPActivity<MyInfoContract.View, MyInfoContract.Prese
 
     private fun showAvatar() {
         //头像
-        var url = APIAddressHelper.instance().getPersonAvatarUrlWithId(O2SDKManager.instance().distinguishedName)
+        val url = APIAddressHelper.instance().getPersonAvatarUrlWithId(O2SDKManager.instance().distinguishedName)
         O2ImageLoaderManager.instance().showImage(image_myInfo_avatar, url, O2ImageLoaderOptions(isSkipCache = true))
     }
 }

o2android/app/src/main/java/net/zoneland/x/bpm/mobile/v1/zoneXBPM/app/o2/person/PersonActivity.kt

@@ -204,8 +204,8 @@ class PersonActivity : BaseMVPActivity<PersonContract.View, PersonContract.Prese
             linear_person_gender_men_button.visible()
         }
         genderName = GenderTypeEnums.getNameByKey(personInfo.genderType)
-        if (!TextUtils.isEmpty(personInfo.qq)) {
-            tv_person_qq.text = "QQ ".plus(personInfo.qq)
+        if (!TextUtils.isEmpty(personInfo.signature)) {
+            tv_person_sign.text = "个人签名: ".plus(personInfo.signature)
         }
         tv_person_name.text = personInfo.name
         tv_person_name_2.text = personInfo.name

o2android/app/src/main/java/net/zoneland/x/bpm/mobile/v1/zoneXBPM/app/o2/security/AccountSecurityActivity.kt

@@ -56,8 +56,6 @@ class AccountSecurityActivity : BaseMVPActivity<AccountSecurityContract.View, Ac
     override fun logoutSuccess() {
         O2SDKManager.instance().logoutCleanCurrentPerson()
         O2SDKManager.instance().clearBindUnit()
-        O2App.instance._JMLogout()
-
         goAndClearBefore<BindPhoneActivity>()
     }
 

o2android/app/src/main/res/layout/activity_my_info.xml

@@ -11,9 +11,9 @@
         android:id="@+id/scroll_myInfo"
         android:layout_width="fill_parent"
         android:layout_height="match_parent"
+        android:background="@android:color/white"
         android:fadingEdge="vertical"
-        android:scrollbars="vertical"
-        android:background="@android:color/white">
+        android:scrollbars="vertical">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -44,8 +44,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="8dp"
-                    android:layout_marginRight="8dp"
                     android:layout_marginTop="10dp"
+                    android:layout_marginRight="8dp"
                     android:textColor="@android:color/white"
                     android:textSize="15sp"
                     app:layout_constraintLeft_toLeftOf="parent"
@@ -55,13 +55,16 @@
 
                 <TextView
                     android:id="@+id/tv_myInfo_sign"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/spacing_small"
                     android:textColor="@android:color/white"
                     android:textSize="15sp"
+                    android:textAlignment="center"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
+                    android:layout_marginStart="@dimen/spacing_normal"
+                    android:layout_marginEnd="@dimen/spacing_normal"
                     app:layout_constraintTop_toBottomOf="@+id/tv_myInfo_name"
                     tools:text="个人签名" />
 
@@ -80,15 +83,15 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
 
-                android:layout_marginBottom="@dimen/spacing_small"
-                android:layout_marginTop="@dimen/spacing_small">
+                android:layout_marginTop="@dimen/spacing_small"
+                android:layout_marginBottom="@dimen/spacing_small">
 
                 <RelativeLayout
                     android:id="@+id/linear_myInfo_gender_men_button"
                     android:layout_width="50dp"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
-                    android:layout_marginLeft="90dp"
+                    android:layout_alignParentStart="true"
+                    android:layout_marginStart="90dp"
                     android:orientation="vertical">
 
                     <ImageView
@@ -112,8 +115,8 @@
                         android:id="@+id/image_myInfo_gender_men_edit"
                         android:layout_width="22dp"
                         android:layout_height="22dp"
-                        android:layout_alignParentRight="true"
                         android:layout_alignParentTop="true"
+                        android:layout_alignParentEnd="true"
                         android:visibility="gone"
                         app:srcCompat="@mipmap/icon_radio_primary_on" />
                 </RelativeLayout>
@@ -122,8 +125,8 @@
                     android:id="@+id/linear_myInfo_gender_women_button"
                     android:layout_width="50dp"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    android:layout_marginRight="90dp"
+                    android:layout_alignParentEnd="true"
+                    android:layout_marginEnd="90dp"
                     android:orientation="vertical">
 
                     <ImageView
@@ -147,8 +150,8 @@
                         android:id="@+id/image_myInfo_gender_women_edit"
                         android:layout_width="22dp"
                         android:layout_height="22dp"
-                        android:layout_alignParentRight="true"
                         android:layout_alignParentTop="true"
+                        android:layout_alignParentRight="true"
                         android:visibility="gone"
                         app:srcCompat="@mipmap/icon_radio_primary_on" />
                 </RelativeLayout>
@@ -208,6 +211,10 @@
                     android:layout_weight="2"
                     android:background="@drawable/input_background_bottom_line"
                     android:hint="请填入个性签名"
+                    android:maxLines="1"
+                    android:lines="1"
+                    android:imeOptions="actionNext"
+                    android:inputType="text"
                     android:textColor="@color/z_color_text_primary"
                     android:textSize="@dimen/font_normal"
                     android:visibility="gone" />
@@ -241,22 +248,22 @@
                 android:orientation="vertical">
 
                 <LinearLayout
-                    android:id="@+id/myInfo_name_id"
+                    android:id="@+id/myInfo_mobile_id"
                     android:layout_width="match_parent"
                     android:layout_height="44dp"
                     android:gravity="center_vertical"
                     android:orientation="horizontal">
-                    <!--姓名-->
+
                     <TextView
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:text="姓名"
+                        android:text="手机号码"
                         android:textColor="@color/z_color_text_primary_dark"
                         android:textSize="15sp" />
 
                     <TextView
-                        android:id="@+id/tv_myInfo_name_edit"
+                        android:id="@+id/myInfo_mobile_value_id"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="2"
@@ -264,12 +271,16 @@
                         android:textSize="@dimen/font_normal" />
 
                     <EditText
-                        android:id="@+id/edit_myInfo_name"
+                        android:id="@+id/edit_myInfo_mobile"
                         android:layout_width="0dp"
                         android:layout_height="32dp"
                         android:layout_weight="2"
                         android:background="@drawable/input_background_bottom_line"
-                        android:hint="请填入姓名"
+                        android:hint="请填入手机号码"
+                        android:maxLines="1"
+                        android:lines="1"
+                        android:imeOptions="actionNext"
+                        android:inputType="phone"
                         android:textColor="@color/z_color_text_primary"
                         android:textSize="@dimen/font_normal"
                         android:visibility="gone" />
@@ -278,11 +289,10 @@
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="0.5dp"
-                    android:layout_alignParentBottom="true"
                     android:background="@color/z_color_split_line_ddd" />
 
                 <LinearLayout
-                    android:id="@+id/myInfo_mobile_id"
+                    android:id="@+id/myInfo_officePhone_id"
                     android:layout_width="match_parent"
                     android:layout_height="44dp"
                     android:gravity="center_vertical"
@@ -292,12 +302,12 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:text="联系电话"
+                        android:text="办公电话"
                         android:textColor="@color/z_color_text_primary_dark"
                         android:textSize="15sp" />
 
                     <TextView
-                        android:id="@+id/myInfo_mobile_value_id"
+                        android:id="@+id/myInfo_officePhone_value_id"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="2"
@@ -305,12 +315,16 @@
                         android:textSize="@dimen/font_normal" />
 
                     <EditText
-                        android:id="@+id/edit_myInfo_mobile"
+                        android:id="@+id/edit_myInfo_officePhone"
                         android:layout_width="0dp"
                         android:layout_height="32dp"
                         android:layout_weight="2"
                         android:background="@drawable/input_background_bottom_line"
-                        android:hint="请填入联系电话"
+                        android:hint="请填入办公电话"
+                        android:maxLines="1"
+                        android:lines="1"
+                        android:imeOptions="actionNext"
+                        android:inputType="phone"
                         android:textColor="@color/z_color_text_primary"
                         android:textSize="@dimen/font_normal"
                         android:visibility="gone" />
@@ -319,7 +333,6 @@
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="0.5dp"
-                    android:layout_alignParentBottom="true"
                     android:background="@color/z_color_split_line_ddd" />
 
                 <LinearLayout
@@ -352,6 +365,10 @@
                         android:layout_weight="2"
                         android:background="@drawable/input_background_bottom_line"
                         android:hint="请填入电子邮件"
+                        android:maxLines="1"
+                        android:lines="1"
+                        android:imeOptions="actionNext"
+                        android:inputType="textEmailAddress"
                         android:textColor="@color/z_color_text_primary"
                         android:textSize="@dimen/font_normal"
                         android:visibility="gone" />
@@ -360,7 +377,6 @@
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="0.5dp"
-                    android:layout_alignParentBottom="true"
                     android:background="@color/z_color_split_line_ddd" />
 
                 <LinearLayout
@@ -393,6 +409,54 @@
                         android:layout_weight="2"
                         android:background="@drawable/input_background_bottom_line"
                         android:hint="请填入QQ"
+                        android:maxLines="1"
+                        android:lines="1"
+                        android:imeOptions="actionNext"
+                        android:inputType="text"
+                        android:textColor="@color/z_color_text_primary"
+                        android:textSize="@dimen/font_normal"
+                        android:visibility="gone" />
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="0.5dp"
+                    android:background="@color/z_color_split_line_ddd" />
+
+                <LinearLayout
+                    android:id="@+id/myInfo_weixin_id"
+                    android:layout_width="match_parent"
+                    android:layout_height="44dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="微信"
+                        android:textColor="@color/z_color_text_primary_dark"
+                        android:textSize="15sp" />
+
+                    <TextView
+                        android:id="@+id/myInfo_weixin_value_id"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="2"
+                        android:textColor="@color/z_color_text_primary"
+                        android:textSize="@dimen/font_normal" />
+
+                    <EditText
+                        android:id="@+id/edit_myInfo_weixin"
+                        android:layout_width="0dp"
+                        android:layout_height="32dp"
+                        android:layout_weight="2"
+                        android:background="@drawable/input_background_bottom_line"
+                        android:hint="请填入微信号"
+                        android:maxLines="1"
+                        android:lines="1"
+                        android:imeOptions="actionNext"
+                        android:inputType="text"
                         android:textColor="@color/z_color_text_primary"
                         android:textSize="@dimen/font_normal"
                         android:visibility="gone" />
@@ -401,24 +465,6 @@
 
             </LinearLayout>
 
-            <!--<LinearLayout-->
-                <!--android:layout_width="match_parent"-->
-                <!--android:layout_height="wrap_content"-->
-                <!--android:background="@color/z_color_background"-->
-                <!--android:gravity="center_horizontal"-->
-                <!--android:paddingBottom="30dp"-->
-                <!--android:paddingTop="30dp">-->
-
-                <!--<Button-->
-                    <!--android:id="@+id/myInfo_logout_btn_id"-->
-                    <!--android:layout_width="325dp"-->
-                    <!--android:layout_height="44dp"-->
-                    <!--android:background="@drawable/button_background_44dp"-->
-                    <!--android:gravity="center"-->
-                    <!--android:text="@string/activity_logout"-->
-                    <!--android:textColor="@android:color/white"-->
-                    <!--android:textSize="18sp" />-->
-            <!--</LinearLayout>-->
 
         </LinearLayout>
 
@@ -428,17 +474,17 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="64dp"
-        android:paddingTop="@dimen/toolbar_padding_top"
         android:layout_alignParentTop="true"
-        android:background="@color/z_color_primary">
+        android:background="@color/z_color_primary"
+        android:paddingTop="@dimen/toolbar_padding_top">
 
         <ImageView
             android:id="@+id/image_myInfo_back"
             android:layout_width="24dp"
             android:layout_height="24dp"
-            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
             android:layout_centerVertical="true"
-            android:layout_marginLeft="8dp"
+            android:layout_marginStart="8dp"
             android:src="@mipmap/ic_back_mtrl_white_alpha" />
 
         <TextView
@@ -454,9 +500,9 @@
             android:id="@+id/tv_myInfo_edit_save_btn"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
-            android:layout_marginRight="8dp"
+            android:layout_marginEnd="8dp"
             android:text="@string/menu_edit"
             android:textColor="@android:color/white" />
     </RelativeLayout>

o2android/app/src/main/res/layout/activity_person_info.xml

@@ -50,16 +50,21 @@
                     tools:text="刘振兴" />
 
                 <TextView
-                    android:id="@+id/tv_person_qq"
-                    android:layout_width="wrap_content"
+                    android:id="@+id/tv_person_sign"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/spacing_small"
                     android:textColor="@android:color/white"
                     android:textSize="15sp"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintRight_toRightOf="parent"
+                    android:textAlignment="center"
                     app:layout_constraintTop_toBottomOf="@+id/tv_person_name"
-                    tools:text="QQ 171600000" />
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    android:layout_marginStart="@dimen/spacing_normal"
+                    android:layout_marginEnd="@dimen/spacing_normal"
+                    android:singleLine="true"
+                    android:ellipsize="end"
+                    tools:text="个性签名：就看见看见看见看见" />
             </androidx.constraintlayout.widget.ConstraintLayout>
 
             <RelativeLayout
@@ -73,8 +78,8 @@
                     android:id="@+id/linear_person_gender_men_button"
                     android:layout_width="60dp"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
-                    android:layout_marginLeft="90dp"
+                    android:layout_alignParentStart="true"
+                    android:layout_marginStart="90dp"
                     android:gravity="center_horizontal"
                     android:orientation="vertical">
 
@@ -99,8 +104,8 @@
                     android:id="@+id/linear_person_gender_women_button"
                     android:layout_width="60dp"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
-                    android:layout_marginLeft="90dp"
+                    android:layout_alignParentStart="true"
+                    android:layout_marginStart="90dp"
                     android:gravity="center_horizontal"
                     android:visibility="gone"
                     android:orientation="vertical">
@@ -126,9 +131,9 @@
                     android:id="@+id/linear_person_collection_button"
                     android:layout_width="60dp"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
+                    android:layout_alignParentEnd="true"
                     android:gravity="center_horizontal"
-                    android:layout_marginRight="90dp"
+                    android:layout_marginEnd="90dp"
                     android:orientation="vertical">
 
                     <ImageView
@@ -196,7 +201,6 @@
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="0.5dp"
-                    android:layout_alignParentBottom="true"
                     android:background="@color/z_color_split_line_ddd" />
 
                 <LinearLayout
@@ -226,7 +230,6 @@
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="0.5dp"
-                    android:layout_alignParentBottom="true"
                     android:background="@color/z_color_split_line_ddd" />
 
                 <LinearLayout
@@ -256,7 +259,6 @@
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="0.5dp"
-                    android:layout_alignParentBottom="true"
                     android:background="@color/z_color_split_line_ddd" />
 
                 <LinearLayout
@@ -286,7 +288,6 @@
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="0.5dp"
-                    android:layout_alignParentBottom="true"
                     android:background="@color/z_color_split_line_ddd" />
 
                 <LinearLayout
@@ -322,7 +323,6 @@
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="0.5dp"
-                    android:layout_alignParentBottom="true"
                     android:background="@color/z_color_split_line_ddd" />
 
                 <LinearLayout
@@ -358,7 +358,6 @@
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="0.5dp"
-                    android:layout_alignParentBottom="true"
                     android:background="@color/z_color_split_line_ddd" />
 
 
@@ -393,7 +392,6 @@
             <View
                 android:layout_width="match_parent"
                 android:layout_height="0.5dp"
-                android:layout_alignParentBottom="true"
                 android:background="@color/z_color_split_line_ddd" />
 
             <Button

o2android/o2_auth_sdk/src/main/java/net/zoneland/x/bpm/mobile/v1/zoneXBPM/model/bo/api/main/person/PersonJson.kt

@@ -22,6 +22,7 @@ data class PersonJson(
         var mail: String = "",
         var signature: String = "",
         var mobile: String = "",
+        var officePhone: String = "",
         var pinyinInitial: String = "",
         var pinyin: String = "",
         var qq: String = "",