diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 20ec71e..94cd3b8 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -127,18 +127,9 @@ - - - @@ -163,9 +154,6 @@ - @@ -193,7 +181,9 @@ - + diff --git a/app/src/main/java/com/xjjk/healthyclients/MainActivity.kt b/app/src/main/java/com/xjjk/healthyclients/MainActivity.kt index 87ec179..6f0c80b 100644 --- a/app/src/main/java/com/xjjk/healthyclients/MainActivity.kt +++ b/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(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(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(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(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?) { diff --git a/app/src/main/java/com/xjjk/healthyclients/data/repository/CommonRepository.kt b/app/src/main/java/com/xjjk/healthyclients/data/repository/CommonRepository.kt index a426738..f0f74f8 100644 --- a/app/src/main/java/com/xjjk/healthyclients/data/repository/CommonRepository.kt +++ b/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 diff --git a/app/src/main/java/com/xjjk/healthyclients/fragment/EmergencyFragment.kt b/app/src/main/java/com/xjjk/healthyclients/fragment/EmergencyFragment.kt index 39b9b97..9cff3ab 100644 --- a/app/src/main/java/com/xjjk/healthyclients/fragment/EmergencyFragment.kt +++ b/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)) } } diff --git a/app/src/main/java/com/xjjk/healthyclients/imActivity/MainMinimalistActivity.java b/app/src/main/java/com/xjjk/healthyclients/imActivity/MainMinimalistActivity.java deleted file mode 100644 index 44016c7..0000000 --- a/app/src/main/java/com/xjjk/healthyclients/imActivity/MainMinimalistActivity.java +++ /dev/null @@ -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 fragments; - - private HashMap markUnreadMap = new HashMap<>(); - - private static WeakReference 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>() { - @Override - public void onSuccess(HashMap stringV2TIMConversationHashMap) { - if (stringV2TIMConversationHashMap.size() == 0) { - return; - } - List unreadConversationIDList = new ArrayList<>(); - Iterator> iterator = markUnreadMap.entrySet().iterator(); - while (iterator.hasNext()) { - Map.Entry entry = iterator.next(); - unreadConversationIDList.add(entry.getKey()); - } - - V2TIMManager.getConversationManager().markConversation(unreadConversationIDList, - V2TIMConversation.V2TIM_CONVERSATION_MARK_TYPE_UNREAD, - false, - new V2TIMValueCallback>() { - @Override - public void onSuccess(List 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> callback) { - if (fromStart) { - markUnreadMap.clear(); - } - V2TIMManager.getConversationManager().getConversationListByFilter(filter, nextSeq, count, new V2TIMValueCallback() { - @Override - public void onSuccess(V2TIMConversationResult v2TIMConversationResult) { - List 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 applicationList) { - refreshFriendApplicationUnreadCount(); - } - - @Override - public void onFriendApplicationListDeleted(List 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() { - @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(); - } - } - -} diff --git a/app/src/main/java/com/xjjk/healthyclients/retrofit/UrlConfig.kt b/app/src/main/java/com/xjjk/healthyclients/retrofit/UrlConfig.kt index d50af7a..6531725 100644 --- a/app/src/main/java/com/xjjk/healthyclients/retrofit/UrlConfig.kt +++ b/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 diff --git a/app/src/main/java/com/xjjk/healthyclients/superfuntion/StartActivityManager.kt b/app/src/main/java/com/xjjk/healthyclients/superfuntion/StartActivityManager.kt index 57849b9..e6705bc 100644 --- a/app/src/main/java/com/xjjk/healthyclients/superfuntion/StartActivityManager.kt +++ b/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音视频 diff --git a/app/src/main/java/com/xjjk/healthyclients/ui/activity/EmergencyContactActivity.kt b/app/src/main/java/com/xjjk/healthyclients/ui/activity/EmergencyContactActivity.kt index 198ef2f..8c67e6c 100644 --- a/app/src/main/java/com/xjjk/healthyclients/ui/activity/EmergencyContactActivity.kt +++ b/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 { diff --git a/app/src/main/java/com/xjjk/healthyclients/ui/activity/emergency/adapter/EmergencySeekDoctorAdapter.kt b/app/src/main/java/com/xjjk/healthyclients/ui/activity/emergency/adapter/EmergencySeekDoctorAdapter.kt index 45e717d..632a4b6 100644 --- a/app/src/main/java/com/xjjk/healthyclients/ui/activity/emergency/adapter/EmergencySeekDoctorAdapter.kt +++ b/app/src/main/java/com/xjjk/healthyclients/ui/activity/emergency/adapter/EmergencySeekDoctorAdapter.kt @@ -18,15 +18,15 @@ class EmergencySeekDoctorAdapter(var mContext: Context) : BaseQuickAdapter(R.id.item_emergency_seek_doctor_time)?.let{ it.text="求救时间：${bean?.createTime}" } - holder?.getView(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(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(R.id.item_emergency_seek_doctor_state)?.let{ it.text="${bean?.orderStatus_dictText}" } diff --git a/app/src/main/java/com/xjjk/healthyclients/ui/activity/guidance/DoctorHomepageActivity.kt b/app/src/main/java/com/xjjk/healthyclients/ui/activity/guidance/DoctorHomepageActivity.kt index ed3fc2f..c2dc540 100644 --- a/app/src/main/java/com/xjjk/healthyclients/ui/activity/guidance/DoctorHomepageActivity.kt +++ b/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") } } } diff --git a/app/src/main/java/com/xjjk/healthyclients/ui/activity/guidance/GuidanceNoticeActivity.kt b/app/src/main/java/com/xjjk/healthyclients/ui/activity/guidance/GuidanceNoticeActivity.kt index 9d01b64..2b52a56 100644 --- a/app/src/main/java/com/xjjk/healthyclients/ui/activity/guidance/GuidanceNoticeActivity.kt +++ b/app/src/main/java/com/xjjk/healthyclients/ui/activity/guidance/GuidanceNoticeActivity.kt @@ -22,7 +22,7 @@ import kotlinx.coroutines.launch class GuidanceNoticeActivity : BaseVMBActivity(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?, - var method: () -> Unit -) : CommonAdapter(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(R.id.item_recycler_seek_doctor_disease_child_name)?.setText(it.name) - holder?.getView(R.id.item_recycler_seek_doctor_disease_child_hint)?.setText(doctorHint) - } - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/xjjk/healthyclients/ui/activity/guidance/adapter/FilterSearchDepartment2Adapter.kt b/app/src/main/java/com/xjjk/healthyclients/ui/activity/guidance/adapter/FilterSearchDepartment2Adapter.kt deleted file mode 100644 index 00e16e4..0000000 --- a/app/src/main/java/com/xjjk/healthyclients/ui/activity/guidance/adapter/FilterSearchDepartment2Adapter.kt +++ /dev/null @@ -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?) : CommonAdapter(mContext,layoutId,datas){ - override fun convert(holder: ViewHolder?, bean: DepartListBean?, position: Int) { - holder?.getView(R.id.item_key)?.let{ - it.text=bean?.departmentName - } - holder?.getView(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) - } - } - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/xjjk/healthyclients/ui/activity/guidance/adapter/SeekDoctorHospitalAdapter.kt b/app/src/main/java/com/xjjk/healthyclients/ui/activity/guidance/adapter/SeekDoctorHospitalAdapter.kt deleted file mode 100644 index 321a253..0000000 --- a/app/src/main/java/com/xjjk/healthyclients/ui/activity/guidance/adapter/SeekDoctorHospitalAdapter.kt +++ /dev/null @@ -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?) : CommonAdapter(mContext,layoutId,datas){ - override fun convert(holder: ViewHolder?, bean: HospitalchildBean?, position: Int) { - holder?.getView(R.id.item_recycler_seek_doctor_hospital_img)?.let{ - it.loadRoundedImage(bean?.img,5f, R.drawable.ic_hospital_default) - } - holder?.getView(R.id.item_recycler_seek_doctor_hospital_tag)?.let{ - //医院等级 - it.text=bean?.tag - } - holder?.getView(R.id.item_recycler_seek_doctor_hospital_name)?.let{ - //医院名称 - it.text=bean?.name - } - holder?.getView(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(R.id.item_recycler_seek_doctor_hospital_navigation)?.let{ - it.setOnClickListener { - if (bean!=null) { - goNavigation(bean.lat, bean.lon,mContext) - } - } - } - holder?.getView(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(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)) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/xjjk/healthyclients/ui/activity/guidance/adapter/SeekDoctorSick3Adapter.kt b/app/src/main/java/com/xjjk/healthyclients/ui/activity/guidance/adapter/SeekDoctorSick3Adapter.kt deleted file mode 100644 index 22787b2..0000000 --- a/app/src/main/java/com/xjjk/healthyclients/ui/activity/guidance/adapter/SeekDoctorSick3Adapter.kt +++ /dev/null @@ -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?) : CommonAdapter(mContext,layoutId,datas){ - override fun convert(holder: ViewHolder?, bean: SickListBean?, position: Int) { - holder?.getView(R.id.item_key)?.let{ - //医院名称 - it.text=bean?.sicksName - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/xjjk/healthyclients/ui/viewmodel/MainViewModel.kt b/app/src/main/java/com/xjjk/healthyclients/ui/viewmodel/MainViewModel.kt index 1295ddd..2a2c52a 100644 --- a/app/src/main/java/com/xjjk/healthyclients/ui/viewmodel/MainViewModel.kt +++ b/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) diff --git a/app/src/main/java/com/xjjk/healthyclients/view/FuntionBlurbDialog.kt b/app/src/main/java/com/xjjk/healthyclients/view/FuntionBlurbDialog.kt deleted file mode 100644 index 7b6db90..0000000 --- a/app/src/main/java/com/xjjk/healthyclients/view/FuntionBlurbDialog.kt +++ /dev/null @@ -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 - } - } - - -} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_hospital_default.png b/app/src/main/res/drawable/ic_hospital_default.png deleted file mode 100644 index 5bd0b65..0000000 Binary files a/app/src/main/res/drawable/ic_hospital_default.png and /dev/null differ diff --git a/app/src/main/res/layout/activity_retrieve_password.xml b/app/src/main/res/layout/activity_retrieve_password.xml index bd51d1c..0b8bae7 100644 --- a/app/src/main/res/layout/activity_retrieve_password.xml +++ b/app/src/main/res/layout/activity_retrieve_password.xml @@ -7,268 +7,275 @@ - + + - - - - - + app:title="@{@string/title_retrieve_password}" /> - - - - - + - + - - - - - - + - - - - - + - - - - - + - - - - + + - + - - + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_user_emergency_contact.xml b/app/src/main/res/layout/activity_user_emergency_contact.xml index b793cc5..1f86885 100644 --- a/app/src/main/res/layout/activity_user_emergency_contact.xml +++ b/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" /> diff --git a/app/src/main/res/layout/dialog_funtion_blurb_view.xml b/app/src/main/res/layout/dialog_funtion_blurb_view.xml deleted file mode 100644 index bbab198..0000000 --- a/app/src/main/res/layout/dialog_funtion_blurb_view.xml +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_guidance.xml b/app/src/main/res/layout/fragment_guidance.xml index 298ed1e..47b2e27 100644 --- a/app/src/main/res/layout/fragment_guidance.xml +++ b/app/src/main/res/layout/fragment_guidance.xml @@ -21,11 +21,6 @@ android:layout_height="match_parent" android:orientation="vertical"> - - @@ -37,15 +32,6 @@ android:scaleType="fitXY" android:src="@drawable/ic_guidance_head_bg"/> - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_emergency_seek_doctor.xml b/app/src/main/res/layout/item_emergency_seek_doctor.xml index d75513e..f5d9d9b 100644 --- a/app/src/main/res/layout/item_emergency_seek_doctor.xml +++ b/app/src/main/res/layout/item_emergency_seek_doctor.xml @@ -19,6 +19,7 @@ android:textStyle="bold" /> - \ No newline at end of file diff --git a/app/src/main/res/layout/item_recycle_seek_doctor_department.xml b/app/src/main/res/layout/item_recycle_seek_doctor_department.xml deleted file mode 100644 index 8c7c9c5..0000000 --- a/app/src/main/res/layout/item_recycle_seek_doctor_department.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_recycle_seek_doctor_department_child.xml b/app/src/main/res/layout/item_recycle_seek_doctor_department_child.xml deleted file mode 100644 index eb8ade6..0000000 --- a/app/src/main/res/layout/item_recycle_seek_doctor_department_child.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_recycle_seek_doctor_department_child2.xml b/app/src/main/res/layout/item_recycle_seek_doctor_department_child2.xml deleted file mode 100644 index 5346ee6..0000000 --- a/app/src/main/res/layout/item_recycle_seek_doctor_department_child2.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_recycle_seek_doctor_department_child3.xml b/app/src/main/res/layout/item_recycle_seek_doctor_department_child3.xml deleted file mode 100644 index f747bd6..0000000 --- a/app/src/main/res/layout/item_recycle_seek_doctor_department_child3.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_recycle_seek_doctor_disease.xml b/app/src/main/res/layout/item_recycle_seek_doctor_disease.xml deleted file mode 100644 index b732afc..0000000 --- a/app/src/main/res/layout/item_recycle_seek_doctor_disease.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_recycle_seek_doctor_disease_child.xml b/app/src/main/res/layout/item_recycle_seek_doctor_disease_child.xml deleted file mode 100644 index bb7ee0a..0000000 --- a/app/src/main/res/layout/item_recycle_seek_doctor_disease_child.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_recycle_seek_doctor_disease_child2.xml b/app/src/main/res/layout/item_recycle_seek_doctor_disease_child2.xml deleted file mode 100644 index e7371a0..0000000 --- a/app/src/main/res/layout/item_recycle_seek_doctor_disease_child2.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_recycle_seek_doctor_hospital.xml b/app/src/main/res/layout/item_recycle_seek_doctor_hospital.xml deleted file mode 100644 index 9ea5000..0000000 --- a/app/src/main/res/layout/item_recycle_seek_doctor_hospital.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_recycle_seek_doctor_hospital_child.xml b/app/src/main/res/layout/item_recycle_seek_doctor_hospital_child.xml deleted file mode 100644 index 670a0bb..0000000 --- a/app/src/main/res/layout/item_recycle_seek_doctor_hospital_child.xml +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_user_rate.xml b/app/src/main/res/layout/item_user_rate.xml deleted file mode 100644 index 4226b97..0000000 --- a/app/src/main/res/layout/item_user_rate.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/layout_custom_header.xml b/app/src/main/res/layout/layout_custom_header.xml deleted file mode 100644 index f9f2e28..0000000 --- a/app/src/main/res/layout/layout_custom_header.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - -