公共询价需求调整

app_core/common/src/main/java/com/core/app/Constants.java

@@ -10,16 +10,15 @@ public class Constants {
     public static final String BASE_URL_LOGIN = "http://manage.ubtob.com/public/account";
     //账户中心地址
     public static final String ACCOUNT_CENTER_HOST = "https://sso.ubtob.com/";
-//    public static final String ACCOUNT_CENTER_HOST = "http://10.1.51.91:3001/";
+    //    public static final String ACCOUNT_CENTER_HOST = "http://10.1.51.91:3001/";
     //    public static final String ACCOUNT_CENTER_HOST = "https://account.ubtob.com/";
     //IM正式地址
     public static final String IM_BASE_URL = "http://113.105.74.140:8092/";
     //IM测试地址
     public static final String IM_BASE_URL_TEST = "http://113.105.74.135:8092/";
     //询价服务正式地址
-    public static final String API_INQUIRY = "https://api-inquiry.usoftmall.com/";
-//    public static final String API_INQUIRY = "http://192.168.253.192:8080/";
-//    public static final String API_INQUIRY = "http://192.168.253.102:24001/";
+//    public static final String API_INQUIRY = "https://api-inquiry.usoftmall.com/";
+    public static final String API_INQUIRY = "http://218.17.158.219:24000/";
 
     public static String IM_BASE_URL() {
         String url = "";

app_core/common/src/main/res/layout/view_public_inquiry_empty.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout android:id="@+id/rl_empty"
+                xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:id="@+id/textViewMessage"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:layout_marginTop="16dp"
+            android:drawableTop="@drawable/ic_empty"
+            android:gravity="center"
+            android:paddingLeft="26dp"
+            android:paddingRight="26dp"
+            android:text="当前企业没有任何相关询价单，请前往系统维护产品库"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@color/gray_light" />
+
+        <Button
+            android:id="@+id/buttonEmpty"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/textViewMessage"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="16dp"
+            android:text="@string/empty_button"
+            android:visibility="gone" />
+    </RelativeLayout>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+</RelativeLayout>

app_modular/appworks/src/main/java/com/uas/appworks/activity/CustomerInquiryListActivity.java

@@ -51,7 +51,7 @@ public class CustomerInquiryListActivity extends BaseMVPActivity<WorkPlatPresent
         ActionBar bar = this.getSupportActionBar();
         bar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
         bar.setCustomView(mSearchActionView);
-        mSearchActionView.setSearchHint(getString(R.string.customer_inquiry_search_hint));
+        mSearchActionView.setSearchHint(getString(R.string.str_customer_inquiry_list));
 
         mTabPageIndicator = (TabPageIndicator) findViewById(R.id.tab_viewpager_tab);
         mUnderlinePageIndicator = (UnderlinePageIndicator) findViewById(R.id.tab_viewpager_undertab);

app_modular/appworks/src/main/java/com/uas/appworks/activity/InviteRegisterMainActivity.java

@@ -292,7 +292,13 @@ public class InviteRegisterMainActivity extends BaseMVPActivity<WorkPlatPresente
         int id = view.getId();
         if (id == R.id.invite_register_main_invite_btn) {
             if (CommonUtil.isNetWorkConnected(mContext)) {
-                inviteClick();
+                if (TextUtils.isEmpty(CommonUtil.getEnuu(this))) {
+                    toast("您的企业还未注册优软云，请联系管理员注册企业优软云!");
+                } else if (TextUtils.isEmpty(CommonUtil.getUseruu(this))) {
+                    toast("您还不是优软云的个人用户，请联系管理员开通！");
+                } else {
+                    inviteClick();
+                }
             } else {
                 toast(R.string.networks_out);
             }

app_modular/appworks/src/main/java/com/uas/appworks/activity/PublicInquiryListActivity.java

@@ -49,7 +49,7 @@ public class PublicInquiryListActivity extends BaseMVPActivity<WorkPlatPresenter
         ActionBar bar = this.getSupportActionBar();
         bar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
         bar.setCustomView(mSearchActionView);
-        mSearchActionView.setSearchHint(getString(R.string.public_inquiry_search_hint));
+        mSearchActionView.setSearchHint(getString(R.string.str_public_inquiry_list));
 
         mTabPageIndicator = (TabPageIndicator) findViewById(R.id.tab_viewpager_tab);
         mUnderlinePageIndicator = (UnderlinePageIndicator) findViewById(R.id.tab_viewpager_undertab);

app_modular/appworks/src/main/java/com/uas/appworks/activity/PurchaseOrderListActivity.java

@@ -50,7 +50,7 @@ public class PurchaseOrderListActivity extends BaseMVPActivity {
         ActionBar bar = this.getSupportActionBar();
         bar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
         bar.setCustomView(mSearchActionView);
-        mSearchActionView.setSearchHint(getString(R.string.purchase_order_search_hint));
+        mSearchActionView.setSearchHint(getString(R.string.str_purchase_order_list));
 
         mTabPageIndicator = (TabPageIndicator) findViewById(R.id.tab_viewpager_tab);
         mUnderlinePageIndicator = (UnderlinePageIndicator) findViewById(R.id.tab_viewpager_undertab);

app_modular/appworks/src/main/java/com/uas/appworks/fragment/B2BBusinessListFragment.java

@@ -88,7 +88,8 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
                 mListUrl = "mobile/sale/inquiry/info/search";
                 break;
             case B2BBusinessListBean.PUBLIC_INQUIRY_LIST:
-                mListUrl = "inquiry/public/mobile";
+//                mListUrl = "inquiry/public/mobile";
+                mListUrl = "inquiry/public/mobile/v2";
                 break;
             default:
                 mListUrl = "mobile/sale/orders/info/search";
@@ -348,7 +349,12 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
                             hideLoading();
                             mB2BBusinessListBeans.clear();
                             mB2BBusinessListAdapter.notifyDataSetChanged();
-                            mB2BBusinessListAdapter.setEmptyView(R.layout.view_empty, (ViewGroup) mRecyclerView.getParent());
+                            if (mListType == B2BBusinessListBean.PUBLIC_INQUIRY_LIST
+                                    && TextUtils.isEmpty(mListState)) {
+                                mB2BBusinessListAdapter.setEmptyView(R.layout.view_public_inquiry_empty, (ViewGroup) mRecyclerView.getParent());
+                            } else {
+                                mB2BBusinessListAdapter.setEmptyView(R.layout.view_empty, (ViewGroup) mRecyclerView.getParent());
+                            }
                         } else {
                             if (mRefreshLayout != null && mRefreshLayout.isLoading()) {
                                 mRefreshLayout.finishLoadmoreWithNoMoreData();

app_modular/appworks/src/main/res/values-en/strings.xml

@@ -59,7 +59,7 @@
     <!--B2B商务-->
     <string name="str_purchase_order_list">客户采购订单</string>
     <string name="str_customer_inquiry_list">客户询价单</string>
-    <string name="str_public_inquiry_list">公共询价</string>
+    <string name="str_public_inquiry_list">我的商机</string>
     <string name="str_bill_num">单号：</string>
     <string name="str_material_num">物料编号：</string>
     <string name="str_money">金额：</string>

app_modular/appworks/src/main/res/values-zh-rCN/strings.xml

@@ -58,7 +58,7 @@
     <!--B2B商务-->
     <string name="str_purchase_order_list">客户采购订单</string>
     <string name="str_customer_inquiry_list">客户询价单</string>
-    <string name="str_public_inquiry_list">公共询价</string>
+    <string name="str_public_inquiry_list">我的商机</string>
     <string name="str_bill_num">单号：</string>
     <string name="str_material_num">物料编号：</string>
     <string name="str_money">金额：</string>

app_modular/appworks/src/main/res/values-zh-rTW/strings.xml

@@ -58,7 +58,7 @@
     <!--B2B商务-->
     <string name="str_purchase_order_list">客户采购订单</string>
     <string name="str_customer_inquiry_list">客户询价单</string>
-    <string name="str_public_inquiry_list">公共询价</string>
+    <string name="str_public_inquiry_list">我的商机</string>
     <string name="str_bill_num">单号：</string>
     <string name="str_material_num">物料编号：</string>
     <string name="str_money">金额：</string>

app_modular/appworks/src/main/res/values/strings.xml

@@ -91,7 +91,7 @@
     <!--B2B商务-->
     <string name="str_purchase_order_list">客户采购订单</string>
     <string name="str_customer_inquiry_list">客户询价单</string>
-    <string name="str_public_inquiry_list">公共询价</string>
+    <string name="str_public_inquiry_list">我的商机</string>
     <string name="str_bill_num">单号：</string>
     <string name="str_material_num">物料编号：</string>
     <string name="str_money">金额：</string>