问题修复

app/src/main/AndroidManifest.xml

@@ -127,18 +127,9 @@
         <activity
             android:name=".ui.activity.guidance.AppointmentDetailActivity"
             android:screenOrientation="portrait" />
-        <activity
-            android:name=".ui.activity.guidance.DoctorsGuidanceActivity"
-            android:screenOrientation="portrait" />
         <activity
             android:name=".ui.activity.guidance.DoctorHomepageActivity"
             android:screenOrientation="portrait" />
-        <activity
-            android:name=".ui.activity.guidance.FilterSearchDoctorActivity"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name=".ui.activity.guidance.SeekDoctorSearchActivity"
-            android:screenOrientation="portrait" />
         <activity
             android:name=".ui.activity.guidance.SelectConsultantActivity"
             android:screenOrientation="portrait" />
@@ -163,9 +154,6 @@
         <activity
             android:name=".ui.activity.emergency.EmergencySeekDoctorDetailsActivity"
             android:screenOrientation="portrait" />
-        <activity
-            android:name=".ui.activity.emergency.AddBigDiseaseActivity"
-            android:screenOrientation="portrait" />
         <activity
             android:name=".ui.activity.guidance.GeneralPracticeGuidanceActivity"
             android:screenOrientation="portrait" />
@@ -193,7 +181,9 @@
         <activity
             android:name=".ui.activity.guidance.IMSelectArchivesActivity"
             android:screenOrientation="portrait" />
-        <activity android:name="com.sw.healthyclients.ui.guidance.ViewLocationActivity" />
+        <activity
+            android:name="com.sw.healthyclients.ui.guidance.ViewLocationActivity"
+            android:screenOrientation="portrait" />
 
     </application>
 

app/src/main/java/com/xjjk/healthyclients/MainActivity.kt

@@ -37,7 +37,6 @@ import com.xjjk.healthyclients.ui.viewmodel.MainViewModel
 import com.xjjk.healthyclients.utils.ConstantUtils
 import com.xjjk.healthyclients.utils.LocationManager
 import com.xjjk.healthyclients.utils.SystemUtils
-import com.xjjk.healthyclients.view.FuntionBlurbDialog
 import com.xjjk.healthyclients.view.PrivacyDialog
 import com.xjjk.healthyclients.view.TextViewDialog
 import kotlinx.coroutines.flow.collectLatest
