下拉备份

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

@@ -6,7 +6,6 @@ import android.app.Activity;
 import android.content.ClipData;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.ActivityInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.net.Uri;
@@ -218,7 +217,7 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
         if (isCookie) {
             synCookies(this, url);
         } else {
-         //   clearCookie();
+            //   clearCookie();
         }
         Map<String, String> headers = new HashMap<>();
         headers.put("client-name", "uasClient");
@@ -227,7 +226,7 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
         webView.loadUrl(url, headers);
 //        webView.getRefreshableView().loadUrl("file:///android_asset/submit.html");
         webView.setWebChromeClient(new ChromeClient());
-        webView.setWebViewClient(new WebViewClient(){
+        webView.setWebViewClient(new WebViewClient() {
             @Override
             public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {
                 if (isCookie) {
@@ -277,13 +276,14 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
             public void onPageFinished(WebView view, String url) {
                 CookieManager cookieManager = CookieManager.getInstance();
                 String CookieStr = cookieManager.getCookie(url);
-                LogUtil.d(TAG,"Cookies = " + CookieStr);
+                LogUtil.d(TAG, "Cookies = " + CookieStr);
                 super.onPageFinished(view, url);
             }
         });
     }
 
     private static final String TAG = "WebViewCommActivity";
+
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
@@ -609,7 +609,7 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
     }
 
     /**
-     * 同步一下cookie 
+     * 同步一下cookie
      */
     public static void synComCookies(Context context, String url) {
         CookieSyncManager.createInstance(context);
@@ -619,9 +619,8 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
         cookieManager.setCookie(url, com.core.utils.CommonUtil.getB2BSession(MyApplication.getInstance()));//cookies是在HttpClient中获得的cookie  
         CookieSyncManager.getInstance().sync();
     }
-    
-    
-    
+
+
     public class JSWebView {
 
         @JavascriptInterface

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon Apr 16 18:11:33 CST 2018
+#Thu Apr 19 09:52:37 CST 2018
 debugName=360
-versionName=626
+versionName=627
 debugCode=360
-versionCode=165
+versionCode=166

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

@@ -9,13 +9,12 @@ import com.core.app.Constants;
  * 在ApiBase中定义公共方法(接口写在这里)
  * 在ApiModel中定义公共逻辑方法
  */
-public class
-ApiPlatform extends ApiBase implements ApiModel {
+public class ApiPlatform extends ApiBase implements ApiModel {
     private String mBaseUrl = "";
 
     public String getBaseUrl() {
         return mBaseUrl;
-//        return "http://10.1.51.83:8088/platform-b2b/";
+//        return "http://218.17.158.219:9000/b2b_test/";
     }
 
     public ApiPlatform() {

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

@@ -10,15 +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://192.168.253.12:32323/";
     //    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://218.17.158.219:24000/";
+    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 = "";
@@ -531,6 +531,9 @@ public class Constants {
         int STATE_REGISTER = 102;
         int STATE_UNREGISTER = 103;
         String REGISTERED_ENTERPRISE_INFO = "registered_enterprise_info";
+        String REGISTERED_ENTERPRISE_FLAG = "registered_enterprise_flag";
+        int REGISTERED_LIST = 201;
+        int REGISTERED_DETAIL = 202;
     }
 
     public interface CACHE {

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

@@ -118,7 +118,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
             startActivity(new Intent(mContext, RegisterSelectActivity.class));
         } else if (v.getId() == R.id.tv_findPwd) {
             IntentUtils.webLinks(mContext,
-                    Constants.ACCOUNT_CENTER_HOST + "reset/forgetPasswordValidationAccount?appId=home&returnURL=http%3A%2F%2Fwww.ubtob.com%2F",
+                    Constants.ACCOUNT_CENTER_HOST + "reset/forgetPasswordValidationAccount?appId=home&returnURL=http%3A%2F%2Fwww.ubtob.com%2F&source=UU",
                     getString(R.string.login_getpwd));
         }
        /* switch (v.getId()) {

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

@@ -252,7 +252,8 @@ public class B2BBusinessMainActivity extends BaseMVPActivity<WorkPlatPresenter>
                 break;
             case OBTAIN_PUBLIC_INQUIRY_LIST:
                 host = Constants.API_INQUIRY;
-                url = "inquiry/public/mobile";
+//                url = "inquiry/public/mobile";
+                url = "inquiry/public/mobile/v2";
                 break;
         }
         showLoading(null);

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

@@ -138,6 +138,7 @@ public class EnterpriseInviteStatisticsActivity extends BaseMVPActivity {
                         mInviteStatisticsBeans.clear();
                         setDateText();
                         initListData();
+                        mStatisticsAdapter.setYear(mSelectedYear);
                         if (o == null) {
                             mStatisticsAdapter.notifyDataSetChanged();
                             return;

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

@@ -14,6 +14,7 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.core.api.wxapi.ApiPlatform;
@@ -164,6 +165,20 @@ public class InviteRegisterListActivity extends BaseMVPActivity<WorkPlatPresente
                 });
             }
         });
+
+        mInviteRegisterListAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter baseQuickAdapter, View view, int position) {
+                RegisterListBean registerListBean = mRegisterListBeans.get(position);
+                if (registerListBean.getState() == RegisterListBean.STATE_REGISTER) {
+                    Intent intent = new Intent();
+                    intent.setClass(InviteRegisterListActivity.this, RegisterDetailActivity.class);
+                    intent.putExtra(Constants.FLAG.REGISTERED_ENTERPRISE_INFO, registerListBean.getJson());
+                    intent.putExtra(Constants.FLAG.REGISTERED_ENTERPRISE_FLAG, Constants.FLAG.REGISTERED_LIST);
+                    startActivity(intent);
+                }
+            }
+        });
     }
 
     @Override
@@ -237,6 +252,13 @@ public class InviteRegisterListActivity extends BaseMVPActivity<WorkPlatPresente
                                     if (registerDate != 0) {
                                         registerListBean.setRegisterDate(DateFormatUtil.long2Str(registerDate, DateFormatUtil.YMD));
                                     }
+
+                                    JSONObject userObject = contentObject.getJSONObject("user");
+                                    if (userObject != null) {
+                                        String inviteName = JSONUtil.getText(userObject, "userName");
+                                        registerListBean.setInviteName(inviteName);
+                                    }
+
                                     String active = JSONUtil.getText(contentObject, "active");
                                     if ("0".equals(active)) {
                                         registerListBean.setState(RegisterListBean.STATE_UNREGISTER);
@@ -244,6 +266,8 @@ public class InviteRegisterListActivity extends BaseMVPActivity<WorkPlatPresente
                                         registerListBean.setState(RegisterListBean.STATE_REGISTER);
                                     }
 
+                                    registerListBean.setJson(contentObject.toJSONString());
+
                                     mRegisterListBeans.add(registerListBean);
                                 }
                             }

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

@@ -379,6 +379,7 @@ public class InviteRegisterMainActivity extends BaseMVPActivity<WorkPlatPresente
                 Intent intent = new Intent();
                 intent.setClass(InviteRegisterMainActivity.this, RegisterDetailActivity.class);
                 intent.putExtra(Constants.FLAG.REGISTERED_ENTERPRISE_INFO, enterpriseInfo);
+                intent.putExtra(Constants.FLAG.REGISTERED_ENTERPRISE_FLAG, Constants.FLAG.REGISTERED_DETAIL);
                 startActivity(intent);
                 mEnterprisePopupWindow.dismiss();
             }

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

@@ -30,6 +30,7 @@ public class RegisterDetailActivity extends BaseMVPActivity {
     private List<B2BDetailListBean> mListBeanList;
     private B2BDetailListAdapter mListAdapter;
     private String mEnterpriseInfo;
+    private int mEnterpriseFlag = -1;
 
     @Override
     protected int getLayout() {
@@ -43,6 +44,7 @@ public class RegisterDetailActivity extends BaseMVPActivity {
         Intent intent = getIntent();
         if (intent != null) {
             mEnterpriseInfo = intent.getStringExtra(Constants.FLAG.REGISTERED_ENTERPRISE_INFO);
+            mEnterpriseFlag = intent.getIntExtra(Constants.FLAG.REGISTERED_ENTERPRISE_FLAG, -1);
         }
         mRecyclerView = $(R.id.register_detail_rv);
         mRecyclerView.setLayoutManager(new LinearLayoutManager(this));
@@ -67,34 +69,65 @@ public class RegisterDetailActivity extends BaseMVPActivity {
     protected void initData() {
         if (mEnterpriseInfo != null) {
             if (JSONUtil.validate(mEnterpriseInfo)) {
-                JSONArray resultArray = JSON.parseArray(mEnterpriseInfo);
-                if (resultArray != null && resultArray.size() > 0) {
-                    JSONObject resultObject = resultArray.getJSONObject(0);
-                    if (resultObject != null) {
-                        String enName = JSONUtil.getText(resultObject, "enName");
-                        String enAddress = JSONUtil.getText(resultObject, "enAddress");
-                        String enCorporation = JSONUtil.getText(resultObject, "enCorporation");
-                        String adminName = JSONUtil.getText(resultObject, "adminName");
-                        String enTel = JSONUtil.getText(resultObject, "enTel");
-                        long date = resultObject.getLongValue("date");
-                        String registerDate = "";
-                        if (date != 0) {
-                            registerDate = DateFormatUtil.long2Str(date, DateFormatUtil.YMD);
+                if (mEnterpriseFlag != -1) {
+                    String enName = "", enAddress = "", enCorporation = "", adminName = "", enTel = "", registerDate = "", inviteUserName = "", inviteEnName = "";
+                    if (mEnterpriseFlag == Constants.FLAG.REGISTERED_DETAIL) {
+                        try {
+                            JSONArray resultArray = JSON.parseArray(mEnterpriseInfo);
+                            if (resultArray != null && resultArray.size() > 0) {
+                                JSONObject resultObject = resultArray.getJSONObject(0);
+                                if (resultObject != null) {
+                                    enName = JSONUtil.getText(resultObject, "enName");
+                                    enAddress = JSONUtil.getText(resultObject, "enAddress");
+                                    enCorporation = JSONUtil.getText(resultObject, "enCorporation");
+                                    adminName = JSONUtil.getText(resultObject, "adminName");
+                                    enTel = JSONUtil.getText(resultObject, "enTel");
+                                    long date = resultObject.getLongValue("date");
+                                    registerDate = "";
+                                    if (date != 0) {
+                                        registerDate = DateFormatUtil.long2Str(date, DateFormatUtil.YMD);
+                                    }
+                                    inviteUserName = JSONUtil.getText(resultObject, "inviteUserName");
+                                    inviteEnName = JSONUtil.getText(resultObject, "inviteEnName");
+                                }
+                            }
+                        } catch (Exception e) {
+
+                        }
+                    } else if (mEnterpriseFlag == Constants.FLAG.REGISTERED_LIST) {
+                        try {
+                            JSONObject enterpriseObject = JSON.parseObject(mEnterpriseInfo);
+                            if (enterpriseObject != null) {
+                                enName = JSONUtil.getText(enterpriseObject, "vendname");
+//                            enAddress = JSONUtil.getText(resultObject, "enAddress");
+//                            enCorporation = JSONUtil.getText(resultObject, "enCorporation");
+//                            adminName = JSONUtil.getText(resultObject, "adminName");
+//                            enTel = JSONUtil.getText(resultObject, "enTel");
+//                            long date = resultObject.getLongValue("date");
+//                            registerDate = "";
+//                            if (date != 0) {
+//                                registerDate = DateFormatUtil.long2Str(date, DateFormatUtil.YMD);
+//                            }
+                                JSONObject userObject = enterpriseObject.getJSONObject("user");
+
+                                inviteUserName = JSONUtil.getText(userObject, "userName");
+//                                inviteEnName = JSONUtil.getText(resultObject, "inviteEnName");
+
+                            }
+                        } catch (Exception e) {
+
                         }
-                        String inviteUserName = JSONUtil.getText(resultObject, "inviteUserName");
-                        String inviteEnName = JSONUtil.getText(resultObject, "inviteEnName");
-
-                        mListBeanList.add(createListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.enterprise_name), enName));
-                        mListBeanList.add(createListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.caption_enterprise_address), enAddress));
-                        mListBeanList.add(createListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.caption_enterprise_corporation), enCorporation));
-                        mListBeanList.add(createListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.caption_enterprise_admin), adminName));
-                        mListBeanList.add(createListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.str_contact_number), enTel));
-                        mListBeanList.add(createListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.str_register_date), registerDate));
-                        mListBeanList.add(createListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.caption_inviter), inviteUserName));
-                        mListBeanList.add(createListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.caption_invite_enterprise), inviteEnName));
-
-                        mListAdapter.notifyDataSetChanged();
                     }
+                    mListBeanList.add(createListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.enterprise_name), enName));
+                    mListBeanList.add(createListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.caption_enterprise_address), enAddress));
+                    mListBeanList.add(createListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.caption_enterprise_corporation), enCorporation));
+                    mListBeanList.add(createListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.caption_enterprise_admin), adminName));
+                    mListBeanList.add(createListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.str_contact_number), enTel));
+                    mListBeanList.add(createListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.str_register_date), registerDate));
+                    mListBeanList.add(createListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.caption_inviter), inviteUserName));
+                    mListBeanList.add(createListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.caption_invite_enterprise), inviteEnName));
+
+                    mListAdapter.notifyDataSetChanged();
                 }
             }
         }

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

@@ -2,6 +2,7 @@ package com.uas.appworks.adapter;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
+import com.common.data.DateFormatUtil;
 import com.uas.appworks.R;
 import com.uas.appworks.model.bean.InviteStatisticsBean;
 
@@ -14,14 +15,39 @@ import java.util.List;
  */
 
 public class EnterpriseInviteStatisticsAdapter extends BaseQuickAdapter<InviteStatisticsBean, BaseViewHolder> {
+    private String mYear;
+    private boolean mIsCurrent = false;
+
+    public String getYear() {
+        return mYear;
+    }
+
+    public void setYear(String year) {
+        mYear = year;
+        String currentYear = DateFormatUtil.long2Str("yyyy");
+        if (currentYear != null && currentYear.equals(mYear)) {
+            mIsCurrent = true;
+        } else {
+            mIsCurrent = false;
+        }
+    }
 
     public EnterpriseInviteStatisticsAdapter(List<InviteStatisticsBean> inviteStatisticsBeans) {
         super(R.layout.item_enterprise_invite_statistics, inviteStatisticsBeans);
-
     }
 
     @Override
     protected void convert(BaseViewHolder baseViewHolder, InviteStatisticsBean inviteStatisticsBean) {
+        if (mIsCurrent) {
+            int position = baseViewHolder.getAdapterPosition();
+            String currentMonth = DateFormatUtil.long2Str("MM");
+            int month = Integer.parseInt(currentMonth);
+            if (month == (position + 1)) {
+                baseViewHolder.setTextColor(R.id.item_invite_statistics_month_tv, mContext.getResources().getColor(R.color.red));
+                baseViewHolder.setTextColor(R.id.item_invite_statistics_invite_count_tv, mContext.getResources().getColor(R.color.red));
+                baseViewHolder.setTextColor(R.id.item_invite_statistics_register_count_tv, mContext.getResources().getColor(R.color.red));
+            }
+        }
         baseViewHolder.setText(R.id.item_invite_statistics_month_tv, inviteStatisticsBean.getMonth() + "");
         baseViewHolder.setText(R.id.item_invite_statistics_invite_count_tv, inviteStatisticsBean.getInviteCount() + "");
         baseViewHolder.setText(R.id.item_invite_statistics_register_count_tv, inviteStatisticsBean.getRegisterCount() + "");

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

@@ -28,6 +28,7 @@ public class InviteRegisterListAdapter extends BaseQuickAdapter<RegisterListBean
         baseViewHolder.setText(R.id.invite_register_list_linkman_tv, registerListBean.getLinkman());
         baseViewHolder.setText(R.id.invite_register_list_phone_tv, registerListBean.getPhone());
         baseViewHolder.setText(R.id.invite_register_list_invite_date_tv, registerListBean.getInviteDate());
+        baseViewHolder.setText(R.id.invite_register_list_invite_name_tv, registerListBean.getInviteName());
 
         if (TextUtils.isEmpty(registerListBean.getRegisterDate())) {
             baseViewHolder.setText(R.id.invite_register_list_register_date_tv, "");

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

@@ -15,7 +15,9 @@ public class RegisterListBean {
     private String mPhone;
     private String mInviteDate;
     private String mRegisterDate;
+    private String mInviteName;
     private int mState;
+    private String mJson;
 
     public String getEnName() {
         return mEnName;
@@ -57,6 +59,14 @@ public class RegisterListBean {
         mRegisterDate = registerDate;
     }
 
+    public String getInviteName() {
+        return mInviteName;
+    }
+
+    public void setInviteName(String inviteName) {
+        mInviteName = inviteName;
+    }
+
     public int getState() {
         return mState;
     }
@@ -64,4 +74,12 @@ public class RegisterListBean {
     public void setState(int state) {
         mState = state;
     }
+
+    public String getJson() {
+        return mJson;
+    }
+
+    public void setJson(String json) {
+        mJson = json;
+    }
 }

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

@@ -87,6 +87,30 @@
             tools:text="2018-01-21" />
     </LinearLayout>
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="6dp"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/caption_invite_name"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/invite_register_list_invite_name_tv"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="4dp"
+            android:layout_weight="3"
+            android:textColor="@color/black"
+            android:textSize="14sp"
+            tools:text="2018-01-21" />
+    </LinearLayout>
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

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

@@ -177,4 +177,5 @@
     <string name="str_share_fail">分享失败</string>
     <string name="str_share_cancel">分享取消</string>
     <string name="apply_hava_send">申请已发送</string>
+    <string name="caption_invite_name">邀请人：</string>
 </resources>

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

@@ -176,4 +176,5 @@
     <string name="str_share_fail">分享失败</string>
     <string name="str_share_cancel">分享取消</string>
     <string name="apply_hava_send">申请已发送</string>
+    <string name="caption_invite_name">邀请人：</string>
 </resources>

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

@@ -176,4 +176,5 @@
     <string name="str_share_fail">分享失败</string>
     <string name="str_share_cancel">分享取消</string>
     <string name="apply_hava_send">申请已发送</string>
+    <string name="caption_invite_name">邀请人：</string>
 </resources>

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

@@ -209,6 +209,7 @@
     <string name="str_share_fail">分享失败</string>
     <string name="str_share_cancel">分享取消</string>
     <string name="apply_hava_send">申请已发送</string>
+    <string name="caption_invite_name">邀请人：</string>
 
 
 </resources>