提交分类： 测试版本；

提交内容：  商机管理备份
           B2B地址更换
当前版本：  正式版本6.4.4
是否冲突：  否

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/WorkMenuParentAdapter.java

@@ -239,9 +239,9 @@ public class WorkMenuParentAdapter extends BaseAdapter {
                     String b_enuu = com.xzjmyk.pm.activity.util.oa.CommonUtil.getSharedPreferences(context, "erp_uu");
                     String url = "";
                     if (StringUtil.isEmpty(b_enuu)) {
-                        url = "http://uas.ubtob.com/authen?b_username=" + phone + "&b_password=" + password;
+                        url = "http://b2b.usoftchina.com/authen?b_username=" + phone + "&b_password=" + password;
                     } else {
-                        url = "http://uas.ubtob.com/authen?b_username=" + phone + "&b_password=" + password + "&b_enuu=" + b_enuu;
+                        url = "http://b2b.usoftchina.com/authen?b_username=" + phone + "&b_password=" + password + "&b_enuu=" + b_enuu;
                     }
                     intent.putExtra("url", url);
                     intent.putExtra("p", context.getString(R.string.work_business_me));
@@ -251,8 +251,8 @@ public class WorkMenuParentAdapter extends BaseAdapter {
                     String enuu = CommonUtil.getEnuu(context);
                     String url = Constants.ACCOUNT_CENTER_HOST +
                             "agency?token=" + accountToken + "&appId=mall&spaceUU=" + enuu
-                            + "&returnURL=https://www.usoftmall.com/"
-                            + "&baseURL=https://www.usoftmall.com/newLogin/other";
+                            + "&returnURL=https://mall.usoftchina.com/"
+                            + "&baseURL=https://mall.usoftchina.com/newLogin/other";
                     intent.putExtra("url", url);
                     intent.putExtra("p", context.getString(R.string.work_business_find));
                     intent.putExtra("cookie", true);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/WorksFragment.java

@@ -138,9 +138,9 @@ public class WorksFragment extends EasyFragment implements View.OnClickListener
                 String b_enuu = CommonUtil.getSharedPreferences(getActivity(), "erp_uu");
                 String url = "";
                 if (StringUtil.isEmpty(b_enuu)) {
-                    url = "http://uas.ubtob.com/authen?b_username=" + phone + "&b_password=" + password;
+                    url = "http://b2b.usoftchina.com/authen?b_username=" + phone + "&b_password=" + password;
                 } else {
-                    url = "http://uas.ubtob.com/authen?b_username=" + phone + "&b_password=" + password + "&b_enuu=" + b_enuu;
+                    url = "http://b2b.usoftchina.com/authen?b_username=" + phone + "&b_password=" + password + "&b_enuu=" + b_enuu;
                 }
                 CommonUtil.setSharedPreferences(MyApplication.getInstance(), Constants.new_business, true);
 

app_core/common/src/main/java/com/core/api/wxapi/ApiPlatform.java

@@ -19,11 +19,11 @@ public class ApiPlatform extends ApiBase implements ApiModel {
 
     public ApiPlatform() {
         if (BaseConfig.isDebug()) {
-            mBaseUrl = "http://uas.ubtob.com/";
+            mBaseUrl = "http://b2b.usoftchina.com/";
 //            mBaseUrl = "http://218.17.158.219:9000/b2b-test/";
             super.login = Constants.ACCOUNT_CENTER_HOST + "sso/login";
         } else {
-            mBaseUrl = "http://uas.ubtob.com/";
+            mBaseUrl = "http://b2b.usoftchina.com/";
 //            mBaseUrl = "http://218.17.158.219:9000/b2b-test/";
             super.login = Constants.ACCOUNT_CENTER_HOST + "sso/login";
         }

app_core/common/src/main/java/com/core/utils/CommonUtil.java

@@ -215,7 +215,7 @@ public class CommonUtil {
         if (ct == null) {
             return "";
         }
-        return "https://api-inquiry.usoftmall.com/";
+        return "https://api-inquiry.usoftchina.com/";
     }
     //日程管理网址
     public static String getSchedulerBaseUrl() {

app_modular/applogin/src/main/java/com/modular/login/activity/EnterpriseRegisterActivity.java

@@ -767,7 +767,7 @@ public class EnterpriseRegisterActivity extends BaseActivity implements View.OnC
         spannableString.setSpan(new ClickableSpan() {
             @Override
             public void onClick(View widget) {
-                IntentUtils.webLinks(ct, "http://www.usoftmall.com/help#/issue/50", "优软商城服务条款");
+                IntentUtils.webLinks(ct, "https://mall.usoftchina.com/help#/issue/50", "优软商城服务条款");
             }
         }, 17, 27, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
         spannableString.setSpan(new ForegroundColorSpan(Color.BLUE), 17, 27, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
@@ -776,7 +776,7 @@ public class EnterpriseRegisterActivity extends BaseActivity implements View.OnC
         spannableString.setSpan(new ClickableSpan() {
             @Override
             public void onClick(View widget) {
-                IntentUtils.webLinks(ct, "http://www.usoftmall.com/help#/issue/16", "优软商城买卖条款");
+                IntentUtils.webLinks(ct, "https://mall.usoftchina.com//help#/issue/16", "优软商城买卖条款");
             }
         }, 28, 38, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
         spannableString.setSpan(new ForegroundColorSpan(Color.BLUE), 28, 38, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);

app_modular/apputils/src/main/java/com/modular/apputils/activity/SimpleWebActivity.java

@@ -151,7 +151,7 @@ public class SimpleWebActivity extends OABaseActivity implements ReaderCallback
                     LogUtil.d(TAG, o.toString());
                     String token = JSON.parseObject(o.toString()).getString("content");
 
-                    String url = "https://account.ubtob.com/sso/login/proxy?appId=b2b&returnURL=https://www.usoftmall.com/&token=" + token + "&baseURL=https://www.usoftmall.com/login/other&isLoginAll=false";
+                    String url = "https://sso.ubtob.com/sso/login/proxy?appId=b2b&returnURL=https://mall.usoftchina.com/&token=" + token + "&baseURL=https://mall.usoftchina.com//login/other&isLoginAll=false";
                     webView.loadUrl(url);
                 } catch (Exception e) {
                     e.printStackTrace();

app_modular/appworks/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.uas.appworks">
+<manifest package="com.uas.appworks"
+          xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.READ_CALENDAR" />
     <uses-permission android:name="android.permission.WRITE_CALENDAR" />
@@ -30,7 +30,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        <activity android:name=".OA.erp.activity.CommonDocDetailsActivity" >
+        <activity android:name=".OA.erp.activity.CommonDocDetailsActivity">
             <intent-filter>
                 <action android:name="com.modular.form.erp.activity.CommonDocDetailsActivity" />
 
@@ -60,7 +60,7 @@
             android:name=".OA.erp.activity.form.FormListSelectActivity"
             android:hardwareAccelerated="false"
             android:launchMode="singleTask"
-            android:windowSoftInputMode="adjustPan" >
+            android:windowSoftInputMode="adjustPan">
             <intent-filter>
                 <action android:name="com.modular.work.OA.erp.activity.form.FormListSelectActivity" />
 
@@ -505,9 +505,10 @@
             </intent-filter>
         </activity>
         <activity android:name=".activity.TimeHelperSettingActivity" />
-        <activity android:name=".crm3_0.activity.CustomerVisitActivity"
-            android:label="@string/crm_customer_visit"/>
-        <activity android:name=".crm3_0.activity.CustomerListActivity"/>
+        <activity
+            android:name=".crm3_0.activity.CustomerVisitActivity"
+            android:label="@string/crm_customer_visit" />
+        <activity android:name=".crm3_0.activity.CustomerListActivity" />
         <activity android:name=".crm3_0.activity.ContactsListActivity"></activity>
         <activity android:name=".crm3_0.activity.CustomerManageActivity">
             <intent-filter>
@@ -536,7 +537,8 @@
         <activity android:name=".crm3_0.activity.CustomerVisitDetailsActivity" />
         <activity android:name=".activity.businessManage.businessDetailActivity.BusinessDetailNewActivity" />
         <activity android:name=".activity.businessManage.BusinessCompanyListActivity" />
-        <activity android:name=".activity.businessManage.businessChangeStage.BusinessChangeStageActivity"/>
+        <activity android:name=".activity.businessManage.businessChangeStage.BusinessChangeStageActivity" />
+        <activity android:name=".activity.businessManage.BusinessBillInputActivity" />
     </application>
 
 </manifest>

app_modular/appworks/src/main/java/com/uas/appworks/activity/businessManage/BusinessBillInputActivity.java

@@ -0,0 +1,29 @@
+package com.uas.appworks.activity.businessManage;
+
+import android.content.Intent;
+import android.widget.Toast;
+
+import com.core.app.Constants;
+import com.modular.apputils.activity.BillInputActivity;
+
+/**
+ * @author RaoMeng
+ * @describe
+ * @date 2018/9/25 10:03
+ */
+public class BusinessBillInputActivity extends BillInputActivity {
+
+    @Override
+    public void toDataFormList() {
+        startActivity(new Intent(mContext, BusinessCompanyListActivity.class)
+                .putExtra(Constants.FLAG.COMMON_WHICH_PAGE, BusinessCompanyListActivity.PAGE_BUSINESS_COMPANY));
+    }
+
+    @Override
+    public void commitSuccess() {
+        Toast.makeText(this, "商机新建成功", Toast.LENGTH_LONG).show();
+        startActivity(new Intent(mContext, BusinessCompanyListActivity.class)
+                .putExtra(Constants.FLAG.COMMON_WHICH_PAGE, BusinessCompanyListActivity.PAGE_BUSINESS_COMPANY));
+        finish();
+    }
+}

app_modular/appworks/src/main/java/com/uas/appworks/activity/businessManage/businessDetailActivity/BusinessDetailNewActivity.java

@@ -33,6 +33,7 @@ import com.uas.appworks.activity.businessManage.businessStage.BusinessStageActiv
 import com.uas.appworks.adapter.CommonFormDetailAdapter;
 import com.uas.appworks.adapter.TabViewpagerAdapter;
 import com.uas.appworks.fragment.BusinessMineListFragment;
+import com.uas.appworks.fragment.BusinessRecordsFragment;
 import com.uas.appworks.model.bean.BusinessStageBean;
 import com.uas.appworks.model.bean.CommonFormBean;
 
@@ -68,7 +69,8 @@ public class BusinessDetailNewActivity extends MvpBaseActivity<BusinessDetailCon
     private BusinessStageBean mCurrentBusinessStage;
     private int mId;
     private String mBctype, mStageCode, mBcCode, mBcdescription, mWhichPage;
-    private BusinessMineListFragment mChargeFragment, mBranchFragment;
+    private BusinessMineListFragment mProductFragment;
+    private BusinessRecordsFragment mRecordsFragment;
     private PopupWindow mFollowPopupWindow;
     private View mFollowView;
 
@@ -149,12 +151,12 @@ public class BusinessDetailNewActivity extends MvpBaseActivity<BusinessDetailCon
         mTabLayout.addTab(mTabLayout.newTab().setText(mTitleStrings.get(0)));
         mTabLayout.addTab(mTabLayout.newTab().setText(mTitleStrings.get(1)));
 
-        mChargeFragment = BusinessMineListFragment.newInstance(BusinessMineListFragment.FLAG_BUSINESS_ASSOCIATED, mBcCode);
-        mBranchFragment = BusinessMineListFragment.newInstance(BusinessMineListFragment.FLAG_BUSINESS_ASSOCIATED, mBcCode);
+        mRecordsFragment = BusinessRecordsFragment.newInstance(mId);
+        mProductFragment = BusinessMineListFragment.newInstance(BusinessMineListFragment.FLAG_BUSINESS_ASSOCIATED, mBcCode);
 
         mFragments = new ArrayList<>();
-        mFragments.add(mChargeFragment);
-        mFragments.add(mBranchFragment);
+        mFragments.add(mRecordsFragment);
+        mFragments.add(mProductFragment);
         mTabViewpagerAdapter = new TabViewpagerAdapter(this, mFragments, mTitleStrings, getSupportFragmentManager());
 
         mViewPager.setOffscreenPageLimit(mFragments.size() - 1);

app_modular/appworks/src/main/java/com/uas/appworks/activity/businessManage/businessManageHome/BusinessManageHomeActivity.java

@@ -21,13 +21,13 @@ import com.core.app.Constants;
 import com.core.base.activity.MvpBaseActivity;
 import com.core.utils.CommonUtil;
 import com.core.utils.time.wheel.OASigninPicker;
-import com.modular.apputils.activity.BillInputActivity;
 import com.modular.apputils.utils.RecyclerItemDecoration;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
 import com.uas.appworks.CRM.erp.activity.BusinessActivity;
 import com.uas.appworks.CRM.erp.activity.BusinessDetailActivty;
 import com.uas.appworks.R;
+import com.uas.appworks.activity.businessManage.BusinessBillInputActivity;
 import com.uas.appworks.activity.businessManage.BusinessCompanyListActivity;
 import com.uas.appworks.activity.businessManage.BusinessOvertimeListActivity;
 import com.uas.appworks.activity.businessManage.BusinessRankListActivity;
@@ -235,7 +235,7 @@ public class BusinessManageHomeActivity extends MvpBaseActivity<BusinessManageHo
         } else if (i == R.id.business_manage_home_funnel_ll) {
             startActivity(BusinessActivity.class);
         } else if (i == R.id.business_home_menu1) {
-            startActivity(new Intent(ct, BillInputActivity.class)
+            startActivity(new Intent(ct, BusinessBillInputActivity.class)
                     .putExtra(Constants.Intents.CALLER, "ProjectBusinessChance")
                     .putExtra(Constants.Intents.TITLE, "项目商机")
                     .putExtra(Constants.Intents.ID, 0));
@@ -244,7 +244,7 @@ public class BusinessManageHomeActivity extends MvpBaseActivity<BusinessManageHo
             }
             DisplayUtil.backgroundAlpha(mContext, 1f);
         } else if (i == R.id.business_home_menu2) {
-            startActivity(new Intent(ct, BillInputActivity.class)
+            startActivity(new Intent(ct, BusinessBillInputActivity.class)
                     .putExtra(Constants.Intents.CALLER, "OEMBusinessChance")
                     .putExtra(Constants.Intents.TITLE, "OEM商机")
                     .putExtra(Constants.Intents.ID, 0));

app_modular/appworks/src/main/java/com/uas/appworks/adapter/BusinessRecordsAdapter.java

@@ -0,0 +1,27 @@
+package com.uas.appworks.adapter;
+
+import android.support.annotation.Nullable;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.uas.appworks.R;
+import com.uas.appworks.model.bean.BusinessFollowBean;
+
+import java.util.List;
+
+/**
+ * @author RaoMeng
+ * @describe
+ * @date 2018/9/25 11:24
+ */
+public class BusinessRecordsAdapter extends BaseQuickAdapter<BusinessFollowBean, BaseViewHolder> {
+
+    public BusinessRecordsAdapter(@Nullable List<BusinessFollowBean> data) {
+        super(R.layout.item_business_records, data);
+    }
+
+    @Override
+    protected void convert(BaseViewHolder helper, BusinessFollowBean item) {
+
+    }
+}

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

@@ -0,0 +1,105 @@
+package com.uas.appworks.fragment;
+
+import android.os.Bundle;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+
+import com.common.LogUtil;
+import com.core.base.fragment.BaseMVPFragment;
+import com.core.base.presenter.SimplePresenter;
+import com.core.base.view.SimpleView;
+import com.core.utils.CommonUtil;
+import com.me.network.app.base.HttpParams;
+import com.me.network.app.http.Method;
+import com.modular.apputils.utils.RecyclerItemDecoration;
+import com.scwang.smartrefresh.layout.api.RefreshLayout;
+import com.uas.appworks.R;
+import com.uas.appworks.adapter.BusinessRecordsAdapter;
+import com.uas.appworks.model.bean.BusinessFollowBean;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author RaoMeng
+ * @describe
+ * @date 2018/9/25 10:24
+ */
+public class BusinessRecordsFragment extends BaseMVPFragment<SimplePresenter> implements SimpleView {
+    private static final String ARGUMENTS_BUSINESS_BCID = "arguments_business_bcid";
+
+    private RefreshLayout mRefreshLayout;
+    private RecyclerView mRecyclerView;
+    private List<BusinessFollowBean> mBusinessFollowBeans;
+    private BusinessRecordsAdapter mBusinessRecordsAdapter;
+
+    private long mBcId;
+
+    public static BusinessRecordsFragment newInstance(long bc_id) {
+        BusinessRecordsFragment businessRecordsFragment = new BusinessRecordsFragment();
+        Bundle bundle = new Bundle();
+        bundle.putLong(ARGUMENTS_BUSINESS_BCID, bc_id);
+        businessRecordsFragment.setArguments(bundle);
+        return businessRecordsFragment;
+    }
+
+    @Override
+    protected int getLayout() {
+        return R.layout.fragment_business_mine_list;
+    }
+
+    @Override
+    protected SimplePresenter initPresenter() {
+        return new SimplePresenter();
+    }
+
+    @Override
+    protected void initViews() {
+        mRefreshLayout = $(R.id.business_mine_list_refresh);
+        mRefreshLayout.setEnableRefresh(false);
+        mRefreshLayout.setEnableLoadMore(false);
+
+        mRecyclerView = $(R.id.business_mine_list_rv);
+        mRecyclerView.setLayoutManager(new LinearLayoutManager(mContext));
+        mRecyclerView.addItemDecoration(new RecyclerItemDecoration(1));
+        mBusinessFollowBeans = new ArrayList<>();
+        mBusinessRecordsAdapter = new BusinessRecordsAdapter(mBusinessFollowBeans);
+        mRecyclerView.setAdapter(mBusinessRecordsAdapter);
+    }
+
+    @Override
+    protected void initEvents() {
+
+    }
+
+    @Override
+    protected void initDatas() {
+        mPresenter.httpRequest(mContext, CommonUtil.getAppBaseUrl(mContext),
+                new HttpParams.Builder()
+                        .url("mobile/crm/businessChanceRecords.action")
+                        .method(Method.GET)
+                        .addParam("bcid", 68112)
+                        .addHeader("Cookie", CommonUtil.getErpCookie(mContext))
+                        .build());
+    }
+
+    @Override
+    public void requestSuccess(int what, Object object) {
+        LogUtil.prinlnLongMsg("raomRecordsSuc", object.toString());
+    }
+
+    @Override
+    public void requestError(int what, String errorMsg) {
+        LogUtil.prinlnLongMsg("raomRecordsFail", errorMsg);
+    }
+
+    @Override
+    public void showLoading(String loadStr) {
+        progressDialog.show();
+    }
+
+    @Override
+    public void hideLoading() {
+        progressDialog.dismiss();
+    }
+}

app_modular/appworks/src/main/java/com/uas/appworks/model/bean/BusinessFollowBean.java

@@ -0,0 +1,10 @@
+package com.uas.appworks.model.bean;
+
+/**
+ * @author RaoMeng
+ * @describe
+ * @date 2018/9/25 11:25
+ */
+public class BusinessFollowBean {
+
+}

app_modular/appworks/src/main/res/layout/item_business_records.xml

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/white"
+    android:orientation="vertical"
+    android:padding="6dp">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="4dp">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:textColor="#FF333333"
+            android:textSize="15sp"
+            tools:text="业务员A" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:textColor="#FF666666"
+            android:textSize="12sp"
+            tools:text="9-20 10:22" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="4dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="阶段变更："
+            android:textColor="#FF666666"
+            android:textSize="12sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textColor="#FF666666"
+            android:textSize="12sp"
+            tools:text="阶段A-阶段B(手动变更)"
+            />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="4dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="备注："
+            android:textColor="#FF666666"
+            android:textSize="12sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textColor="#FF666666"
+            android:textSize="12sp"
+            tools:text="客户对产品有意向客户对产品有意向客户对产品有意"
+            />
+    </LinearLayout>
+</LinearLayout>