@@ -163,9 +162,9 @@ class MainActivity : BaseVMBActivity<MainViewModel, ActivityMainBinding>(R.layou
                     if (overdue) {
                         ConstantUtils.mCheckToken = true
                         EventBus.getDefault().post(RefreshEvent())
-                        if (DataStoreManager.getToken().isNotEmpty()) {
-                            mViewModel.getNoticeData()
-                        }
+//                        if (DataStoreManager.getToken().isNotEmpty()) {
+//                            mViewModel.getNoticeData()
+//                        }
                         if (DataStoreManager.isLogin()) {
                             MyApplication.appViewModel?.getIMSig(successCall = {
                                 loginIm(it.userId, it.userSig)
@@ -179,25 +178,25 @@ class MainActivity : BaseVMBActivity<MainViewModel, ActivityMainBinding>(R.layou
             }
         }
         //用户弹窗
-        lifecycleScope.launch {
-            repeatOnLifecycle(Lifecycle.State.CREATED) {
-                mViewModel.noticeBean.collectLatest { bean ->
-                    if (bean.title.isNotEmpty() && bean.content.isNotEmpty()) {
-                        showBlurbDialog(bean)
-                    }
-                }
-            }
-        }
+//        lifecycleScope.launch {
+//            repeatOnLifecycle(Lifecycle.State.CREATED) {
+//                mViewModel.noticeBean.collectLatest { bean ->
+//                    if (bean.title.isNotEmpty() && bean.content.isNotEmpty()) {
+//                        showBlurbDialog(bean)
+//                    }
+//                }
+//            }
+//        }
         //用户弹窗-结果提交
-        lifecycleScope.launch {
-            repeatOnLifecycle(Lifecycle.State.CREATED) {
-                mViewModel.submitNoticeChooseResult.collectLatest { success ->
-                    if (success) {
-                        mFunctionBlurbDialog?.cancel()
-                    }
-                }
-            }
-        }
+//        lifecycleScope.launch {
+//            repeatOnLifecycle(Lifecycle.State.CREATED) {
+//                mViewModel.submitNoticeChooseResult.collectLatest { success ->
+//                    if (success) {
+//                        mFunctionBlurbDialog?.cancel()
+//                    }
+//                }
+//            }
+//        }
         //用户弹窗-结果提交
         lifecycleScope.launch {
             repeatOnLifecycle(Lifecycle.State.CREATED) {
@@ -321,7 +320,7 @@ class MainActivity : BaseVMBActivity<MainViewModel, ActivityMainBinding>(R.layou
 //            }
 //        }
     }
-    private val mFunctionBlurbDialog : FuntionBlurbDialog by lazy { FuntionBlurbDialog(this@MainActivity) }
+//    private val mFunctionBlurbDialog : FuntionBlurbDialog by lazy { FuntionBlurbDialog(this@MainActivity) }
 
     private var isExit = false
     var mHandler: Handler = @SuppressLint("HandlerLeak")
@@ -351,17 +350,17 @@ class MainActivity : BaseVMBActivity<MainViewModel, ActivityMainBinding>(R.layou
         }
         return super.onKeyDown(keyCode, event)
     }
-    private fun showBlurbDialog(bean: UserNoticeBean) {
-        mFunctionBlurbDialog?.setTitle(bean.title)
-        mFunctionBlurbDialog?.setContent(bean.content)
-        mFunctionBlurbDialog?.setOnAffirmClickListener(object :
-            FuntionBlurbDialog.OnAffirmClickListener {
-            override fun onAffirmClick(type: Int, viewDialog: FuntionBlurbDialog) {
-                mViewModel.submitNoticeChooseItem(bean.id, type)
-            }
-        })
-        mFunctionBlurbDialog?.show()
-    }
+//    private fun showBlurbDialog(bean: UserNoticeBean) {
+//        mFunctionBlurbDialog?.setTitle(bean.title)
+//        mFunctionBlurbDialog?.setContent(bean.content)
+//        mFunctionBlurbDialog?.setOnAffirmClickListener(object :
+//            FuntionBlurbDialog.OnAffirmClickListener {
+//            override fun onAffirmClick(type: Int, viewDialog: FuntionBlurbDialog) {
+//                mViewModel.submitNoticeChooseItem(bean.id, type)
+//            }
+//        })
+//        mFunctionBlurbDialog?.show()
+//    }
 
 
     override fun onMessageEvent(event: Any?) {

app/src/main/java/com/xjjk/healthyclients/data/repository/CommonRepository.kt

@@ -10,9 +10,10 @@ import com.xjjk.healthyclients.bean.user.IMDoctorInfoBean
 import com.xjjk.healthyclients.bean.user.SelectEmergencyContactListBean
 import com.xjjk.healthyclients.data.api.CommonApi
 import com.xjjk.healthyclients.data.bean.ApiResponse
+import com.xjjk.healthyclients.retrofit.RetrofitManager
+import com.xjjk.healthyclients.retrofit.RetrofitManager.toRequestBody
 import com.xjjk.healthyclients.data.repository.EmergencyRepository.apiCall
 import com.xjjk.healthyclients.event.UserNoticeBean
-import com.xjjk.healthyclients.retrofit.RetrofitManager
 import com.xjjk.healthyclients.superfuntion.toJson
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.MultipartBody

app/src/main/java/com/xjjk/healthyclients/fragment/EmergencyFragment.kt

@@ -347,8 +347,8 @@ class EmergencyFragment :
                     )
                     mAMap?.addMarker(markerOption)
                 }
-                MapUtils.setMapZoonlo(mAMap, 200, ArrayList(newlist))
             }
+            MapUtils.setMapZoonlo(mAMap, 200, ArrayList(newlist))
         }
 
     }

app/src/main/java/com/xjjk/healthyclients/imActivity/MainMinimalistActivity.java

@@ -1,445 +0,0 @@
-package com.xjjk.healthyclients.imActivity;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-import androidx.viewpager2.widget.ViewPager2;
-
-import com.xjjk.healthyclients.R;
-import com.tencent.imsdk.BaseConstants;
-import com.tencent.imsdk.v2.V2TIMCallback;
-import com.tencent.imsdk.v2.V2TIMConversation;
-import com.tencent.imsdk.v2.V2TIMConversationListFilter;
-import com.tencent.imsdk.v2.V2TIMConversationOperationResult;
-import com.tencent.imsdk.v2.V2TIMConversationResult;
-import com.tencent.imsdk.v2.V2TIMFriendApplication;
-import com.tencent.imsdk.v2.V2TIMFriendApplicationResult;
-import com.tencent.imsdk.v2.V2TIMFriendshipListener;
-import com.tencent.imsdk.v2.V2TIMManager;
-import com.tencent.imsdk.v2.V2TIMValueCallback;
-import com.tencent.qcloud.tuicore.TUIConstants;
-import com.tencent.qcloud.tuicore.component.activities.BaseMinimalistLightActivity;
-import com.tencent.qcloud.tuicore.util.ErrorMessageConverter;
-import com.tencent.qcloud.tuicore.util.ToastUtil;
-import com.tencent.qcloud.tuikit.tuicontact.minimalistui.pages.TUIContactMinimalistFragment;
-import com.tencent.qcloud.tuikit.tuiconversation.minimalistui.page.ConversationMinimalistFragment;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-public class MainMinimalistActivity extends BaseMinimalistLightActivity {
-
-    private static final String TAG = MainMinimalistActivity.class.getSimpleName();
-    private TextView mConversationBtnText;
-    private TextView mContactBtnText;
-    private TextView mProfileSelfBtnText;
-    private ImageView mConversationBtnIcon;
-    private ImageView mContactBtnIcon;
-    private ImageView mProfileSelfBtnIcon;
-    private TextView mMsgUnread;
-    private TextView mNewFriendUnread;
-
-    private ViewPager2 mainViewPager;
-    private List<Fragment> fragments;
-
-    private HashMap<String, V2TIMConversation> markUnreadMap = new HashMap<>();
-
-    private static WeakReference<MainMinimalistActivity> instance;
-    private BroadcastReceiver unreadCountReceiver;
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        Log.i(TAG, "onCreate");
-        super.onCreate(savedInstanceState);
-        instance = new WeakReference<>(this);
-
-        initView();
-        initUnreadCountReceiver();
-    }
-
-    private void initUnreadCountReceiver() {
-        unreadCountReceiver = new BroadcastReceiver() {
-            @Override
-            public void onReceive(Context context, Intent intent) {
-                long unreadCount = intent.getLongExtra(TUIConstants.UNREAD_COUNT_EXTRA, 0);
-                if (unreadCount > 0) {
-                    mMsgUnread.setVisibility(View.VISIBLE);
-                } else {
-                    mMsgUnread.setVisibility(View.GONE);
-                }
-                String unreadStr = "" + unreadCount;
-                if (unreadCount > 100) {
-                    unreadStr = "99+";
-                }
-                mMsgUnread.setText(unreadStr);
-                // update Huawei offline push Badge
-//                OfflineMessageDispatcher.updateBadge(MainMinimalistActivity.this, (int) unreadCount);
-            }
-        };
-
-        IntentFilter unreadCountFilter = new IntentFilter();
-        unreadCountFilter.addAction(TUIConstants.CONVERSATION_UNREAD_COUNT_ACTION);
-        LocalBroadcastManager.getInstance(this).registerReceiver(unreadCountReceiver, unreadCountFilter);
-    }
-
-    @Override
-    protected void onNewIntent(Intent intent) {
-        super.onNewIntent(intent);
-        Log.i(TAG, "onNewIntent");
-        setIntent(intent);
-    }
-
-    private void initView() {
-        setContentView(R.layout.overseas_main_activity);
-
-        mConversationBtnText = findViewById(R.id.conversation);
-        mContactBtnText = findViewById(R.id.contact);
-        mProfileSelfBtnText = findViewById(R.id.mine);
-        mConversationBtnIcon = findViewById(R.id.tab_conversation_icon);
-        mContactBtnIcon = findViewById(R.id.tab_contact_icon);
-        mProfileSelfBtnIcon = findViewById(R.id.tab_profile_icon);
-        mMsgUnread = findViewById(R.id.msg_total_unread);
-        mNewFriendUnread = findViewById(R.id.new_friend_total_unread);
-
-        fragments = new ArrayList<>();
-        fragments.add(new ConversationMinimalistFragment());
-        fragments.add(new TUIContactMinimalistFragment());
-//        fragments.add(new ProfileMinimalistFragment());
-
-        mainViewPager = findViewById(R.id.view_pager);
-        FragmentAdapter fragmentAdapter = new FragmentAdapter(this);
-        fragmentAdapter.setFragmentList(fragments);
-        mainViewPager.setUserInputEnabled(false);
-        mainViewPager.setOffscreenPageLimit(4);
-        mainViewPager.setAdapter(fragmentAdapter);
-        mainViewPager.setCurrentItem(0, false);
-        prepareToClearAllUnreadMessage();
-    }
-
-    private void prepareToClearAllUnreadMessage() {
-        mMsgUnread.setOnTouchListener(new View.OnTouchListener() {
-            private float downX;
-            private float downY;
-            private boolean isTriggered = false;
-            @Override
-            public boolean onTouch(View view, MotionEvent event) {
-                switch (event.getAction()) {
-                    case MotionEvent.ACTION_DOWN:
-                        downX = mMsgUnread.getX();
-                        downY = mMsgUnread.getY();
-                        break;
-                    case MotionEvent.ACTION_MOVE:
-                        if (isTriggered) {
-                            return true;
-                        }
-                        float viewX = view.getX();
-                        float viewY = view.getY();
-                        float eventX = event.getX();
-                        float eventY = event.getY();
-                        float translationX = eventX + viewX - downX;
-                        float translationY = eventY + viewY - downY;
-                        view.setTranslationX(translationX);
-                        view.setTranslationY(translationY);
-                        // If the moved x and y axis coordinates exceed a certain pixel, it will trigger one-click to clear all unread sessions
-                        if (Math.abs(translationX) > 200|| Math.abs(translationY) > 200) {
-                            isTriggered = true;
-                            mMsgUnread.setVisibility(View.GONE);
-                            triggerClearAllUnreadMessage();
-                        }
-                        break;
-                    case MotionEvent.ACTION_UP:
-                        view.setTranslationX(0);
-                        view.setTranslationY(0);
-                        isTriggered = false;
-                        break;
-                    case MotionEvent.ACTION_CANCEL:
-                        isTriggered = false;
-                        break;
-                }
-
-                return true;
-            }
-        });
-    }
-
-    private void triggerClearAllUnreadMessage() {
-        V2TIMManager.getMessageManager().markAllMessageAsRead(new V2TIMCallback() {
-            @Override
-            public void onSuccess() {
-                Log.i(TAG, "markAllMessageAsRead success");
-                ToastUtil.toastShortMessage(MainMinimalistActivity.this.getString(R.string.mark_all_message_as_read_succ));
-            }
-
-            @Override
-            public void onError(int code, String desc) {
-                Log.i(TAG, "markAllMessageAsRead error:" + code + ", desc:" + ErrorMessageConverter.convertIMError(code, desc));
-                ToastUtil.toastShortMessage(MainMinimalistActivity.this.getString(R.string.mark_all_message_as_read_err_format, code, ErrorMessageConverter.convertIMError(code, desc)));
-                mMsgUnread.setVisibility(View.VISIBLE);
-            }
-        });
-
-        V2TIMConversationListFilter filter = new V2TIMConversationListFilter();
-        filter.setMarkType(V2TIMConversation.V2TIM_CONVERSATION_MARK_TYPE_UNREAD);
-        getMarkUnreadConversationList(filter, 0, 100, true, new V2TIMValueCallback<HashMap<String, V2TIMConversation>>() {
-            @Override
-            public void onSuccess(HashMap<String, V2TIMConversation> stringV2TIMConversationHashMap) {
-                if (stringV2TIMConversationHashMap.size() == 0) {
-                    return;
-                }
-                List<String> unreadConversationIDList = new ArrayList<>();
-                Iterator<Map.Entry<String, V2TIMConversation>> iterator = markUnreadMap.entrySet().iterator();
-                while (iterator.hasNext()) {
-                    Map.Entry<String, V2TIMConversation> entry = iterator.next();
-                    unreadConversationIDList.add(entry.getKey());
-                }
-
-                V2TIMManager.getConversationManager().markConversation(unreadConversationIDList,
-                        V2TIMConversation.V2TIM_CONVERSATION_MARK_TYPE_UNREAD,
-                        false,
-                        new V2TIMValueCallback<List<V2TIMConversationOperationResult>>() {
-                    @Override
-                    public void onSuccess(List<V2TIMConversationOperationResult> v2TIMConversationOperationResults) {
-                        for (V2TIMConversationOperationResult result : v2TIMConversationOperationResults) {
-                            if (result.getResultCode() == BaseConstants.ERR_SUCC) {
-                                V2TIMConversation v2TIMConversation = markUnreadMap.get(result.getConversationID());
-                                if (!v2TIMConversation.getMarkList().contains(V2TIMConversation.V2TIM_CONVERSATION_MARK_TYPE_HIDE)) {
-                                    markUnreadMap.remove(result.getConversationID());
-                                }
-                            }
-                        }
-                    }
-
-                    @Override
-                    public void onError(int code, String desc) {
-                        Log.e(TAG, "triggerClearAllUnreadMessage->markConversation error:" + code + ", desc:" + ErrorMessageConverter.convertIMError(code, desc));
-                    }
-                });
-            }
-
-            @Override
-            public void onError(int code, String desc) {
-                Log.e(TAG, "triggerClearAllUnreadMessage->getMarkUnreadConversationList error:" + code + ", desc:" + ErrorMessageConverter.convertIMError(code, desc));
-            }
-        });
-    }
-
-    private void getMarkUnreadConversationList(V2TIMConversationListFilter filter, long nextSeq, int count, boolean fromStart, V2TIMValueCallback<HashMap<String, V2TIMConversation>> callback) {
-        if (fromStart) {
-            markUnreadMap.clear();
-        }
-        V2TIMManager.getConversationManager().getConversationListByFilter(filter, nextSeq, count, new V2TIMValueCallback<V2TIMConversationResult>() {
-            @Override
-            public void onSuccess(V2TIMConversationResult v2TIMConversationResult) {
-                List<V2TIMConversation> conversationList = v2TIMConversationResult.getConversationList();
-                for (V2TIMConversation conversation : conversationList) {
-                    markUnreadMap.put(conversation.getConversationID(), conversation);
-                }
-
-                if (!v2TIMConversationResult.isFinished()) {
-                    getMarkUnreadConversationList(filter, v2TIMConversationResult.getNextSeq(), count, false, callback);
-                } else {
-                    if (callback != null) {
-                        callback.onSuccess(markUnreadMap);
-                    }
-                }
-            }
-
-            @Override
-            public void onError(int code, String desc) {
-                Log.e(TAG, "getMarkUnreadConversationList error:" + code + ", desc:" + ErrorMessageConverter.convertIMError(code, desc));
-            }
-        });
-    }
-
-
-    public void tabClick(View view) {
-        resetMenuState();
-        switch (view.getId()) {
-            case R.id.conversation_btn_group:
-                mainViewPager.setCurrentItem(0, false);
-                mConversationBtnText.setTextColor(getResources().getColor(R.color.demo_main_tab_text_selected_color_light));
-                mConversationBtnIcon.setBackground(getResources().getDrawable(R.drawable.demo_overseas_main_tab_conversation_selected));
-                break;
-            case R.id.contact_btn_group:
-                mainViewPager.setCurrentItem(1, false);
-                mContactBtnText.setTextColor(getResources().getColor(R.color.demo_main_tab_text_selected_color_light));
-                mContactBtnIcon.setBackground(getResources().getDrawable(R.drawable.demo_overseas_main_tab_contact_selected_bg));
-                break;
-            case R.id.myself_btn_group:
-                mainViewPager.setCurrentItem(2, false);
-                mProfileSelfBtnText.setTextColor(getResources().getColor(R.color.demo_main_tab_text_selected_color_light));
-                mProfileSelfBtnIcon.setBackground(getResources().getDrawable(R.drawable.demo_overseas_main_tab_settings_selected_bg));
-                break;
-            default:
-                break;
-        }
-    }
-
-    private void resetMenuState() {
-        mConversationBtnText.setTextColor(getResources().getColor(com.tencent.qcloud.tuicore.R.color.core_light_bg_secondary_text_color_light));
-        mConversationBtnIcon.setBackground(getResources().getDrawable(R.drawable.demo_overseas_main_tab_conversation_normal));
-        mContactBtnText.setTextColor(getResources().getColor(com.tencent.qcloud.tuicore.R.color.core_light_bg_secondary_text_color_light));
-        mContactBtnIcon.setBackground(getResources().getDrawable(R.drawable.demo_overseas_main_tab_contact_normal_bg));
-        mProfileSelfBtnText.setTextColor(getResources().getColor(com.tencent.qcloud.tuicore.R.color.core_light_bg_secondary_text_color_light));
-        mProfileSelfBtnIcon.setBackground(getResources().getDrawable(R.drawable.demo_overseas_main_tab_settings_normal_bg));
-    }
-
-    private final V2TIMFriendshipListener friendshipListener = new V2TIMFriendshipListener() {
-        @Override
-        public void onFriendApplicationListAdded(List<V2TIMFriendApplication> applicationList) {
-            refreshFriendApplicationUnreadCount();
-        }
-
-        @Override
-        public void onFriendApplicationListDeleted(List<String> userIDList) {
-            refreshFriendApplicationUnreadCount();
-        }
-
-        @Override
-        public void onFriendApplicationListRead() {
-            refreshFriendApplicationUnreadCount();
-        }
-    };
-
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        if (keyCode == KeyEvent.KEYCODE_BACK) {
-            finish();
-        }
-        return super.onKeyDown(keyCode, event);
-    }
-
-    @Override
-    public void finish() {
-        super.finish();
-    }
-
-    @Override
-    protected void onStart() {
-        Log.i(TAG, "onStart");
-        super.onStart();
-    }
-
-    @Override
-    protected void onResume() {
-        Log.i(TAG, "onResume");
-        super.onResume();
-        registerUnreadListener();
-        handleOfflinePush();
-    }
-
-    private void handleOfflinePush() {
-        Intent intent = getIntent();
-        if (intent == null) {
-            Log.d(TAG, "handleOfflinePush intent is null");
-            return;
-        }
-
-//        if (OfflinePushConfigs.getOfflinePushConfigs().getClickNotificationCallbackMode() == OfflinePushConfigs.CLICK_NOTIFICATION_CALLBACK_INTENT) {
-//            TUIUtils.handleOfflinePush(intent, new HandleOfflinePushCallBack() {
-//                @Override
-//                public void onHandleOfflinePush(boolean hasLogged) {
-//                    if (hasLogged) {
-//                        setIntent(null);
-//                    } else {
-//                        finish();
-//                    }
-//                }
-//            });
-//        } else {
-//            String ext = intent.getStringExtra(TUIConstants.TUIOfflinePush.NOTIFICATION_EXT_KEY);
-//            TUIUtils.handleOfflinePush(ext, new HandleOfflinePushCallBack() {
-//                @Override
-//                public void onHandleOfflinePush(boolean hasLogged) {
-//                    if (hasLogged) {
-//                        setIntent(null);
-//                    } else {
-//                        finish();
-//                    }
-//                }
-//            });
-//        }
-    }
-
-
-    private void registerUnreadListener() {
-        V2TIMManager.getFriendshipManager().addFriendListener(friendshipListener);
-        refreshFriendApplicationUnreadCount();
-    }
-
-    private void refreshFriendApplicationUnreadCount() {
-        V2TIMManager.getFriendshipManager().getFriendApplicationList(new V2TIMValueCallback<V2TIMFriendApplicationResult>() {
-            @Override
-            public void onSuccess(V2TIMFriendApplicationResult v2TIMFriendApplicationResult) {
-                runOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        int unreadCount = v2TIMFriendApplicationResult.getUnreadCount();
-                        if (unreadCount > 0) {
-                            mNewFriendUnread.setVisibility(View.VISIBLE);
-                        } else {
-                            mNewFriendUnread.setVisibility(View.GONE);
-                        }
-                        String unreadStr = "" + unreadCount;
-                        if (unreadCount > 100) {
-                            unreadStr = "99+";
-                        }
-                        mNewFriendUnread.setText(unreadStr);
-                    }
-                });
-            }
-
-            @Override
-            public void onError(int code, String desc) {
-
-            }
-        });
-    }
-
-    @Override
-    protected void onPause() {
-        Log.i(TAG, "onPause");
-        super.onPause();
-        V2TIMManager.getFriendshipManager().removeFriendListener(friendshipListener);
-    }
-
-    @Override
-    protected void onStop() {
-        Log.i(TAG, "onStop");
-        super.onStop();
-    }
-
-    @Override
-    protected void onDestroy() {
-        Log.i(TAG, "onDestroy");
-        super.onDestroy();
-
-        if (unreadCountReceiver != null) {
-            LocalBroadcastManager.getInstance(this).unregisterReceiver(unreadCountReceiver);
-            unreadCountReceiver = null;
-        }
-    }
-
-    public static void finishMainActivity() {
-        if (instance != null && instance.get() != null) {
-            instance.get().finish();
-        }
-    }
-
-}

