销售漏斗需求修改

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu Apr 04 10:47:08 CST 2019
+#Fri Apr 12 10:11:25 CST 2019
 debugName=972
-versionName=671
+versionName=672
 debugCode=972
-versionCode=226
+versionCode=227

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

@@ -552,6 +552,9 @@ public class Constants {
         String MODIFY_PASSWORD_TOKEN = "modify_password_token";
 
         String COMMON_WHICH_PAGE = "common_which_page";
+
+        //商机类型
+        String BUSINESS_TYPE = "business_type";
     }
 
     public interface CACHE {

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

@@ -24,7 +24,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="42dp"
                 android:gravity="center"
-                android:text="@string/project_business_chance"
                 android:textColor="#FF139EFE"
                 android:textSize="14sp" />
 

app_core/network/src/main/java/com/me/network/app/base/HttpParams.java

@@ -44,6 +44,10 @@ public class HttpParams {
      */
     private int method;
 
+    /**
+     *
+     */
+
     private long connectTimeOut = CONNECT_TIME_OUT;
 
     private long readTimeOut = READ_TIME_OUT;

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/BusinessActivity.java

@@ -6,6 +6,7 @@ import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -108,6 +109,16 @@ public class BusinessActivity extends BaseActivity implements View.OnClickListen
             mSwitchLeftIv.setVisibility(View.GONE);
             mSwitchRightIv.setVisibility(View.VISIBLE);
             mTypeTextView.setVisibility(View.VISIBLE);
+            if (intent != null) {
+                mBusinessType = intent.getStringExtra(Constants.FLAG.BUSINESS_TYPE);
+            }
+            if (TextUtils.isEmpty(mBusinessType)) {
+                mTypeTextView.setText("公司商机");
+                mSwitchLeftIv.setVisibility(View.GONE);
+                mSwitchRightIv.setVisibility(View.GONE);
+            } else {
+                mTypeTextView.setText(mBusinessType);
+            }
         } else {
             mBottomLayout.setVisibility(View.VISIBLE);
             mSwitchLeftIv.setVisibility(View.GONE);
@@ -256,7 +267,7 @@ public class BusinessActivity extends BaseActivity implements View.OnClickListen
                 String color = chances.getJSONObject(i).getString("color");
                 int detno = chances.getJSONObject(i).getInteger("detno");
                 int count = chances.getJSONObject(i).getInteger("count");
-                double amount = chances.getJSONObject(i).getDouble("count");
+                double amount = chances.getJSONObject(i).getDouble("amount");
                 items.add("#" + color);
                 colors.add("#" + color);
                 // items.add(String.valueOf(i + 1));

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

@@ -123,7 +123,7 @@ public class BusinessOvertimeListActivity extends MvpBaseActivity<BusinessManage
     }
 
     @Override
-    public void requestOptionSuccess(String resultJson) {
+    public void requestOptionSuccess(int flag, String resultJson) {
 
     }
 

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

@@ -122,7 +122,7 @@ public class BusinessRankListActivity extends MvpBaseActivity<BusinessManageHome
     }
 
     @Override
-    public void requestOptionSuccess(String resultJson) {
+    public void requestOptionSuccess(int flag, String resultJson) {
 
     }
 

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

@@ -125,7 +125,7 @@ public class BusinessRecordListActivity extends MvpBaseActivity<BusinessManageHo
     }
 
     @Override
-    public void requestOptionSuccess(String resultJson) {
+    public void requestOptionSuccess(int flag, String resultJson) {
 
     }
 

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

@@ -22,7 +22,6 @@ 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.me.network.app.http.HttpRequest;
 import com.modular.apputils.utils.RecyclerItemDecoration;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
@@ -228,8 +227,8 @@ public class BusinessManageHomeActivity extends MvpBaseActivity<BusinessManageHo
         } else if (i == R.id.business_manage_home_grap_ll) {
             startActivity(new Intent(this, BusinessDetailActivty.class).putExtra("bt_type", 1));
         } else if (i == R.id.business_manage_home_funnel_ll) {
-            startActivity(new Intent(mContext, BusinessActivity.class)
-                    .putExtra(Constants.FLAG.COMMON_WHICH_PAGE, "businessManage"));
+            mPresenter.getOptionList(this, BusinessManageHomePresenterImpl.REQUEST_OPTION_LIST2
+                    , "sys", "isNewBusinessChance");
         } else if (i == R.id.business_home_menu1) {
             startActivity(new Intent(ct, BusinessBillInputActivity.class)
                     .putExtra(Constants.Intents.CALLER, "ProjectBusinessChance")
@@ -269,7 +268,8 @@ public class BusinessManageHomeActivity extends MvpBaseActivity<BusinessManageHo
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.add_item) {
-            mPresenter.getOptionList(this, "sys", "isNewBusinessChance");
+            mPresenter.getOptionList(this, BusinessManageHomePresenterImpl.REQUEST_OPTION_LIST1
+                    , "sys", "isNewBusinessChance");
             return true;
         }
         return super.onOptionsItemSelected(item);
@@ -328,20 +328,32 @@ public class BusinessManageHomeActivity extends MvpBaseActivity<BusinessManageHo
     }
 
     @Override
-    public void requestOptionSuccess(String resultJson) {
-        if (TextUtils.isEmpty(resultJson)) {
-            mAddCompanyBtn.setVisibility(View.VISIBLE);
-            mAddProjectBtn.setVisibility(View.GONE);
-            mAddOemBtn.setVisibility(View.GONE);
-        } else {
-            mAddCompanyBtn.setVisibility(View.GONE);
-            mAddProjectBtn.setVisibility(View.VISIBLE);
-            mAddOemBtn.setVisibility(View.VISIBLE);
-        }
-        if (mMenuPopupWindow != null) {
-            View view = getWindow().findViewById(R.id.add_item);
-            mMenuPopupWindow.showAsDropDown(view);
-            DisplayUtil.backgroundAlpha(mContext, 0.5f);
+    public void requestOptionSuccess(int flag, String resultJson) {
+        if (flag == BusinessManageHomePresenterImpl.REQUEST_OPTION_LIST1) {
+            if (TextUtils.isEmpty(resultJson)) {
+                mAddCompanyBtn.setVisibility(View.VISIBLE);
+                mAddProjectBtn.setVisibility(View.GONE);
+                mAddOemBtn.setVisibility(View.GONE);
+            } else {
+                mAddCompanyBtn.setVisibility(View.GONE);
+                mAddProjectBtn.setVisibility(View.VISIBLE);
+                mAddOemBtn.setVisibility(View.VISIBLE);
+            }
+            if (mMenuPopupWindow != null) {
+                View view = getWindow().findViewById(R.id.add_item);
+                mMenuPopupWindow.showAsDropDown(view);
+                DisplayUtil.backgroundAlpha(mContext, 0.5f);
+            }
+        } else if (flag == BusinessManageHomePresenterImpl.REQUEST_OPTION_LIST2) {
+            String type = "";
+            if (TextUtils.isEmpty(resultJson)) {
+                type = "";
+            } else {
+                type = "项目商机";
+            }
+            startActivity(new Intent(mContext, BusinessActivity.class)
+                    .putExtra(Constants.FLAG.BUSINESS_TYPE, type)
+                    .putExtra(Constants.FLAG.COMMON_WHICH_PAGE, "businessManage"));
         }
     }
 
@@ -403,7 +415,7 @@ public class BusinessManageHomeActivity extends MvpBaseActivity<BusinessManageHo
     @Override
     public void requestFail(int flag, String failStr) {
         toast(failStr);
-        if (flag == BusinessManageHomePresenterImpl.REQUEST_OPTION_LIST) {
+        if (flag == BusinessManageHomePresenterImpl.REQUEST_OPTION_LIST1) {
             mAddCompanyBtn.setVisibility(View.VISIBLE);
             mAddProjectBtn.setVisibility(View.GONE);
             mAddOemBtn.setVisibility(View.GONE);

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

@@ -29,7 +29,7 @@ public class BusinessManageHomeContract {
         void requestAllSuccess(String resultJson, List<BusinessRecordBean> businessRecordBeans,
                                List<BusinessOverTimeBean> businessOverTimeBeans, List<BusinessRankBean> businessRankBeans);
 
-        void requestOptionSuccess(String resultJson);
+        void requestOptionSuccess(int flag, String resultJson);
 
         void requestFail(int flag, String failStr);
     }
@@ -45,6 +45,6 @@ public class BusinessManageHomeContract {
 
         void getBusinessAll(Context context, String dataTime, String salesmanCode);
 
-        void getOptionList(Context context, String caller, String code);
+        void getOptionList(Context context, int flag, String caller, String code);
     }
 }

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

@@ -34,7 +34,8 @@ public class BusinessManageHomePresenterImpl extends BaseMvpPresenter<BusinessMa
     public static final int REQUEST_BUSINESS_OVERTIME = 60;
     public static final int REQUEST_BUSINESS_RANK = 61;
     public static final int REQUEST_BUSINESS_ALL = 62;
-    public static final int REQUEST_OPTION_LIST = 63;
+    public static final int REQUEST_OPTION_LIST1 = 63;
+    public static final int REQUEST_OPTION_LIST2 = 64;
 
     @Override
     public void onMvpAttachView(BusinessManageHomeContract.IBusinessManageHomeView view, Bundle savedInstanceState) {
@@ -123,13 +124,13 @@ public class BusinessManageHomePresenterImpl extends BaseMvpPresenter<BusinessMa
     }
 
     @Override
-    public void getOptionList(Context context, String caller, String code) {
+    public void getOptionList(Context context, int flag, String caller, String code) {
         getMvpView().showLoading("");
 
         HttpRequest.getInstance().sendRequest(CommonUtil.getAppBaseUrl(context),
                 new HttpParams.Builder()
                         .url("ma/setting/config.action")
-                        .flag(REQUEST_OPTION_LIST)
+                        .flag(flag)
                         .method(Method.GET)
                         .addParam("caller", caller)
                         .addParam("code", code)
@@ -200,8 +201,9 @@ public class BusinessManageHomePresenterImpl extends BaseMvpPresenter<BusinessMa
                     getMvpView().requestAllSuccess("", new ArrayList<BusinessRecordBean>(), new ArrayList<BusinessOverTimeBean>(), new ArrayList<BusinessRankBean>());
                 }
                 break;
-            case REQUEST_OPTION_LIST:
-                getMvpView().requestOptionSuccess(result);
+            case REQUEST_OPTION_LIST1:
+            case REQUEST_OPTION_LIST2:
+                getMvpView().requestOptionSuccess(flag, result);
                 break;
             default:
                 break;
@@ -309,7 +311,7 @@ public class BusinessManageHomePresenterImpl extends BaseMvpPresenter<BusinessMa
                 LogUtil.prinlnLongMsg("raoAllFail", failStr);
                 getMvpView().requestFail(flag, failStr);
                 break;
-            case REQUEST_OPTION_LIST:
+            case REQUEST_OPTION_LIST1:
                 getMvpView().requestFail(flag, failStr);
                 break;
             default: