基础搭建

功能开发
商户端店铺信息bug

app/build.gradle

@@ -57,7 +57,7 @@ android {
             minifyEnabled false
             debuggable true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            buildConfigField "String", "URL", URL_DEBUG
+            buildConfigField "String", "URL", URL_RELEASE
             buildConfigField "String", "URL_H5", URL_DEBUG_H5
         }
     }

app/src/main/java/com/xx/merchanthbh/ui/home/HomeViewModel.java

@@ -219,7 +219,7 @@ public class HomeViewModel extends BaseViewModel<HomeRequest> {
                             }
 
                         } else {
-                            ToastUtils.showShort("版本已是最新！");
+
                         }
 
 

app/src/main/java/com/xx/merchanthbh/ui/huanbohai/HuanBoHaiViewModel.java

@@ -199,7 +199,6 @@ public class HuanBoHaiViewModel extends ListBaseViewModel<HuanBoHaiRequest> {
                             }
 
                         } else {
-                            ToastUtils.showShort("版本已是最新！");
                         }
 
 

app/src/main/java/com/xx/merchanthbh/ui/login/LoginViewModel.java

@@ -153,7 +153,6 @@ public class LoginViewModel extends BaseViewModel<LoginRequest> {
                         } else {
                             /*强制更新标识位变更--重置用户登录*/
                             StaticData.updateLogin = 1;
-                            ToastUtils.showShort("版本已是最新！");
                         }
 
 
@@ -328,7 +327,6 @@ public class LoginViewModel extends BaseViewModel<LoginRequest> {
                                 } else {
                                     /*强制更新标识位变更--重置用户登录*/
                                     StaticData.updateLogin = 1;
-                                    ToastUtils.showShort("版本已是最新！");
                                 }
 
 

app/src/main/java/com/xx/merchanthbh/ui/merchantinfo/MaterialInfoActivity.kt

 package com.xx.merchanthbh.ui.merchantinfo
 
 import android.os.Bundle
+import android.util.Log
 import android.view.View
 import com.xx.merchanthbh.BR
 import com.xx.merchanthbh.R
@@ -24,6 +25,30 @@ class MaterialInfoActivity : BaseActivity<ActivityMaterialInfoBinding, MerchantI
         super.initData()
         viewModel.adapter=AddBrankAdapter(this,1)
         binding.rvFrmBrankList.adapter= viewModel.adapter
+       viewModel.brandVisibility.observe(this){
+           it->
+           if (it)
+           {
+               binding.llBrand.visibility=View.VISIBLE
+           }else{
+               binding.llBrand.visibility=View.GONE
+           }
+       }
+
+        viewModel.imgVisibility.observe(this){
+                it->
+            when(it)
+            {
+                0-> {}
+                1->  {binding.llBusinessLicense.visibility=View.VISIBLE }
+                2->  {binding.llBusinessLicense.visibility=View.GONE }
+                3->  {binding.llOperatingPermit.visibility=View.VISIBLE }
+                4->  {binding.llOperatingPermit.visibility=View.GONE }
+            }
+
+
+        }
+
         viewModel.getMerchantInfo()
 
 
@@ -39,6 +64,7 @@ class MaterialInfoActivity : BaseActivity<ActivityMaterialInfoBinding, MerchantI
         }
 
 
+
     }
 
 

app/src/main/java/com/xx/merchanthbh/ui/merchantinfo/MerchantInfoViewModel.java

@@ -3,6 +3,7 @@ package com.xx.merchanthbh.ui.merchantinfo;
 
 import android.app.Application;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 
@@ -60,6 +61,18 @@ public class MerchantInfoViewModel extends BaseViewModel<MerchantEnterRequst> {
     public ObservableField<String> supervisors=new ObservableField<>("");
 
 
+    //品牌是否显示
+    public MutableLiveData<Boolean> brandVisibility=new MutableLiveData<>(true);
+
+    /**
+     * 1:营业执照显示
+     * 2：营业执照隐藏
+     * 3：经营许可证显示
+     * 4：经营许可证隐藏
+     */
+    public MutableLiveData<Integer> imgVisibility=new MutableLiveData<>(0);
+
+
     public MutableLiveData<MerchantBean> merchantInfos=new MutableLiveData<>();
 
     public MerchantInfoViewModel(@NonNull Application application) {
@@ -131,6 +144,7 @@ public class MerchantInfoViewModel extends BaseViewModel<MerchantEnterRequst> {
     public void addBrank(View view)
     {
 
+        brandVisibility.postValue(true);
         adapter.mList.add(new Brankbody(new ObservableField(""),new ArrayList(),null,true));
         adapter.notifyDataSetChanged();
     }
@@ -248,11 +262,34 @@ public class MerchantInfoViewModel extends BaseViewModel<MerchantEnterRequst> {
                     public void onSuccess(MerchantBean resultBean) {
                         merchantInfo.setMerchantInfo(resultBean);
                         merchantInfos.postValue(resultBean);
-                        adapter.mList=merchantInfo.reBrankbody(resultBean.getBrandAuthorizationList());
 
+                        if (resultBean.getBrandAuthorizationList().size()<=0)
+                        {
+                            brandVisibility.postValue(false);
+                        }else {
+                            brandVisibility.postValue(true);
+                        }
 
+                        adapter.mList=merchantInfo.reBrankbody(resultBean.getBrandAuthorizationList());
                         supervisors.set( StringUtils.join(resultBean.getSupervisorsUserInfoList(),",",supervisorsUserInfo -> supervisorsUserInfo.getNickName()));
                         adapter.notifyDataSetChanged();
+
+
+                        //营业执照图片
+                        if (TextUtils.isEmpty(resultBean.getBusinessLicense()))
+                        {
+                            imgVisibility.setValue(2);
+                        }else {
+                            imgVisibility.setValue(1);
+                        }
+
+                        //营业许可证
+                        if (TextUtils.isEmpty(resultBean.getOperatingPermit()))
+                        {
+                            imgVisibility.setValue(4);
+                        }else {
+                            imgVisibility.setValue(3);
+                        }
                     }
 
                     @Override

app/src/main/java/com/xx/merchanthbh/ui/mine/MineFragment.java

@@ -121,7 +121,7 @@ public class MineFragment extends BaseFragment<FragmentMineBinding, MineViewMode
         // 检查版本
         viewModel.rxPermissions = new RxPermissions(this);
         /*检查版本*/
-        viewModel.checkVersion(binding.getRoot().getRootView());
+//        viewModel.checkVersion(binding.getRoot().getRootView());
 
 // 安装新版本
         viewModel.openInstall.observe(this, new Observer<String>() {

app/src/main/java/com/xx/merchanthbh/ui/mine/MineViewModel.java

@@ -244,7 +244,11 @@ public class MineViewModel extends BaseViewModel<MineRequest> {
                             }
 
                         } else {
-                            ToastUtils.showShort("版本已是最新！");
+                            if (view!=null)
+                            {
+                                ToastUtils.showShort("版本已是最新！");
+                            }
+
                         }
 
 
@@ -252,7 +256,6 @@ public class MineViewModel extends BaseViewModel<MineRequest> {
 
                     @Override
                     public void onError(String Error) {
-                        Log.e("归根究底的错误", "归根究底的错误: " + Error);
                     }
                 });
     }

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

@@ -223,6 +223,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="134dp"
                         android:paddingLeft="13dp"
+                        android:id="@+id/ll_business_license"
                         android:paddingRight="13dp"
                         android:background="#00000000">
 
@@ -241,7 +242,6 @@
                             android:layout_width="106dp"
                             android:layout_height="80dp"
                             app:layout_constraintTop_toTopOf="parent"
-                            android:onClick="@{viewModel.uploadPic}"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintLeft_toLeftOf="parent"
                             pic_url="@{viewModel.merchantInfo.businessLicense}"
@@ -264,6 +264,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="134dp"
                         android:paddingLeft="13dp"
+                        android:id="@+id/ll_operating_permit"
                         android:paddingRight="13dp"
                         android:background="#00000000">
 
@@ -284,7 +285,6 @@
                             app:layout_constraintTop_toTopOf="parent"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintLeft_toLeftOf="parent"
-                            android:onClick="@{viewModel.uploadPic}"
                             pic_url="@{viewModel.merchantInfo.operatingPermit}"
                             android:id="@+id/xup_frm_licence"
                             android:layout_marginLeft="129dp"
@@ -302,6 +302,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="13dp"
+
                     android:background="@drawable/bg_white_radius_12"
                     android:orientation="vertical">
 
@@ -335,12 +336,11 @@
                             android:text="添加品牌授权"
                             android:id="@+id/tv_ami_add_brand"
                             android:textSize="16sp"/>
-
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
+                    </androidx.constraintlayout.widget.ConstraintLayout>
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="1dp"
+                        android:id="@+id/ll_brand"
                         android:background="@color/line_grey"
                         android:layout_marginLeft="14dp"
                         android:layout_marginRight="14dp"/>

consumer/src/main/java/com/xx/hbhconsumer/ui/login/LoginViewModel.java

@@ -340,7 +340,6 @@ public class LoginViewModel extends BaseViewModel<LoginRequest> {
                         } else {
                             /*强制更新标识位变更--重置用户登录*/
                             StaticData.updateLogin = 1;
-                            ToastUtils.showShort("版本已是最新！");
                         }
 
 

hbhbcompany/build.gradle

@@ -59,7 +59,7 @@ android {
         debug {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            buildConfigField "String", "URL", URL_DEBUG
+            buildConfigField "String", "URL", URL_RELEASE
             buildConfigField "String", "URL_H5", URL_DEBUG_H5
         }
     }

hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/home/HomeViewModel.java

@@ -178,7 +178,6 @@ public class HomeViewModel extends ListBaseViewModel<HomeRequest> {
                             }
 
                         } else {
-                            ToastUtils.showShort("版本已是最新！");
                         }
                     }
 

hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/login/LoginViewModel.java

@@ -155,7 +155,6 @@ public class LoginViewModel extends BaseViewModel<LoginRequest> {
 
                             /*强制更新标识位变更--重置用户登录*/
                             StaticData.updateLogin = 1;
-                            ToastUtils.showShort("版本已是最新！");
                         }
 
 
@@ -307,7 +306,6 @@ public class LoginViewModel extends BaseViewModel<LoginRequest> {
                                 } else {
                                     /*强制更新标识位变更--重置用户登录*/
                                     StaticData.updateLogin = 1;
-                                    ToastUtils.showShort("版本已是最新！");
                                 }
 
 

hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/mine/MineFragment.java

@@ -104,8 +104,7 @@ public class MineFragment extends BaseFragment<FragmentMineBinding, MineViewMode
         super.onResume();
         // 检查版本
         viewModel.rxPermissions = new RxPermissions(this);
-        /*检查版本*/
-        viewModel.checkVersion(binding.getRoot().getRootView());
+
         // 安装新版本
         viewModel.openInstall.observe(this, new Observer<String>() {
             @Override

hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/mine/MineViewModel.java

@@ -229,7 +229,11 @@ public class MineViewModel extends BaseViewModel<MineRequest> {
                             }
 
                         } else {
-                            ToastUtils.showShort("版本已是最新！");
+                            if(view!=null)
+                            {
+                                ToastUtils.showShort("版本已是最新！");
+                            }
+
                         }
                     }
 

hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/work/WorkViewModel.java

@@ -139,7 +139,6 @@ public class WorkViewModel extends BaseViewModel<WorkRequest> {
                             }
 
                         } else {
-                            ToastUtils.showShort("版本已是最新！");
                         }
                     }