app/src/main/java/com/xjjk/healthyclients/retrofit/UrlConfig.kt

@@ -5,16 +5,16 @@ import com.xjjk.healthyclients.utils.UrlH5RouteUtils
 import okhttp3.HttpUrl.Companion.toHttpUrl
 
 object UrlConfig {
-    private const val DEBUG_DEFAULT_IP_ADDRESS_REMOTE = "http://192.168.1.98/"     // 开发环境
-//    private const val DEBUG_DEFAULT_IP_ADDRESS_REMOTE = "http://cqyt.dev.yg.dt.io/"     // 开发环境
-//    private const val TEST_DEFAULT_IP_ADDRESS_REMOTE = "https://starry.test.icdat.cn/"   // 测试环境
-    private const val PRODUCT_DEFAULT_IP_ADDRESS_REMOTE = "https://xjgateway.mcrm.vip:8888"
+//    private const val DEBUG_DEFAULT_IP_ADDRESS_REMOTE = "http://192.168.1.98/"     // 开发环境
+    private const val DEBUG_DEFAULT_IP_ADDRESS_REMOTE = "http://cqyt.dev.yg.dt.io/"     // 开发环境
+    private const val TEST_DEFAULT_IP_ADDRESS_REMOTE = "https://xjgateway.mcrm.vip:8888"   // 测试环境
+    private const val PRODUCT_DEFAULT_IP_ADDRESS_REMOTE = ""
 
-//    private const val DEBUG_H5_ADDRESS_REMOTE = "http://cms.dev.yg.dt.io"     // 开发环境
-//    private const val TEST_H5_ADDRESS_REMOTE = "https://starry.out.icdat.cn"     // 测试环境
-    private const val PRODUCT_H5_ADDRESS_REMOTE = "https://xjconsole.mcrm.vip:8888"
+    private const val DEBUG_H5_ADDRESS_REMOTE = "http://cms.dev.yg.dt.io"     // 开发环境
+    private const val TEST_H5_ADDRESS_REMOTE = "https://xjconsole.mcrm.vip:8888"     // 测试环境
+    private const val PRODUCT_H5_ADDRESS_REMOTE = ""
 
-    val baseUrlType: BaseUrlType = BaseUrlType.PRODUCT
+    val baseUrlType: BaseUrlType = BaseUrlType.TEST
 
 
     var testDeviceList = mutableListOf("7e8e7e49a26340b1","bb2d17cc138d109f")//测试设备列表 荣耀 oppo vivo
@@ -23,7 +23,7 @@ object UrlConfig {
 
     enum class BaseUrlType(val type: Int) {
         DEBUG(1),
-//        TEST(2),
+        TEST(2),
         PRODUCT(3)
     }
 
@@ -33,9 +33,9 @@ object UrlConfig {
                 DEBUG_DEFAULT_IP_ADDRESS_REMOTE
             }
 //
-//            BaseUrlType.TEST -> {
-//                TEST_DEFAULT_IP_ADDRESS_REMOTE
-//            }
+            BaseUrlType.TEST -> {
+                TEST_DEFAULT_IP_ADDRESS_REMOTE
+            }
 
             BaseUrlType.PRODUCT -> {
                 PRODUCT_DEFAULT_IP_ADDRESS_REMOTE
@@ -45,12 +45,12 @@ object UrlConfig {
     fun getH5BaseUrl(baseUrlType: BaseUrlType = BaseUrlType.PRODUCT): String {
         return when (baseUrlType) {
             BaseUrlType.DEBUG -> {
-                PRODUCT_H5_ADDRESS_REMOTE
+                DEBUG_H5_ADDRESS_REMOTE
             }
 //
-//            BaseUrlType.TEST -> {
-//                TEST_H5_ADDRESS_REMOTE
-//            }
+            BaseUrlType.TEST -> {
+                TEST_H5_ADDRESS_REMOTE
+            }
 
             BaseUrlType.PRODUCT -> {
                 PRODUCT_H5_ADDRESS_REMOTE

app/src/main/java/com/xjjk/healthyclients/superfuntion/StartActivityManager.kt

@@ -420,11 +420,11 @@ fun startAppointmentWaitAffirmActivity(
 /**
  * 专家主页
  */
-fun startDoctorHomepageActivity(context: Context, doctorId: String = "") {
-    val bundle = Bundle()
-    bundle.putString("doctorId", doctorId)
-    startActivity(context, bundle = bundle, targetClass = DoctorHomepageActivity::class.java)
-}
+//fun startDoctorHomepageActivity(context: Context, doctorId: String = "") {
+//    val bundle = Bundle()
+//    bundle.putString("doctorId", doctorId)
+//    startActivity(context, bundle = bundle, targetClass = DoctorHomepageActivity::class.java)
+//}
 
 /**
  * 咨询须知 type 1 图文 0音视频

app/src/main/java/com/xjjk/healthyclients/ui/activity/EmergencyContactActivity.kt

@@ -65,7 +65,10 @@ class EmergencyContactActivity :
                     if (it.isNullOrEmpty()) {
                         return@collectLatest
                     }
-                    relationPicker.setData(it)
+                    val filter = it.filter {
+                        !it.text.equals("本人")
+                    }
+                    relationPicker.setData(filter)
                     if (mBean == null) {
                         setRelationText(it[0])
                     } else {

app/src/main/java/com/xjjk/healthyclients/ui/activity/emergency/adapter/EmergencySeekDoctorAdapter.kt

@@ -18,15 +18,15 @@ class EmergencySeekDoctorAdapter(var mContext: Context) : BaseQuickAdapter<initU
         holder?.getView<TextView>(R.id.item_emergency_seek_doctor_time)?.let{
             it.text="求救时间：${bean?.createTime}"
         }
-        holder?.getView<TextView>(R.id.item_emergency_seek_doctor_hospital)?.let{
-            var content="${bean?.sendOrderHospital}"
-            if (content.isNotEmpty()&&bean?.stationBusiness_dictText!!.isNotEmpty()) {
-                content="$content - ${bean?.stationBusiness_dictText}"
-            }else if(bean?.stationBusiness_dictText!!.isNotEmpty()){
-                content="${bean?.stationBusiness_dictText}"
-            }
-            it.text="应急医院：${content}"
-        }
+//        holder?.getView<TextView>(R.id.item_emergency_seek_doctor_hospital)?.let{
+//            var content="${bean?.sendOrderHospital}"
+//            if (content.isNotEmpty()&&bean?.stationBusiness_dictText!!.isNotEmpty()) {
+//                content="$content - ${bean?.stationBusiness_dictText}"
+//            }else if(bean?.stationBusiness_dictText!!.isNotEmpty()){
+//                content="${bean?.stationBusiness_dictText}"
+//            }
+//            it.text="应急医院：${content}"
+//        }
         holder?.getView<TextView>(R.id.item_emergency_seek_doctor_state)?.let{
             it.text="${bean?.orderStatus_dictText}"
         }

app/src/main/java/com/xjjk/healthyclients/ui/activity/guidance/DoctorHomepageActivity.kt

@@ -162,7 +162,7 @@ class DoctorHomepageActivity :
                 if (doctorStatus!="3") {
                     if (audioStatus=="1"){
                         mType="0"
-                        mViewModel.selectUserNotice("2")
+                        mViewModel.selectUserNotice("0")
                     }
                 }
             }

app/src/main/java/com/xjjk/healthyclients/ui/activity/guidance/GuidanceNoticeActivity.kt

@@ -22,7 +22,7 @@ import kotlinx.coroutines.launch
 class GuidanceNoticeActivity : BaseVMBActivity<GuidanceNoticeViewModel, ActivityGuidanceNoticeBinding>(R.layout.activity_guidance_notice){
 
 
-    var type=3;//7天0  1个月1  以后不再 3
+    var type=2;//7天0  1个月1  以后不再 2
     var id=""
     var doctorId: String? = null
     var mPageType: String? = null// 1 图文 0音视频
@@ -88,7 +88,7 @@ class GuidanceNoticeActivity : BaseVMBActivity<GuidanceNoticeViewModel, Activity
                 dialogConfirmNoRemindIv.setImageResource(R.drawable.ic_marital_state_no_select)
             }
             dialogConfirmNoRemindLl.setOnClickListener {
-                type=3
+                type=2
                 dialogConfirmNoRemindIv.setImageResource(R.drawable.ic_marital_state_select)
                 dialogConfirm7DayNoRemindIv.setImageResource(R.drawable.ic_marital_state_no_select)
                 dialogConfirm1MonthNoRemindIv.setImageResource(R.drawable.ic_marital_state_no_select)

app/src/main/java/com/xjjk/healthyclients/ui/activity/guidance/adapter/DiseaseAdapter.kt

@@ -1,27 +0,0 @@
-package com.xjjk.healthyclients.ui.activity.guidance.adapter
-
-import android.content.Context
-import android.widget.TextView
-import com.sw.healthyclients.bean.guidance.DiseaseBean
-import com.xjjk.healthyclients.R
-import com.xjjk.healthyclients.adapter.common.CommonAdapter
-import com.xjjk.healthyclients.adapter.common.ViewHolder
-
-class DiseaseAdapter(
-    var mContext: Context?,
-    var layoutId: Int,
-    var datas: ArrayList<DiseaseBean>?,
-    var method: () -> Unit
-) : CommonAdapter<DiseaseBean>(mContext, layoutId, datas) {
-    override fun convert(holder: ViewHolder?, bean: DiseaseBean?, position: Int) {
-        bean?.let{
-            var doctorHint=""
-//            if (it.doctorNum?.isNotEmpty() == true) {
-//                doctorHint="(有${it.doctorNum}名专家)"
-//            }
-            holder?.getView<TextView>(R.id.item_recycler_seek_doctor_disease_child_name)?.setText(it.name)
-            holder?.getView<TextView>(R.id.item_recycler_seek_doctor_disease_child_hint)?.setText(doctorHint)
-        }
-    }
-
-}

app/src/main/java/com/xjjk/healthyclients/ui/activity/guidance/adapter/FilterSearchDepartment2Adapter.kt

@@ -1,26 +0,0 @@
-package com.xjjk.healthyclients.ui.activity.guidance.adapter
-
-import android.content.Context
-import android.widget.LinearLayout
-import android.widget.TextView
-import com.xjjk.healthyclients.R
-import com.xjjk.healthyclients.adapter.common.CommonAdapter
-import com.xjjk.healthyclients.adapter.common.ViewHolder
-import com.xjjk.healthyclients.bean.guidance.DepartListBean
-
-
-class FilterSearchDepartment2Adapter(var mContext: Context, var layoutId: Int, var datas: ArrayList<DepartListBean>?) : CommonAdapter<DepartListBean>(mContext,layoutId,datas){
-    override fun convert(holder: ViewHolder?, bean: DepartListBean?, position: Int) {
-        holder?.getView<TextView>(R.id.item_key)?.let{
-            it.text=bean?.departmentName
-        }
-        holder?.getView<LinearLayout>(R.id.item_department_root)?.let{
-            if(bean?.isSelect == true){
-                it.background=mContext.resources.getDrawable(R.color.white)
-            }else{
-                it.background=mContext.resources.getDrawable(R.color.service_menu_bg)
-            }
-        }
-
-    }
-}

app/src/main/java/com/xjjk/healthyclients/ui/activity/guidance/adapter/SeekDoctorHospitalAdapter.kt

@@ -1,113 +0,0 @@
-package com.xjjk.healthyclients.ui.activity.guidance.adapter
-
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import android.view.View
-import android.widget.ImageView
-import android.widget.TextView
-import com.amap.api.maps.AMapUtils
-import com.amap.api.maps.model.LatLng
-import com.xjjk.healthyclients.R
-import com.xjjk.healthyclients.adapter.common.CommonAdapter
-import com.xjjk.healthyclients.adapter.common.ViewHolder
-import com.xjjk.healthyclients.bean.guidance.HospitalchildBean
-import com.xjjk.healthyclients.superfuntion.loadRoundedImage
-import com.xjjk.healthyclients.utils.ConstantUtils
-import com.xjjk.healthyclients.utils.MapUtils
-import com.xjjk.healthyclients.view.WindowDialogView
-
-
-class SeekDoctorHospitalAdapter(var mContext: Context, var layoutId: Int, var datas: ArrayList<HospitalchildBean>?) : CommonAdapter<HospitalchildBean>(mContext,layoutId,datas){
-    override fun convert(holder: ViewHolder?, bean: HospitalchildBean?, position: Int) {
-        holder?.getView<ImageView>(R.id.item_recycler_seek_doctor_hospital_img)?.let{
-            it.loadRoundedImage(bean?.img,5f, R.drawable.ic_hospital_default)
-        }
-        holder?.getView<TextView>(R.id.item_recycler_seek_doctor_hospital_tag)?.let{
-            //医院等级
-            it.text=bean?.tag
-        }
-        holder?.getView<TextView>(R.id.item_recycler_seek_doctor_hospital_name)?.let{
-            //医院名称
-            it.text=bean?.name
-        }
-        holder?.getView<TextView>(R.id.item_recycler_seek_doctor_hospital_department)?.let{
-            //医院重点科室
-            if (bean?.department?.isNotEmpty() == true) {
-                it.text="重点科室: ${bean?.department}"
-            }else{
-                it.visibility=View.GONE
-            }
-        }
-        holder?.getView<TextView>(R.id.item_recycler_seek_doctor_hospital_navigation)?.let{
-            it.setOnClickListener {
-                if (bean!=null) {
-                    goNavigation(bean.lat, bean.lon,mContext)
-                }
-            }
-        }
-        holder?.getView<TextView>(R.id.item_recycler_seek_doctor_hospital_distance)?.let{
-            //距离
-            if (bean != null) {
-                if(ConstantUtils.mCurrentLat==0.0|| ConstantUtils.mCurrentLon==0.0){
-                    it.text = "-- km"
-                }else{
-                    var startLatLng = LatLng(ConstantUtils.mCurrentLat, ConstantUtils.mCurrentLon)
-                    var endLatLng = LatLng(bean.lat, bean.lon)
-                    var value = AMapUtils.calculateLineDistance(startLatLng, endLatLng) / 1000
-                    it.text = "${String.format("%.2f",value)} km"
-                }
-                it.visibility=View.VISIBLE
-            }else{
-                it.visibility=View.INVISIBLE
-            }
-        }
-        holder?.getView<TextView>(R.id.item_recycler_seek_doctor_hospital_address)?.let{
-            //地址
-            if (bean != null) {
-                var address=bean?.address
-                it.text="${address}"
-            }
-        }
-    }
-
-    fun goNavigation(mLat: Double, mLon: Double, context: Context) {
-        WindowDialogView.WindowDialogView(context, object :
-            WindowDialogView.windowDialogListener {
-            override fun onSelectText(position: Int, str: String?) {
-                when (str) {
-                    "百度地图" -> {
-//                                showToastTxt = "手机未安装百度地图APP"
-                        val intent = Intent()
-                        val destination = MapUtils.gaoDeToLatLng(mLat, mLon);//转换坐标系
-                        //导航界面
-                        intent.setData(Uri.parse("baidumap://map/direction?destination=latlng:${destination.latitude},${destination.longitude}|name:目的地&coord_type=bd09ll&mode=driving"))
-                        //由于没获取到目的地地址，所以跳到目的地界面
-                        //intent.setData(Uri.parse("baidumap://map/geocoder?location=${item?.la},${item?.lg}&src=andr.baidu.openAPIdemo"))
-                        context?.startActivity(intent)
-
-                    }
-
-                    "高德地图" -> {
-//                                showToastTxt = "手机未安装高德地图APP"
-                        val intent = Intent()
-                        intent.setPackage("com.autonavi.minimap")
-                        intent.setAction(Intent.ACTION_VIEW)
-                        intent.addCategory(Intent.CATEGORY_DEFAULT)
-                        val destination = MapUtils.gaoDeToLatLng(mLat, mLon);//转换坐标系
-                        intent.setData(
-                            Uri.parse(
-                                "androidamap://route?sourceApplication=${context?.getString(R.string.app_name)}&" +
-                                        "dlat=" + destination.latitude + "&dlon=" + destination.longitude + "&dname=目的地" + "&dev=0&t=0"
-                            )
-                        )
-                        context?.startActivity(intent)
-                    }
-                }
-            }
-
-            override fun onClose() {
-            }
-        }, MapUtils.isInstalled(context))
-    }
-}

app/src/main/java/com/xjjk/healthyclients/ui/activity/guidance/adapter/SeekDoctorSick3Adapter.kt

@@ -1,18 +0,0 @@
-package com.xjjk.healthyclients.ui.activity.guidance.adapter
-
-import android.content.Context
-import android.widget.TextView
-import com.xjjk.healthyclients.R
-import com.xjjk.healthyclients.adapter.common.CommonAdapter
-import com.xjjk.healthyclients.adapter.common.ViewHolder
-import com.xjjk.healthyclients.bean.guidance.SickListBean
-
-
-class SeekDoctorSick3Adapter(var mContext: Context, var layoutId: Int, var datas: ArrayList<SickListBean>?) : CommonAdapter<SickListBean>(mContext,layoutId,datas){
-    override fun convert(holder: ViewHolder?, bean: SickListBean?, position: Int) {
-        holder?.getView<TextView>(R.id.item_key)?.let{
-            //医院名称
-            it.text=bean?.sicksName
-        }
-    }
-}

app/src/main/java/com/xjjk/healthyclients/ui/viewmodel/MainViewModel.kt

@@ -51,7 +51,7 @@ class MainViewModel : BaseViewModel() {
         launch(
             {
                 handleRequest(
-                    CommonRepository.selectUserNotice("2"),
+                    CommonRepository.selectUserNotice("0"),
                     successBlock = {
                         it.result?.let { result ->
                             noticeBean.emit(result)

app/src/main/java/com/xjjk/healthyclients/view/FuntionBlurbDialog.kt

@@ -1,101 +0,0 @@
-package com.xjjk.healthyclients.view
-
-import android.app.AlertDialog
-import android.content.Context
-import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
-import android.os.Build
-import android.os.Bundle
-import android.view.Gravity
-import android.view.LayoutInflater
-import android.view.View
-import android.widget.LinearLayout
-import androidx.databinding.DataBindingUtil
-import com.xjjk.healthyclients.R
-import com.xjjk.healthyclients.databinding.DialogFuntionBlurbViewBinding
-import com.xjjk.healthyclients.superfuntion.toHtml
-
-/**
- * 首页 功能简介弹窗
- */
-open class FuntionBlurbDialog constructor(context: Context
-) : AlertDialog(context) {
-    lateinit var mOnAffirmClickListener: OnAffirmClickListener
-    protected lateinit var binding: DialogFuntionBlurbViewBinding
-    init {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            create()
-        } else {
-            onCreate(null)
-        }
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = DataBindingUtil.inflate(LayoutInflater.from(context),
-            R.layout.dialog_funtion_blurb_view, null, false)
-        setContentView(binding.root)
-        window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))//设置dialog背景透明
-        window?.setLayout(context.resources.displayMetrics.widthPixels * 28/30, LinearLayout.LayoutParams.WRAP_CONTENT);//设置对话框大小
-        binding.dialogConfirm7DayNoRemindLl.setOnClickListener{
-            binding.dialogConfirm7DayNoRemindIv.setImageResource(R.drawable.ic_marital_state_select)
-            mOnAffirmClickListener?.onAffirmClick(0,this@FuntionBlurbDialog)
-//            this.cancel()
-        }
-        binding.dialogConfirm1MonthNoRemindLl.setOnClickListener{
-            binding.dialogConfirm1MonthNoRemindIv.setImageResource(R.drawable.ic_marital_state_select)
-            mOnAffirmClickListener?.onAffirmClick(1,this@FuntionBlurbDialog)
-//            this.cancel()
-        }
-        binding.dialogConfirm6MonthNoRemindLl.setOnClickListener{
-            mOnAffirmClickListener?.onAffirmClick(2,this@FuntionBlurbDialog)
-            binding.dialogConfirm6MonthNoRemindIv.setImageResource(R.drawable.ic_marital_state_select)
-//            this.cancel()
-        }
-        binding.dialogConfirmNoRemindLl.setOnClickListener{
-            mOnAffirmClickListener?.onAffirmClick(3,this@FuntionBlurbDialog)
-            binding.dialogConfirmNoRemindIv.setImageResource(R.drawable.ic_marital_state_select)
-//            this.cancel()
-        }
-        binding.dialogConfirmClose.setOnClickListener{
-//            mOnAffirmClickListener?.onAffirmClick(this@FuntionBlurbDialog)
-            this.cancel()
-        }
-//        binding.dialogConfirmCloseRoot.setOnClickListener{
-//            mOnAffirmClickListener?.onCancelClick(this@FuntionBlurbDialog)
-//            this.cancel()
-//        }
-//
-//        binding.dialogConfirmLlUnmarried.setOnClickListener {
-//            setMaritalState(0)
-//        }
-//
-//        binding.dialogConfirmLlMarried.setOnClickListener {
-//            setMaritalState(1)
-//        }
-        setCancelable(false)
-
-    }
-
-    fun setOnAffirmClickListener(onAffirmClickListener: OnAffirmClickListener): FuntionBlurbDialog{
-        this.mOnAffirmClickListener = onAffirmClickListener
-        return this
-    }
-    interface OnAffirmClickListener{
-        fun onAffirmClick(type:Int,viewDialog: FuntionBlurbDialog)
-    }
-
-    fun setContent(string: String){
-        if (binding!=null) {
-            binding.dialogContent.text=string.toHtml()
-        }
-    }
-
-    fun setTitle(string: String){
-        if (binding!=null) {
-            binding.dialogTitle.text=string
-        }
-    }
-
-
-}

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

@@ -7,268 +7,275 @@
     </data>
 
     <LinearLayout
-        android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-        <include layout="@layout/lay_title_bar"
-            app:title="@{@string/title_retrieve_password}"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <include
+            android:id="@+id/toolbar_lay"
+            layout="@layout/lay_title_bar"
             app:darkStyle="@{true}"
-            android:id="@+id/toolbar_lay"/>
-       <RelativeLayout
-           android:layout_width="match_parent"
-           android:layout_height="match_parent">
-           <LinearLayout
-               android:orientation="vertical"
-               android:layout_width="match_parent"
-               android:layout_height="wrap_content">
-               <LinearLayout
-                   android:id="@+id/ll_code_find"
-                   android:background="@color/white"
-                   android:orientation="vertical"
-                   android:layout_width="match_parent"
-                   android:layout_height="wrap_content">
-                   <LinearLayout
-                       android:orientation="horizontal"
-                       android:layout_width="match_parent"
-                       android:layout_height="@dimen/dp_60">
-                       <TextView
-                           android:layout_width="wrap_content"
-                           android:layout_height="wrap_content"
-                           android:text="手机号"
-                           android:textSize="@dimen/txt13"
-                           android:textColor="@color/text_black_66"
-                           android:layout_marginLeft="@dimen/dp_16"
-                           android:layout_gravity="center_vertical"
-                           />
+            app:title="@{@string/title_retrieve_password}" />
 
-                       <EditText
-                           android:id="@+id/retrieve_phone"
-                           android:inputType="number"
-                           android:longClickable="false"
-                           android:layout_width="@dimen/dp_160"
-                           android:layout_height="@dimen/dp_40"
-                           android:textColor="@color/text_black_66"
-                           android:textSize="@dimen/txt13"
-                           android:background="@null"
-                           android:layout_marginLeft="@dimen/dp_60"
-                           android:layout_gravity="center_vertical"
-                           android:hint="请输入与账户绑定的手机号"
-                           />
-                   </LinearLayout>
-                   <View
-                       android:layout_width="match_parent"
-                       android:layout_height="@dimen/dp_1"
-                       android:background="#E0E0E0"
-                       android:layout_marginLeft="@dimen/dp_14"
-                       android:layout_marginRight="@dimen/dp_14"
-                       />
-                   <RelativeLayout
-                       android:layout_width="match_parent"
-                       android:layout_height="@dimen/dp_60">
-                       <TextView
-                           android:id="@+id/retrieve_check_code_name"
-                           android:layout_width="wrap_content"
-                           android:layout_height="wrap_content"
-                           android:text="验证码"
-                           android:layout_centerVertical="true"
-                           android:textSize="@dimen/txt13"
-                           android:textColor="@color/text_black_66"
-                           android:layout_marginLeft="@dimen/dp_16"
-                           android:layout_gravity="center_vertical"
-                           />
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
 
-                       <EditText
-                           android:inputType="number"
-                           android:longClickable="false"
-                           android:layout_toRightOf="@+id/retrieve_check_code_name"
-                           android:id="@+id/retrieve_check_code"
-                           android:layout_width="@dimen/dp_100"
-                           android:layout_height="@dimen/dp_40"
-                           android:textColor="@color/text_black_66"
-                           android:textSize="@dimen/txt13"
-                           android:maxLength="6"
-                           android:layout_centerVertical="true"
-                           android:background="@null"
-                           android:layout_marginLeft="@dimen/dp_60"
-                           android:layout_gravity="center_vertical"
-                           android:hint="请输入验证码"
-                           />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
 
-                       <TextView
-                           android:id="@+id/retrieve_get_check_code"
-                           android:layout_alignParentRight="true"
-                           android:gravity="center_horizontal"
-                           android:layout_width="@dimen/dp_100"
-                           android:layout_height="wrap_content"
-                           android:layout_centerVertical="true"
-                           android:layout_marginRight="@dimen/dp_16"
-                           android:text="获取验证码"
-                           android:textSize="@dimen/txt12"
-                           android:layout_gravity="center_vertical|right"
-                           android:layout_marginLeft="@dimen/dp_60"
-                           android:background="@drawable/bg_blue_background_shap_radius4"
-                           android:paddingBottom="@dimen/dp_8"
-                           android:paddingTop="@dimen/dp_8"
-                           android:textColor="@color/white"
-                           />
-                   </RelativeLayout>
-               </LinearLayout>
-               <LinearLayout
-                   android:id="@+id/ll_info_find"
-                   android:background="@color/white"
-                   android:orientation="vertical"
-                   android:layout_width="match_parent"
-                   android:layout_height="wrap_content">
-                   <LinearLayout
-                       android:orientation="horizontal"
-                       android:layout_width="match_parent"
-                       android:layout_height="@dimen/dp_60">
-                       <TextView
-                           android:layout_width="wrap_content"
-                           android:layout_height="wrap_content"
-                           android:text="用户姓名"
-                           android:textSize="@dimen/txt13"
-                           android:textColor="@color/text_black_66"
-                           android:layout_marginLeft="@dimen/dp_16"
-                           android:layout_gravity="center_vertical"
-                           />
+                <LinearLayout
+                    android:id="@+id/ll_code_find"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/white"
+                    android:orientation="vertical">
 
-                       <EditText
-                           android:longClickable="false"
-                           android:id="@+id/tv_user_name"
-                           android:layout_width="@dimen/dp_160"
-                           android:layout_height="@dimen/dp_40"
-                           android:textColor="@color/text_black_66"
-                           android:textSize="@dimen/txt13"
-                           android:maxLines="1"
-                           android:singleLine="true"
-                           android:background="@null"
-                           android:layout_marginLeft="@dimen/dp_60"
-                           android:layout_gravity="center_vertical"
-                           android:hint="请输入姓名"
-                           />
-                   </LinearLayout>
-                   <View
-                       android:layout_width="match_parent"
-                       android:layout_height="@dimen/dp_1"
-                       android:background="#E0E0E0"
-                       android:layout_marginLeft="@dimen/dp_14"
-                       android:layout_marginRight="@dimen/dp_14"
-                       />
-                   <LinearLayout
-                       android:orientation="horizontal"
-                       android:layout_width="match_parent"
-                       android:layout_height="@dimen/dp_60">
-                       <TextView
-                           android:layout_width="wrap_content"
-                           android:layout_height="wrap_content"
-                           android:text="身份证号"
-                           android:textSize="@dimen/txt13"
-                           android:textColor="@color/text_black_66"
-                           android:layout_marginLeft="@dimen/dp_16"
-                           android:layout_gravity="center_vertical"
-                           />
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/dp_60"
+                        android:orientation="horizontal">
 
-                       <EditText
-                           android:longClickable="false"
-                           android:id="@+id/tv_user_id_card"
-                           android:layout_width="@dimen/dp_160"
-                           android:layout_height="@dimen/dp_40"
-                           android:textColor="@color/text_black_66"
-                           android:maxLines="1"
-                           android:singleLine="true"
-                           android:textSize="@dimen/txt13"
-                           android:background="@null"
-                           android:layout_marginLeft="@dimen/dp_60"
-                           android:layout_gravity="center_vertical"
-                           android:hint="请输入身份证号"
-                           android:maxLength="18"
-                           />
-                   </LinearLayout>
-                   <View
-                       android:layout_width="match_parent"
-                       android:layout_height="@dimen/dp_1"
-                       android:background="#E0E0E0"
-                       android:layout_marginLeft="@dimen/dp_14"
-                       android:layout_marginRight="@dimen/dp_14"
-                       />
-                   <LinearLayout
-                       android:orientation="horizontal"
-                       android:layout_width="match_parent"
-                       android:layout_height="@dimen/dp_60">
-                       <TextView
-                           android:layout_width="wrap_content"
-                           android:layout_height="wrap_content"
-                           android:text="手机号&#12288;"
-                           android:textSize="@dimen/txt13"
-                           android:textColor="@color/text_black_66"
-                           android:layout_marginLeft="@dimen/dp_16"
-                           android:layout_gravity="center_vertical"
-                           />
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginLeft="@dimen/dp_16"
+                            android:text="手机号"
+                            android:textColor="@color/text_black_66"
+                            android:textSize="@dimen/txt13" />
 
-                       <EditText
-                           android:id="@+id/tv_user_phone"
-                           android:inputType="number"
-                           android:longClickable="false"
-                           android:layout_width="@dimen/dp_160"
-                           android:layout_height="@dimen/dp_40"
-                           android:textColor="@color/text_black_66"
-                           android:textSize="@dimen/txt13"
-                           android:background="@null"
-                           android:layout_marginLeft="@dimen/dp_60"
-                           android:layout_gravity="center_vertical"
-                           android:hint="请输入手机号"
-                           android:maxLength="11"
-                           />
-                   </LinearLayout>
-                   <View
-                       android:layout_width="match_parent"
-                       android:layout_height="@dimen/dp_1"
-                       android:background="#E0E0E0"
-                       android:layout_marginLeft="@dimen/dp_14"
-                       android:layout_marginRight="@dimen/dp_14"
-                       />
-               </LinearLayout>
+                        <EditText
+                            android:id="@+id/retrieve_phone"
+                            android:layout_width="@dimen/dp_160"
+                            android:layout_height="@dimen/dp_40"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginLeft="@dimen/dp_60"
+                            android:background="@null"
+                            android:hint="请输入与账户绑定的手机号"
+                            android:inputType="number"
+                            android:longClickable="false"
+                            android:textColor="@color/text_black_66"
+                            android:textSize="@dimen/txt13" />
+                    </LinearLayout>
 
-               <TextView
-                   android:id="@+id/retrieve_confirm"
-                   android:layout_width="match_parent"
-                   android:layout_height="@dimen/dp_40"
-                   android:text="确定"
-                   android:textColor="@color/white"
-                   android:background="@drawable/bg_blue_background_shap"
-                   android:layout_marginLeft="@dimen/dp_50"
-                   android:layout_marginRight="@dimen/dp_50"
-                   android:gravity="center"
-                   android:layout_marginTop="@dimen/dp_60"
-                   />
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/dp_1"
+                        android:layout_marginLeft="@dimen/dp_14"
+                        android:layout_marginRight="@dimen/dp_14"
+                        android:background="#E0E0E0" />
 
-           </LinearLayout>
-           <RadioGroup
-               android:id="@+id/radioGroup"
-               android:visibility="gone"
-               android:layout_alignParentBottom="true"
-               android:layout_marginBottom="@dimen/dp_50"
-               android:layout_centerHorizontal="true"
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:orientation="horizontal">
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/dp_60">
 
-               <RadioButton
-                   android:id="@+id/btn_info_find"
-                   android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   android:text="用户信息找回"
-                   android:layout_marginRight="@dimen/dp_10"
-                   android:checked="true"/>
+                        <TextView
+                            android:id="@+id/retrieve_check_code_name"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginLeft="@dimen/dp_16"
+                            android:text="验证码"
+                            android:textColor="@color/text_black_66"
+                            android:textSize="@dimen/txt13" />
 
-               <RadioButton
-                   android:id="@+id/btn_code_find"
-                   android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   android:text="验证码找回"/>
-           </RadioGroup>
-       </RelativeLayout>
+                        <EditText
+                            android:id="@+id/retrieve_check_code"
+                            android:layout_width="@dimen/dp_100"
+                            android:layout_height="@dimen/dp_40"
+                            android:layout_centerVertical="true"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginLeft="@dimen/dp_60"
+                            android:layout_toRightOf="@+id/retrieve_check_code_name"
+                            android:background="@null"
+                            android:hint="请输入验证码"
+                            android:inputType="number"
+                            android:longClickable="false"
+                            android:maxLength="6"
+                            android:textColor="@color/text_black_66"
+                            android:textSize="@dimen/txt13" />
+
+                        <TextView
+                            android:id="@+id/retrieve_get_check_code"
+                            android:layout_width="@dimen/dp_100"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentRight="true"
+                            android:layout_centerVertical="true"
+                            android:layout_gravity="center_vertical|right"
+                            android:layout_marginLeft="@dimen/dp_60"
+                            android:layout_marginRight="@dimen/dp_16"
+                            android:background="@drawable/bg_blue_background_shap_radius4"
+                            android:gravity="center_horizontal"
+                            android:paddingTop="@dimen/dp_8"
+                            android:paddingBottom="@dimen/dp_8"
+                            android:text="获取验证码"
+                            android:textColor="@color/white"
+                            android:textSize="@dimen/txt12" />
+                    </RelativeLayout>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_info_find"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/white"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/dp_60"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginLeft="@dimen/dp_16"
+                            android:text="用户姓名"
+                            android:textColor="@color/text_black_66"
+                            android:textSize="@dimen/txt13" />
+
+                        <EditText
+                            android:id="@+id/tv_user_name"
+                            android:layout_width="@dimen/dp_160"
+                            android:layout_height="@dimen/dp_40"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginLeft="@dimen/dp_60"
+                            android:background="@null"
+                            android:hint="请输入姓名"
+                            android:longClickable="false"
+                            android:maxLines="1"
+                            android:singleLine="true"
+                            android:textColor="@color/text_black_66"
+                            android:textSize="@dimen/txt13" />
+                    </LinearLayout>
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/dp_1"
+                        android:layout_marginLeft="@dimen/dp_14"
+                        android:layout_marginRight="@dimen/dp_14"
+                        android:background="#E0E0E0" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/dp_60"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginLeft="@dimen/dp_16"
+                            android:text="身份证号"
+                            android:textColor="@color/text_black_66"
+                            android:textSize="@dimen/txt13" />
+
+                        <EditText
+                            android:id="@+id/tv_user_id_card"
+                            android:layout_width="@dimen/dp_160"
+                            android:layout_height="@dimen/dp_40"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginLeft="@dimen/dp_60"
+                            android:background="@null"
+                            android:digits="0123456789xX"
+                            android:hint="请输入身份证号"
+                            android:inputType="number"
+                            android:longClickable="false"
+                            android:maxLength="18"
+                            android:maxLines="1"
+                            android:singleLine="true"
+                            android:textColor="@color/text_black_66"
+                            android:textSize="@dimen/txt13" />
+                    </LinearLayout>
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/dp_1"
+                        android:layout_marginLeft="@dimen/dp_14"
+                        android:layout_marginRight="@dimen/dp_14"
+                        android:background="#E0E0E0" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/dp_60"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginLeft="@dimen/dp_16"
+                            android:text="手机号&#12288;"
+                            android:textColor="@color/text_black_66"
+                            android:textSize="@dimen/txt13" />
+
+                        <EditText
+                            android:id="@+id/tv_user_phone"
+                            android:layout_width="@dimen/dp_160"
+                            android:layout_height="@dimen/dp_40"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginLeft="@dimen/dp_60"
+                            android:background="@null"
+                            android:hint="请输入手机号"
+                            android:inputType="number"
+                            android:longClickable="false"
+                            android:maxLength="11"
+                            android:textColor="@color/text_black_66"
+                            android:textSize="@dimen/txt13" />
+                    </LinearLayout>
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/dp_1"
+                        android:layout_marginLeft="@dimen/dp_14"
+                        android:layout_marginRight="@dimen/dp_14"
+                        android:background="#E0E0E0" />
+                </LinearLayout>
+
+                <TextView
+                    android:id="@+id/retrieve_confirm"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_40"
+                    android:layout_marginLeft="@dimen/dp_50"
+                    android:layout_marginTop="@dimen/dp_60"
+                    android:layout_marginRight="@dimen/dp_50"
+                    android:background="@drawable/bg_blue_background_shap"
+                    android:gravity="center"
+                    android:text="确定"
+                    android:textColor="@color/white" />
+
+            </LinearLayout>
+
+            <RadioGroup
+                android:id="@+id/radioGroup"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:layout_centerHorizontal="true"
+                android:layout_marginBottom="@dimen/dp_50"
+                android:orientation="horizontal"
+                android:visibility="gone">
+
+                <RadioButton
+                    android:id="@+id/btn_info_find"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="@dimen/dp_10"
+                    android:checked="true"
+                    android:text="用户信息找回" />
+
+                <RadioButton
+                    android:id="@+id/btn_code_find"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="验证码找回" />
+            </RadioGroup>
+        </RelativeLayout>
 
     </LinearLayout>
 </layout>

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

@@ -121,12 +121,14 @@
                         android:layout_width="@dimen/dp_200"
                         android:gravity="right"
                         android:maxLength="18"
+                        android:inputType="number"
                         android:longClickable="false"
                         android:layout_height="wrap_content"
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
                         android:layout_marginRight="@dimen/dp_16"
                         android:hint="身份证号"
+                        android:digits="0123456789xX"
                         android:background="@null"
                         android:textColor="@color/text_black_66"
                         android:textSize="@dimen/txt13" />

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

@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <RelativeLayout
-        android:background="@color/transparent"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-        <LinearLayout
-            android:id="@+id/ll_root"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/dp_20"
-            android:layout_marginRight="@dimen/dp_20"
-            android:background="@drawable/rectangle_round_corner10_white"
-            android:orientation="vertical">
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <TextView
-                    android:id="@+id/dialog_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginTop="@dimen/dp_19"
-                    android:text="系统功能简介"
-                    android:textColor="@color/text_black_33"
-                    android:textSize="@dimen/txt14" />
-
-
-            </RelativeLayout>
-
-            <ScrollView
-                android:layout_marginTop="@dimen/dp_27"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_400">
-                <TextView
-                    android:id="@+id/dialog_content"
-                    android:layout_marginLeft="@dimen/dp_18"
-                    android:layout_marginRight="@dimen/dp_18"
-                    android:layout_marginBottom="@dimen/dp_27"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="1.数据文件管理
-首先对该地区的样本数据进行训练得出岩性的判别函数，其中的方法是利用Bayes判别理论。再输入不同井的数据，最后导入目录下自动生成该井的岩性层数据文件。其中样本训练数据是通过人工整合在一起的，从多口井中取出岩性特征比较明显的层段。
-1.数据文件管理1.数据文件管理
-首先对该地区的样本数据进行训练得出岩性的判别函数，其中的方法是利用Bayes判别理论。再输入不同井的数据，最后导入目录下自动生成该井的岩性层数据文件。其中样本训练数据是通过人工整合在一起的，从多口井中取出岩性特征比较明显的层段。
-1.数据文件管理1.数据文件管理
-首先对该地区的样本数据进行训练得出岩性的判别函数，其中的方法是利用Bayes判别理论。再输入不同井的数据，最后导入目录下自动生成该井的岩性层数据文件。其中样本训练数据是通过人工整合在一起的，从多口井中取出岩性特征比较明显的层段。
-1.数据文件管理1.数据文件管理
-首先对该地区的样本数据进行训练得出岩性的判别函数，其中的方法是利用Bayes判别理论。再输入不同井的数据，最后导入目录下自动生成该井的岩性层数据文件。其中样本训练数据是通过人工整合在一起的，从多口井中取出岩性特征比较明显的层段。
-1.数据文件管理
-首先对该地区的样本数据进行训练得出岩性的判别函数，其中的方法是利用Bayes判别理论。再输入不同井的数据，最后导入目录下自动生成该井的岩性层数据文件。其中样本训练数据是通过人工整合在一起的，从多口井中取出岩性特征比较明显的层段。
-1.数据文件管理
-首先对该地区的样本数据进行训练得出岩性的判别函数，其中的方法是利用Bayes判别理论。再输入不同井的数据，最后导入目录下自动生成该井的岩性层数据文件。其中样本训练数据是通过人工整合在一起的，从多口井中取出岩性特征比较明显的层段。
-"
-                    />
-            </ScrollView>
-
-
-            <LinearLayout
-                android:layout_marginTop="@dimen/dp_20"
-                android:layout_marginBottom="@dimen/dp_20"
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-                <RelativeLayout
-                    android:layout_marginBottom="@dimen/dp_13"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <LinearLayout
-                        android:id="@+id/dialog_confirm_7_day_no_remind_ll"
-                        android:orientation="horizontal"
-                        android:layout_marginLeft="@dimen/dp_18"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content">
-                        <ImageView
-                            android:id="@+id/dialog_confirm_7_day_no_remind_iv"
-                            android:layout_width="@dimen/dp_14"
-                            android:layout_height="@dimen/dp_14"
-                            android:layout_gravity="center_vertical"
-                            android:src="@drawable/ic_marital_state_no_select"
-                            />
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="7日内不再提醒"
-                            android:textColor="@color/text_black_33"
-                            android:textSize="@dimen/txt13"
-                            android:layout_marginLeft="@dimen/dp_2"
-                            />
-                    </LinearLayout>
-                    <LinearLayout
-                        android:id="@+id/dialog_confirm_1_month_no_remind_ll"
-                        android:orientation="horizontal"
-                        android:layout_alignParentRight="true"
-                        android:layout_marginRight="@dimen/dp_18"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content">
-                        <ImageView
-                            android:id="@+id/dialog_confirm_1_month_no_remind_iv"
-                            android:layout_width="@dimen/dp_14"
-                            android:layout_height="@dimen/dp_14"
-                            android:layout_gravity="center_vertical"
-                            android:src="@drawable/ic_marital_state_no_select"
-                            />
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="1个月内不再提醒"
-                            android:textColor="@color/text_black_33"
-                            android:textSize="@dimen/txt13"
-                            android:layout_marginLeft="@dimen/dp_2"
-                            />
-                    </LinearLayout>
-                </RelativeLayout>
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <LinearLayout
-                        android:id="@+id/dialog_confirm_6_month_no_remind_ll"
-                        android:orientation="horizontal"
-                        android:layout_marginLeft="@dimen/dp_18"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content">
-                        <ImageView
-                            android:id="@+id/dialog_confirm_6_month_no_remind_iv"
-                            android:layout_width="@dimen/dp_14"
-                            android:layout_height="@dimen/dp_14"
-                            android:layout_gravity="center_vertical"
-                            android:src="@drawable/ic_marital_state_no_select"
-                            />
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="6个月不再提醒"
-                            android:textColor="@color/text_black_33"
-                            android:textSize="@dimen/txt13"
-                            android:layout_marginLeft="@dimen/dp_2"
-                            />
-                    </LinearLayout>
-                    <LinearLayout
-                        android:id="@+id/dialog_confirm_no_remind_ll"
-                        android:orientation="horizontal"
-                        android:layout_alignParentRight="true"
-                        android:layout_marginRight="@dimen/dp_19"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content">
-                        <ImageView
-                            android:id="@+id/dialog_confirm_no_remind_iv"
-                            android:layout_width="@dimen/dp_14"
-                            android:layout_height="@dimen/dp_14"
-                            android:layout_gravity="center_vertical"
-                            android:src="@drawable/ic_marital_state_no_select"
-                            />
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="以后不再提醒     "
-                            android:textColor="@color/text_black_33"
-                            android:textSize="@dimen/txt13"
-                            android:layout_marginLeft="@dimen/dp_2"
-                            />
-                    </LinearLayout>
-                </RelativeLayout>
-            </LinearLayout>
-        </LinearLayout>
-        
-        <ImageView
-            android:id="@+id/dialog_confirm_close"
-            android:layout_width="@dimen/dp_24"
-            android:layout_height="@dimen/dp_24"
-            android:layout_below="@+id/ll_root"
-            android:layout_marginTop="@dimen/dp_29"
-            android:layout_centerHorizontal="true"
-            android:src="@drawable/ic_down_close"
-            />
-    </RelativeLayout>
-
-</layout>

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

@@ -21,11 +21,6 @@
                     android:layout_height="match_parent"
                     android:orientation="vertical">
 
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="@dimen/dp_44"
-                        android:background="#14BEBE" />
-
                     <RelativeLayout
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/dp_330">
@@ -37,15 +32,6 @@
                             android:scaleType="fitXY"
                             android:src="@drawable/ic_guidance_head_bg"/>
 
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_centerHorizontal="true"
-                            android:text="健康咨询"
-                            android:textColor="@color/white"
-                            android:textSize="@dimen/txt18"
-                            android:textStyle="bold" />
-
                         <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"

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

@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:minHeight="@dimen/dp_120"
-    android:paddingLeft="@dimen/dp_14"
-    android:paddingRight="@dimen/dp_14"
-    android:background="@drawable/bg_card"
-    android:layout_height="wrap_content">
-
-    <TextView
-        android:id="@+id/item_big_disese_hospital_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="预约医院："
-        android:textSize="@dimen/txt14"
-        android:textColor="@color/text_black_33"
-        android:layout_marginTop="@dimen/dp_15"
-        android:textStyle="bold"
-        />
-
-    <TextView
-        android:id="@+id/item_big_disese_hospital_time"
-        android:layout_alignBaseline="@+id/item_big_disese_hospital_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text=""
-        android:textSize="@dimen/txt13"
-        android:textColor="@color/text_black_99"
-        android:layout_alignParentRight="true"
-        />
-
-    <TextView
-        android:id="@+id/item_big_disese_deparment_name"
-        android:layout_below="@+id/item_big_disese_hospital_name"
-        android:layout_marginTop="@dimen/dp_14"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="预约科室："
-        android:textSize="@dimen/txt13"
-        android:textColor="@color/text_black_33"
-        />
-
-    <TextView
-        android:id="@+id/item_big_disese_doctor_name"
-        android:layout_below="@+id/item_big_disese_deparment_name"
-        android:layout_marginTop="@dimen/dp_14"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="预约医生："
-        android:textSize="@dimen/txt13"
-        android:textColor="@color/text_black_33"
-        />
-
-    <TextView
-        android:id="@+id/item_big_disese_patient_name"
-        android:layout_below="@+id/item_big_disese_doctor_name"
-        android:layout_marginTop="@dimen/dp_14"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="预约人："
-        android:textSize="@dimen/txt13"
-        android:textColor="@color/text_black_33"
-        android:layout_marginBottom="@dimen/dp_15"
-        />
-
-    <TextView
-        android:id="@+id/item_big_disese_order_state"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text=""
-        android:textSize="@dimen/txt14"
-        android:textColor="#16C716"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
-        />
-
-</RelativeLayout>

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

@@ -19,6 +19,7 @@
         android:textStyle="bold" />
 
     <TextView
+        android:layout_marginBottom="12dp"
         android:id="@+id/item_emergency_seek_doctor_time"
         android:layout_below="@+id/item_emergency_seek_doctor_name"
         android:layout_width="wrap_content"
@@ -28,17 +29,6 @@
         android:text="求救时间：202-01-01  13:12"
         android:textColor="@color/text_black_33"
         android:textSize="@dimen/txt14" />
-    <TextView
-        android:id="@+id/item_emergency_seek_doctor_hospital"
-        android:layout_below="@+id/item_emergency_seek_doctor_time"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/dp_14"
-        android:layout_marginTop="@dimen/dp_14"
-        android:text="应急医院：西京医院-协助检查"
-        android:textColor="@color/text_black_33"
-        android:textSize="@dimen/txt14"
-        android:layout_marginBottom="@dimen/dp_17"/>
 
     <TextView
         android:id="@+id/item_emergency_seek_doctor_more"
@@ -61,7 +51,7 @@
         android:textColor="#16C716"
         android:layout_alignParentRight="true"
         android:text="查看详情"
-        android:layout_marginTop="@dimen/dp_25"
+        android:layout_marginTop="@dimen/dp_15"
         android:layout_marginRight="@dimen/dp_15"
         />
 </RelativeLayout>

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

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:padding="@dimen/dp_12">
-    <ImageView
-        android:id="@+id/iv_department_icon"
-        android:layout_width="@dimen/dp_0"
-        android:layout_height="@dimen/dp_0"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintWidth_percent="0.137"
-        app:layout_constraintDimensionRatio="1:1"
-        tools:src='@mipmap/ic_launcher'/>
-    <TextView
-        android:id="@+id/tv_department_name"
-        android:layout_width="@dimen/dp_0"
-        android:layout_height="wrap_content"
-        app:layout_constraintLeft_toRightOf="@+id/iv_department_icon"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginStart="@dimen/dp_4"
-        android:textColor="@color/text_black_33"
-        android:textSize="@dimen/txt14"
-        tools:text="@string/app_name"/>
-    <TextView
-        android:id="@+id/tv_department_intro"
-        android:layout_width="@dimen/dp_0"
-        android:layout_height="wrap_content"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/iv_department_icon"
-        android:layout_marginTop="@dimen/dp_10"
-        android:textColor="@color/text_black_66"
-        android:textSize="@dimen/txt12"
-        tools:text="@string/app_name"/>
-</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:background="@drawable/bg_card"
-    android:layout_height="wrap_content">
-    <com.allen.library.CircleImageView
-        android:id="@+id/item_recycler_seek_doctor_department_img"
-        android:scaleType="centerCrop"
-        android:layout_marginLeft="@dimen/dp_12"
-        android:layout_marginTop="@dimen/dp_10"
-        android:layout_centerVertical="true"
-        android:layout_width="@dimen/dp_30"
-        android:layout_height="@dimen/dp_30">
-    </com.allen.library.CircleImageView>
-    <TextView
-        android:layout_toRightOf="@+id/item_recycler_seek_doctor_department_img"
-        android:id="@+id/item_recycler_seek_doctor_department_name"
-        android:layout_marginLeft="@dimen/dp_6"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="儿科"
-        android:layout_marginTop="@dimen/dp_13"
-        android:textSize="@dimen/txt14"
-        android:textColor="@color/text_black_33"
-        android:textStyle="bold"
-        />
-
-
-
-    <TextView
-        android:id="@+id/item_recycler_seek_doctor_department_hint"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        android:text="皮炎、湿疹、痤疮、脱发、毛囊炎、皮肤过敏"
-        android:textColor="@color/text_black_66"
-        android:textSize="@dimen/txt12"
-        android:maxLines="2"
-        android:ellipsize="end"
-        android:layout_below="@+id/item_recycler_seek_doctor_department_img"
-        android:layout_marginLeft="@dimen/dp_12"
-        android:layout_marginRight="@dimen/dp_12"
-        android:layout_marginTop="@dimen/dp_10"
-        />
-    <TextView
-        android:id="@+id/item_recycler_seek_doctor_number"
-        android:layout_toRightOf="@+id/item_recycler_seek_doctor_department_img"
-        android:layout_below="@+id/item_recycler_seek_doctor_department_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="@dimen/txt12"
-        android:text=""
-        android:textColor="@color/text_black_66"
-        android:layout_centerHorizontal="true"
-        android:layout_marginRight="@dimen/dp_6"
-        android:layout_marginTop="@dimen/dp_5"
-        android:layout_marginLeft="@dimen/dp_6"
-        android:layout_marginBottom="@dimen/dp_10"
-        />
-
-
-</RelativeLayout>

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

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:id="@+id/item_department_root"
-    android:layout_height="@dimen/dp_45">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/item_key"
-        android:layout_marginTop="@dimen/dp_14"
-        android:layout_marginBottom="@dimen/dp_14"
-        android:layout_marginLeft="@dimen/dp_30"
-        android:textSize="@dimen/txt12"
-        android:textColor="@color/text_black_66"
-        />
-
-
-
-</LinearLayout>

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

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:background="@color/white"
-    android:layout_height="@dimen/dp_45">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/item_key"
-        android:layout_centerVertical="true"
-        android:layout_marginLeft="@dimen/dp_30"
-        android:textSize="@dimen/txt12"
-        android:textColor="@color/text_black_66"
-        />
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_1"
-        android:background="#E0E0E0"
-        android:layout_alignParentBottom="true"
-        />
-
-
-
-</RelativeLayout>

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

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-    <TextView
-        android:id="@+id/tv_disease_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:background="@drawable/rectangle_round_corner20_gray_stroke_transparent"
-        android:paddingVertical="@dimen/dp_7"
-        android:paddingHorizontal="@dimen/dp_10"
-        android:layout_margin="@dimen/dp_5"
-        android:gravity="center"
-        android:textSize="@dimen/txt13"
-        android:textColor="@color/text_black_33"
-        tools:text="@string/app_name"/>
-</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-    <TextView
-        android:id="@+id/item_recycler_seek_doctor_disease_child_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:background="@drawable/bg_frame"
-        android:paddingTop="@dimen/dp_8"
-        android:paddingBottom="@dimen/dp_8"
-        android:paddingRight="@dimen/dp_8"
-        android:paddingLeft="@dimen/dp_8"
-        android:layout_marginLeft="@dimen/dp_4"
-        android:layout_marginRight="@dimen/dp_4"
-        android:layout_marginBottom="@dimen/dp_10"
-        android:textSize="@dimen/txt13"
-        android:textColor="#333333"
-        android:maxLines="2"
-        />
-
-</LinearLayout>

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

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:orientation="vertical"
-    android:paddingTop="@dimen/dp_8"
-    android:paddingBottom="@dimen/dp_8"
-    android:paddingRight="@dimen/dp_8"
-    android:paddingLeft="@dimen/dp_8"
-    android:layout_marginLeft="@dimen/dp_4"
-    android:layout_marginRight="@dimen/dp_4"
-    android:layout_marginBottom="@dimen/dp_10"
-    android:background="@drawable/bg_frame"
-    android:layout_height="wrap_content">
-    <TextView
-        android:id="@+id/item_recycler_seek_doctor_disease_child_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:textSize="@dimen/txt13"
-        android:textColor="#333333"
-        android:maxLines="2"
-        />
-    <TextView
-        android:id="@+id/item_recycler_seek_doctor_disease_child_hint"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="@dimen/txt10"
-        android:textColor="@color/text_black_33"
-        android:text=""
-        android:visibility="gone"
-        android:layout_gravity="center_horizontal"
-        />
-
-</LinearLayout>

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

@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:paddingHorizontal="@dimen/dp_10"
-    android:paddingVertical="@dimen/dp_15">
-    <ImageView
-        android:id="@+id/iv_hospital_image"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintWidth_percent="0.16"
-        app:layout_constraintDimensionRatio="1:1"
-        tools:src='@mipmap/ic_launcher'/>
-    <TextView
-        android:id="@+id/tv_hospital_level"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintLeft_toRightOf="@+id/iv_hospital_image"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginStart="@dimen/dp_10"
-        android:layout_marginTop="@dimen/dp_2"
-        android:background="@color/font_blue"
-        android:textColor="@color/white"
-        tools:text="@string/app_name"/>
-    <TextView
-        android:id="@+id/tv_hospital_name"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        app:layout_constraintLeft_toRightOf="@+id/tv_hospital_level"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintBaseline_toBaselineOf="@+id/tv_hospital_level"
-        android:layout_marginTop="@dimen/dp_2"
-        android:textSize="@dimen/txt14"
-        tools:text="@string/app_name"/>
-    <TextView
-        android:id="@+id/tv_hospital_address"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        app:layout_constraintLeft_toLeftOf="@+id/tv_hospital_level"
-        app:layout_constraintTop_toBottomOf="@+id/tv_hospital_name"
-        app:layout_constraintRight_toRightOf="parent"
-        android:layout_marginTop="@dimen/dp_10"
-        android:textSize="@dimen/txt13"
-        tools:text="@string/app_name"/>
-
-</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:background="@drawable/bg_card"
-    android:layout_height="wrap_content">
-    <ImageView
-        android:id="@+id/item_recycler_seek_doctor_hospital_img"
-        android:layout_centerVertical="true"
-        android:layout_marginLeft="@dimen/dp_10"
-        android:scaleType="centerCrop"
-        android:layout_width="@dimen/dp_60"
-        android:layout_height="@dimen/dp_60">
-    </ImageView>
-
-    <TextView
-        android:id="@+id/item_recycler_seek_doctor_hospital_tag"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="二甲"
-        android:textColor="@color/white"
-        android:background="@drawable/bg_blue_background_shap_radius4"
-        android:paddingRight="@dimen/dp_6"
-        android:paddingLeft="@dimen/dp_6"
-        android:paddingTop="@dimen/dp_2"
-        android:paddingBottom="@dimen/dp_2"
-        android:layout_toRightOf="@+id/item_recycler_seek_doctor_hospital_img"
-        android:layout_marginTop="@dimen/dp_13"
-        android:layout_marginLeft="@dimen/dp_10"
-        android:textSize="@dimen/txt9"
-        />
-
-    <TextView
-        android:id="@+id/item_recycler_seek_doctor_hospital_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="@dimen/txt14"
-        android:textColor="@color/text_black_33"
-        android:layout_toRightOf="@+id/item_recycler_seek_doctor_hospital_tag"
-        android:text="生命科学专科医院"
-        android:layout_marginTop="@dimen/dp_10"
-        android:layout_marginLeft="@dimen/dp_4"
-        android:textStyle="bold"
-        />
-
-    <TextView
-        android:id="@+id/item_recycler_seek_doctor_hospital_department"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="@dimen/txt14"
-        android:textColor="@color/text_black_33"
-        android:text="重点科室：眼科、骨科"
-        android:layout_toRightOf="@+id/item_recycler_seek_doctor_hospital_img"
-        android:layout_below="@+id/item_recycler_seek_doctor_hospital_tag"
-        android:layout_marginLeft="@dimen/dp_10"
-        android:layout_marginTop="@dimen/dp_10"
-        />
-
-    <TextView
-        android:id="@+id/item_recycler_seek_doctor_hospital_distance"
-        android:layout_below="@+id/item_recycler_seek_doctor_hospital_department"
-        android:layout_toRightOf="@+id/item_recycler_seek_doctor_hospital_img"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/dp_10"
-        android:text="12.5Km"
-        android:textSize="@dimen/txt13"
-        android:drawablePadding="@dimen/dp_5"
-        android:drawableLeft="@drawable/ic_local"
-        android:layout_marginTop="@dimen/dp_10"
-        android:layout_marginRight="@dimen/dp_10"
-        />
-    <TextView
-        android:id="@+id/item_recycler_seek_doctor_hospital_navigation"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="@dimen/txt13"
-        android:text="导航"
-        android:textColor="#3390FF"
-        android:layout_toRightOf="@+id/item_recycler_seek_doctor_hospital_distance"
-        android:layout_alignBaseline="@+id/item_recycler_seek_doctor_hospital_distance"
-        />
-    <TextView
-        android:id="@+id/item_recycler_seek_doctor_hospital_address"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="@dimen/txt13"
-        android:textColor="@color/text_black_99"
-        android:text="重点科室：眼科、骨科"
-        android:layout_marginBottom="@dimen/dp_10"
-        android:layout_toRightOf="@+id/item_recycler_seek_doctor_hospital_img"
-        android:layout_below="@+id/item_recycler_seek_doctor_hospital_distance"
-        android:layout_marginLeft="@dimen/dp_10"
-        android:layout_marginTop="@dimen/dp_6"
-        />
-
-</RelativeLayout>

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

@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-    <TextView
-        android:id="@+id/user_rate_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="@color/text_black_33"
-        android:textSize="@dimen/txt14"
-        android:textStyle="bold"
-        android:text="张三"
-        android:layout_marginLeft="@dimen/dp_13"
-        android:layout_marginTop="@dimen/dp_16"
-        />
-
-    <RatingBar
-        android:id="@+id/rating_bar"
-        android:layout_toRightOf="@+id/user_rate_name"
-        android:layout_marginTop="@dimen/dp_16"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:progressTint="#F19927"
-        android:secondaryProgressTint="@color/transparent"
-        style="@style/Widget.AppCompat.RatingBar.Small"
-        android:layout_marginHorizontal="@dimen/dp_12"
-        android:numStars="5"
-        android:stepSize="0.14"
-        android:rating="1"/>
-
-    <TextView
-        android:id="@+id/user_rate_depart"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="神经内科"
-        android:textColor="#3390FF"
-        android:textSize="@dimen/txt12"
-        android:layout_alignParentRight="true"
-        android:layout_marginTop="@dimen/dp_17"
-        android:layout_marginRight="@dimen/dp_15"
-        />
-
-    <TextView
-        android:layout_below="@+id/user_rate_name"
-        android:id="@+id/user_rate_content"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/dp_15"
-        android:layout_marginRight="@dimen/dp_15"
-        android:layout_marginTop="@dimen/dp_15"
-        android:text="医生态度特别好，讲解的很详细；医生态度特别好，讲解的很详细；医生态度特别好，讲解的很详细；"
-        />
-
-    <TextView
-        android:id="@+id/user_rate_time"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="@dimen/txt12"
-        android:textColor="@color/text_black_99"
-        android:layout_below="@+id/user_rate_content"
-        android:text="2023-01-15"
-        android:layout_marginLeft="@dimen/dp_15"
-        android:layout_marginTop="@dimen/dp_12"
-        android:layout_marginBottom="@dimen/dp_18"
-        />
-
-    <View
-        android:layout_below="@+id/user_rate_time"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_1"
-        android:background="#E0E0E0"
-        />
-
-</RelativeLayout>

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

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="80dp"
-    android:background="#FFD700">
-
-    <TextView
-        android:id="@+id/secondary_header"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="16dp"
-        android:singleLine="true"
-        android:textSize="24sp"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="优惠" />
-
-    <Button
-        android:id="@+id/btn_add"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="16dp"
-        android:singleLine="true"
-        android:text="点我"
-        android:textSize="24sp"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:clipChildren="false"
-    android:orientation="vertical">
-
-    <androidx.viewpager2.widget.ViewPager2
-        android:id="@+id/view_pager"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_above="@id/main_navigation_bar"
-        android:layout_alignParentTop="true" />
-
-    <androidx.cardview.widget.CardView
-        android:id="@+id/main_navigation_bar"
-        android:background="#FFFFFFFF"
-        app:cardBackgroundColor="#FFFFFFFF"
-        android:layout_alignParentBottom="true"
-        app:cardElevation="10dp"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="65dp"
-            android:clipChildren="false"
-            android:background="@color/transparent"
-            android:orientation="horizontal">
-
-            <RelativeLayout
-                android:id="@+id/conversation_btn_group"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:onClick="tabClick">
-
-                <ImageView
-                    android:id="@+id/tab_conversation_icon"
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginTop="8dp"
-                    android:background="@drawable/demo_overseas_main_tab_conversation_selected" />
-
-                <TextView
-                    android:id="@+id/conversation"
-                    android:layout_width="50dp"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/tab_conversation_icon"
-                    android:layout_centerInParent="true"
-                    android:gravity="center"
-                    android:text="@string/demo_tab_overseas_conversation_tab_text"
-                    android:textColor="@color/demo_main_tab_text_selected_color_light"
-                    android:textSize="12sp" />
-
-                <com.tencent.qcloud.tuicore.component.UnreadCountTextView
-                    android:id="@+id/msg_total_unread"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentTop="true"
-                    android:layout_marginStart="-17dp"
-                    android:layout_marginTop="1dp"
-                    android:layout_toEndOf="@id/conversation"
-                    android:gravity="center"
-                    android:includeFontPadding="false"
-                    android:textColor="@color/white"
-                    android:minWidth="18.4dp"
-                    android:minHeight="18.4dp"
-                    android:textSize="13.6sp"
-                    android:visibility="gone" />
-
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:id="@+id/contact_btn_group"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:onClick="tabClick">
-
-                <ImageView
-                    android:id="@+id/tab_contact_icon"
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginTop="8dp"
-                    android:background="@drawable/demo_overseas_main_tab_contact_normal_bg" />
-
-                <TextView
-                    android:id="@+id/contact"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/tab_contact_icon"
-                    android:layout_centerInParent="true"
-                    android:gravity="center"
-                    android:text="@string/minimalist_tab_contacts_tab_text"
-                    android:textColor="@color/core_light_bg_secondary_text_color_light"
-                    android:textSize="12sp" />
-
-                <com.tencent.qcloud.tuicore.component.UnreadCountTextView
-                    android:id="@+id/new_friend_total_unread"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentTop="true"
-                    android:layout_marginStart="-8dp"
-                    android:layout_marginTop="1dp"
-                    android:layout_toEndOf="@id/contact"
-                    android:gravity="center"
-                    android:includeFontPadding="false"
-                    android:minWidth="18.4dp"
-                    android:minHeight="18.4dp"
-                    android:textColor="#FFFFFF"
-                    android:textSize="13.6sp"
-                    android:visibility="gone" />
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:id="@+id/myself_btn_group"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:onClick="tabClick">
-
-                <ImageView
-                    android:id="@+id/tab_profile_icon"
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginTop="8dp"
-                    android:background="@drawable/demo_overseas_main_tab_settings_normal_bg" />
-
-                <TextView
-                    android:id="@+id/mine"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/tab_profile_icon"
-                    android:layout_centerInParent="true"
-                    android:gravity="center"
-                    android:text="@string/minimalist_tab_settings_tab_text"
-                    android:textColor="@color/core_light_bg_secondary_text_color_light"
-                    android:textSize="12sp" />
-
-            </RelativeLayout>
-        </LinearLayout>
-    </androidx.cardview.widget.CardView>
-</RelativeLayout>