Update

RMA/.idea/deploymentTargetDropDown.xml

@@ -7,11 +7,11 @@
         <deviceKey>
           <Key>
             <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="C:\Users\zhoux\.android\avd\Pixel_2_API_30.avd" />
+            <value value="C:\Users\zhoux\.android\avd\Pixel_4_XL_API_30.avd" />
           </Key>
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-02-17T08:57:36.338943900Z" />
+    <timeTargetWasSelectedWithDropDown value="2022-02-24T06:17:57.595727800Z" />
   </component>
 </project>

RMA/app/src/main/java/cn/muchinfo/rma/view/MainActivity.kt

@@ -279,40 +279,7 @@ class MainActivity : BaseActivity<MainViewModel>() {
         if (SPUtils.getInstance().getString(Constant.oem) == "xhcp"){
             val tjmdMarketList = GlobalDataCollection.instance?.getTjmdShowMarketSectionList()
             tjmdMarketList?.forEach {
-                //由于在板块信息中没有区分的字段，所以用子列表内的trademodel判断是否是参考行情的页面（参考行情是后期发现有的，没有柔合到TjmdMarketFragment内）
-                var isReference = false
-                it.mlist?.forEach {
-                    if (it.trademode == "99"){
-                        isReference = true
-                    }
-                }
-                if (isReference){
-                    val referenceFragment = ReferenceFragment()
-                    val bundle = Bundle()
-                    bundle.putString("titlename",it.marketsectionname)
-                    referenceFragment.arguments = bundle
-                    newFragments.add(referenceFragment)
-                    newTabText.add(it.marketsectionname ?: "")
-                }else{
-                    val tjmdMarketFragment = TjmdMarketFragment()
-                    val bundle = Bundle()
-                    bundle.putString("titlename",it.marketsectionname)
-                    bundle.putString("index",tjmdMarketList.indexOf(it).toString())
-                    tjmdMarketFragment.arguments = bundle
-                    newFragments.add(tjmdMarketFragment)
-                    newTabText.add(it.marketsectionname ?: "")
-                }
 
-                if (tjmdMarketList.indexOf(it) == 0){
-                    newNormalIcon.add(R.mipmap.warehous_recepit_normal)
-                    newSelectIcon.add(R.mipmap.warehous_recepit_celect)
-                }else if (tjmdMarketList.indexOf(it) == 1){
-                    newNormalIcon.add(R.mipmap.yrdz_cdys_normal)
-                    newSelectIcon.add(R.mipmap.yrdz_yscd_select)
-                }else{
-                    newNormalIcon.add(R.mipmap.yrdz_ddjy_normal)
-                    newSelectIcon.add(R.mipmap.yrdz_ddjy_select)
-                }
             }
         }
 

RMA/app/src/main/java/cn/muchinfo/rma/view/base/app/Constant.kt

@@ -40,7 +40,8 @@ object Constant {
 
 //    const val baseurl = "http://218.17.158.45:21001/cfg?key=test_139"// 邓工139外网环境 2100000003/123456
 //    const val baseurl = "http://192.168.31.176:8080/cfg?key=test_176" // 邓工 新会陈皮
-    const val baseurl = "http://192.168.31.139:8080/cfg?key=test_139" // 麦顿
+//    const val baseurl = "http://192.168.31.139:8080/cfg?key=test_139" // 麦顿
+    const val baseurl = "http://218.17.158.45:15203/cfg?key=test_176" // 邓工 新会陈皮 176外网
 
     /**
      * 用sp存储基础url的key

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/xhcp/XhcpHomeFragment.kt

@@ -84,14 +84,6 @@ class XhcpHomeFragment : BaseFragment<XhcpHomeViewModel>(){
         "XhcpHomeFragment"
     }
 
-    override fun onDestroy() {
-        super.onDestroy()
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-    }
-
     //viewpager的适配器
     private var pagerAdapter: PagerAdapter? = null
 
@@ -125,9 +117,7 @@ class XhcpHomeFragment : BaseFragment<XhcpHomeViewModel>(){
             override fun isViewFromObject(view: View, `object`: Any): Boolean = view == `object`
 
             override fun getCount(): Int = tabsArray.size
-
         }
-
     }
 
     @SuppressLint("RtlHardcoded")

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/xhcp/XhcpHomeViewModel.kt

@@ -36,10 +36,6 @@ class XhcpHomeViewModel : BaseViewModel(){
      */
     val noticeDataList : MutableLiveData<List<NoticeData>> = MutableLiveData()
 
-
-    val sonItemList : MutableLiveData<List<GoodsInfo>> = MutableLiveData()
-
-
     fun setOnItemClick() {
 
     }
@@ -52,10 +48,6 @@ class XhcpHomeViewModel : BaseViewModel(){
      * 通知公告查询
      */
     fun queryNotice(){
-//        noticeDataList.postValue(arrayListOf(NoticeData(autoid = "1",title = "djahskdhakjshkahskjhakjsdhakjdshkjashdkjahdskjahsdjkad"),
-//            NoticeData(autoid = "2",title = "贺卡活动空间啊会死的恐惧啊会死的恐惧啊会死的恐惧啊还得看撒"),
-//            NoticeData(autoid = "3",title = "打卡是否看来佛 i 啊UFO i 啊 u 上帝啊 u 都 i 啊 u 山东 iu 阿斯哦独傲"),
-//            NoticeData(autoid = "4",title = "打卡大课间活动空间啊会多少空间啊会的恐惧啊会死肯德基哈开机速度和空间啊会的")))
         val params = mutableMapOf<String, String>().apply {
             put("loginID", GlobalDataCollection.instance?.loginRsp?.loginID.toString())
             put("msgType","1")
@@ -68,7 +60,6 @@ class XhcpHomeViewModel : BaseViewModel(){
         }
     }
 
-
     /**
      * 在请求之前先获取数据库存储的banner信息
      */
@@ -82,7 +73,7 @@ class XhcpHomeViewModel : BaseViewModel(){
                 }
 
                 override fun onError(call: Call?, e: Exception?, id: Int) {
-                    LogUtils.eTag("asdasdadasa",e?.message)
+
                 }
 
             },params = params,type = "1")

RMA/app/src/main/java/cn/muchinfo/rma/view/base/login/LoginActivity.kt

@@ -592,36 +592,40 @@ class LoginActivity : BaseActivity<LoginViewModel>(), UserPopupWindow.OnClearAcc
                                                 GlobalDataCollection.instance?.tjmdMarketSectionDataArrayList =
                                                     respData?.toArrayList()
 
-                                                val params1 = mutableMapOf<String,String>().apply {
-                                                    put("marketid",GlobalDataCollection.instance?.getMaketidByTrademode(16).toString())
-                                                }
-                                                MyApplication.getInstance()?.chartManager?.queryDeliveryRelation(params = params1){isSuccess, respData, error ->
-                                                    if (isSuccess){
-                                                        GlobalDataCollection.instance?.setDeliveryRelationDataArrayList(respData?.toArrayList())
-                                                        viewModel.loadingDialogStatus.value =
+                                                viewModel.loadingDialogStatus.value =
                                                             TaskUiModel.success(msg = "登录成功")
-                                                        goHomePage()
-                                                    }else{
-                                                        viewModel.loadingDialogStatus.value =
-                                                            TaskUiModel.failed(InteractiveException(errorMessage = "商品交割关系表请求失败"))
-                                                    }
-                                                }
+                                                goHomePage()
 
-                                                val params = mutableMapOf<String,String>().apply {
-                                                    put("usertype",GlobalDataCollection.instance?.loginQueryData?.userInfo?.usertype?.toString() ?: "")
-                                                    put("marketids",GlobalDataCollection.instance?.getMaketidByTrademode(46)?.toString() ?: "")
-                                                }
-                                                MyApplication.getInstance()?.swapsManager?.queryQuoteGoodsList(params = params){isSuccess, respData, error ->
-                                                    if (isSuccess){
-                                                        GlobalDataCollection.instance?.setQuoteGoodsListDataArrayList(respData?.toArrayList())
-                                                        viewModel.loadingDialogStatus.value =
-                                                            TaskUiModel.success(msg = "登录成功")
-                                                        goHomePage()
-                                                    }else{
-                                                        viewModel.loadingDialogStatus.value =
-                                                            TaskUiModel.failed(InteractiveException(errorMessage = "掉期报价列表请求失败"))
-                                                    }
-                                                }
+//                                                val params1 = mutableMapOf<String,String>().apply {
+//                                                    put("marketid",GlobalDataCollection.instance?.getMaketidByTrademode(16).toString())
+//                                                }
+//                                                MyApplication.getInstance()?.chartManager?.queryDeliveryRelation(params = params1){isSuccess, respData, error ->
+//                                                    if (isSuccess){
+//                                                        GlobalDataCollection.instance?.setDeliveryRelationDataArrayList(respData?.toArrayList())
+//                                                        viewModel.loadingDialogStatus.value =
+//                                                            TaskUiModel.success(msg = "登录成功")
+//                                                        goHomePage()
+//                                                    }else{
+//                                                        viewModel.loadingDialogStatus.value =
+//                                                            TaskUiModel.failed(InteractiveException(errorMessage = "商品交割关系表请求失败"))
+//                                                    }
+//                                                }
+//
+//                                                val params = mutableMapOf<String,String>().apply {
+//                                                    put("usertype",GlobalDataCollection.instance?.loginQueryData?.userInfo?.usertype?.toString() ?: "")
+//                                                    put("marketids",GlobalDataCollection.instance?.getMaketidByTrademode(46)?.toString() ?: "")
+//                                                }
+//                                                MyApplication.getInstance()?.swapsManager?.queryQuoteGoodsList(params = params){isSuccess, respData, error ->
+//                                                    if (isSuccess){
+//                                                        GlobalDataCollection.instance?.setQuoteGoodsListDataArrayList(respData?.toArrayList())
+//                                                        viewModel.loadingDialogStatus.value =
+//                                                            TaskUiModel.success(msg = "登录成功")
+//                                                        goHomePage()
+//                                                    }else{
+//                                                        viewModel.loadingDialogStatus.value =
+//                                                            TaskUiModel.failed(InteractiveException(errorMessage = "掉期报价列表请求失败"))
+//                                                    }
+//                                                }
                                             }else{
                                                 viewModel.loadingDialogStatus.value =
                                                     TaskUiModel.failed(InteractiveException(errorMessage = "市场板块查询失败"))