提交分类： 测试版本；

提交内容：  替代型号报价
当前版本：  正式版本6.3.6
是否冲突：  否

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Fri Jul 13 14:41:57 CST 2018
+#Fri Jul 20 10:03:40 CST 2018
 debugName=517
-versionName=636
+versionName=639
 debugCode=517
-versionCode=177
+versionCode=180

app_core/common/src/main/java/com/core/utils/time/wheel/DateTimePicker.java

@@ -86,6 +86,7 @@ public class DateTimePicker extends WheelPicker {
         LinearLayout layout = new LinearLayout(activity);
         layout.setOrientation(LinearLayout.HORIZONTAL);
         layout.setGravity(Gravity.CENTER);
+        layout.setLayoutParams(new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT));
         WheelView yearView = new WheelView(activity.getBaseContext());
         yearView.setLayoutParams(new LinearLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT));
         yearView.setTextSize(textSize);

app_modular/appworks/src/main/AndroidManifest.xml

@@ -431,7 +431,6 @@
 
         <activity
             android:name=".activity.CustomerInquiryDetailActivity"
-            android:launchMode="singleTask"
             android:windowSoftInputMode="adjustResize|stateHidden">
             <intent-filter>
                 <action android:name="com.modular.work.platform.activity.CustomerInquiryDetailActivity" />
@@ -440,7 +439,6 @@
         </activity>
         <activity
             android:name=".OA.platform.activity.PurchaseDetailsActivity"
-            android:launchMode="singleTask"
             android:theme="@style/MainBaseTheme">
             <intent-filter>
                 <action android:name="com.modular.work.platform.activity.PurchaseDetailsActivity" />
@@ -456,8 +454,7 @@
 
         <activity
             android:name=".activity.PublicInquiryQuoteActivity"
-            android:launchMode="singleTask"
-            android:windowSoftInputMode="adjustResize|stateHidden">
+            android:windowSoftInputMode="adjustPan|stateHidden">
             <intent-filter>
                 <action android:name="com.modular.work.platform.activity.PublicInquiryQuoteActivity" />
                 <category android:name="android.intent.category.DEFAULT" />

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

@@ -603,6 +603,9 @@ public class B2BBusinessMainActivity extends BaseMVPActivity<WorkPlatPresenter>
                 b2BBusinessListBean.setItemType(B2BBusinessListBean.PUBLIC_INQUIRY_LIST);
 
                 int quoted = JSONUtil.getInt(contentObject, "quoted");
+                if (TextUtils.isEmpty(JSONUtil.getText(contentObject, "quoted"))) {
+                    quoted = 1;
+                }
 
                 if (TextUtils.isEmpty(contentObject.getString("quteId"))) {
                     b2BBusinessListBean.setId(JSONUtil.getText(contentObject, "id"));

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

@@ -364,7 +364,7 @@ public class CompanyBusinessListActivity extends BaseMVPActivity<SimplePresenter
                 if (quoted == 1) {
                     b2BBusinessListBean.setBillState(Constants.FLAG.STATE_COMPANY_BUSINESS_DONE);
                 } else {
-                    b2BBusinessListBean.setJsonData(quotationObject.toString());
+                    b2BBusinessListBean.setJsonData(contentObject.toString());
                     if (remainingTime <= 0) {
                         b2BBusinessListBean.setBillState(Constants.FLAG.STATE_COMPANY_BUSINESS_INVALID);
                     } else {

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

@@ -22,6 +22,7 @@ import com.core.api.wxapi.ApiPlatform;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.activity.BaseMVPActivity;
+import com.core.base.view.AndroidBug5497Workaround;
 import com.core.utils.CommonUtil;
 import com.me.network.app.base.HttpCallback;
 import com.me.network.app.base.HttpParams;
@@ -76,6 +77,7 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
 
     @Override
     protected void initView() {
+        AndroidBug5497Workaround.assistActivity(this);
         mDataRecyclerView = $(R.id.customer_inquiry_detail_data_rv);
         mQuoteRecyclerView = $(R.id.customer_inquiry_detail_quote_rv);
         mAddImageView = $(R.id.customer_inquiry_detail_add_iv);

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

@@ -22,6 +22,7 @@ import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.activity.BaseMVPActivity;
 import com.core.base.presenter.SimplePresenter;
+import com.core.base.view.AndroidBug5497Workaround;
 import com.core.base.view.SimpleView;
 import com.core.utils.CommonUtil;
 import com.me.network.app.base.HttpParams;
@@ -77,6 +78,7 @@ public class PublicInquiryQuoteActivity extends BaseMVPActivity<SimplePresenter>
 
     @Override
     protected void initView() {
+        AndroidBug5497Workaround.assistActivity(this);
         mDataRv = $(R.id.public_inquiry_quote_data_rv);
         mQuoteTabRg = $(R.id.public_inquiry_quote_tab_rg);
         mCurrentRb = $(R.id.public_inquiry_quote_current_rb);
@@ -374,8 +376,8 @@ public class PublicInquiryQuoteActivity extends BaseMVPActivity<SimplePresenter>
             }
             publicInquiryItem.setSourceId(Long.parseLong(mId));
             publicInquiryItem.setVendUU(Long.valueOf(mEnuu));
-//            publicInquiryItem.setVendUserUU(Long.valueOf(CommonUtil.getSharedPreferences(mContext, "b2b_uu")));
-            publicInquiryItem.setVendUserUU(1000003217L);
+            publicInquiryItem.setVendUserUU(Long.valueOf(CommonUtil.getSharedPreferences(mContext, "b2b_uu")));
+//            publicInquiryItem.setVendUserUU(1000003217L);
             publicInquiryItem.setLeadtime(Long.valueOf(leadtime));
             publicInquiryItem.setCurrency(currency);
             publicInquiryItem.setIsReplace((short) 0);
@@ -432,8 +434,8 @@ public class PublicInquiryQuoteActivity extends BaseMVPActivity<SimplePresenter>
 
             publicInquiryItem.setSourceId(Long.parseLong(mId));
             publicInquiryItem.setVendUU(Long.valueOf(mEnuu));
-//            publicInquiryItem.setVendUserUU(Long.valueOf(CommonUtil.getSharedPreferences(mContext, "b2b_uu")));
-            publicInquiryItem.setVendUserUU(1000003217L);
+            publicInquiryItem.setVendUserUU(Long.valueOf(CommonUtil.getSharedPreferences(mContext, "b2b_uu")));
+//            publicInquiryItem.setVendUserUU(1000003217L);
             publicInquiryItem.setLeadtime(Long.valueOf(leadtime));
             publicInquiryItem.setCurrency(currency);
             publicInquiryItem.setReplaceBrand(brand);
@@ -533,7 +535,6 @@ public class PublicInquiryQuoteActivity extends BaseMVPActivity<SimplePresenter>
                     if (object != null) {
                         result = object.toString();
                     }
-                    initEditable(false, View.GONE);
                     mCurrentRb.setEnabled(true);
                     mReplaceRb.setEnabled(true);
                     mCurrentQuoteBtn.setEnabled(true);
@@ -549,6 +550,7 @@ public class PublicInquiryQuoteActivity extends BaseMVPActivity<SimplePresenter>
                             toast(message);
                             return;
                         }
+                        initEditable(false, View.GONE);
 //                        if (Constants.FLAG.STATE_PUBLIC_INQUIRY_TODO.equals(mState)) {
 //                            publicId = JSONUtil.getText(publicObject, "content");
 //                        } else if (Constants.FLAG.STATE_COMPANY_BUSINESS_TODO.equals(mState)) {

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

@@ -407,6 +407,9 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
                 b2BBusinessListBean.setItemType(B2BBusinessListBean.PUBLIC_INQUIRY_LIST);
 
                 int quoted = JSONUtil.getInt(contentObject, "quoted");
+                if (TextUtils.isEmpty(JSONUtil.getText(contentObject, "quoted"))) {
+                    quoted = 1;
+                }
 
                 if (TextUtils.isEmpty(contentObject.getString("quteId"))) {
                     b2BBusinessListBean.setId(JSONUtil.getText(contentObject, "id"));