备份

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

@@ -14,6 +14,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
+import com.common.data.JSONUtil;
 import com.core.net.ProgressDownloader;
 import com.core.net.ProgressResponseBody;
 import com.core.net.http.ViewUtil;
@@ -115,10 +116,20 @@ public class PDFDownloadActivity extends BaseActivity implements View.OnClickLis
                     break;
                 case com.core.app.Constants.APP_SOCKETIMEOUTEXCEPTION:
                     result = msg.getData().getString("response");
-                    if (JSON.parseObject(result) != null && TextUtils.isEmpty(JSON.parseObject(result).getString("exceptionInfo"))) {
+                    String exception = "";
+                    if (JSONUtil.validate(result)) {
+                        if (JSON.parse(result) instanceof JSONObject) {
+                            exception = JSON.parseObject(result).getString("exceptionInfo");
+                        }
+                    }
+                    if (TextUtils.isEmpty(exception)) {
                         analysisPdfPath(result);
                     } else {
-                        ToastMessage(msg.getData().getString("result"));
+                        mPauseTextView.setVisibility(View.GONE);
+                        mErrorLinearLayout.setVisibility(View.VISIBLE);
+                        mStateTextView.setText(R.string.data_exception);
+                        mDownloadProgressBar.setProgress(0);
+                        mRemainTextView.setText(100 + "");
                     }
                     break;
             }
@@ -341,6 +352,7 @@ public class PDFDownloadActivity extends BaseActivity implements View.OnClickLis
 
     @Override
     public void onError(Throwable t) {
+        Log.e("pdfloaderror", t.getMessage() == null ? "" : t.getMessage());
         mPauseTextView.setVisibility(View.GONE);
         mErrorLinearLayout.setVisibility(View.VISIBLE);
         mStateTextView.setText("报表文件加载失败！");

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

@@ -5,6 +5,7 @@ import android.os.Bundle;
 import android.view.View;
 
 import com.core.base.BaseActivity;
+import com.core.utils.IntentUtils;
 import com.modular.login.R;
 
 import de.hdodenhof.circleimageview.CircleImageView;
@@ -29,11 +30,11 @@ public class RegisterSelectActivity extends BaseActivity implements View.OnClick
         findViewById(R.id.company_btn).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-//                IntentUtils.webLinks(mContext,
-//                        "https://account.ubtob.com/sso/register",
-//                        "企业注册");
-                startActivity(new Intent(mContext, EnterpriseRegisterActivity.class));
-                finish();
+                IntentUtils.webLinks(mContext,
+                        "https://account.ubtob.com/sso/register",
+                        "企业注册");
+//                startActivity(new Intent(mContext, EnterpriseRegisterActivity.class));
+//                finish();
             }
         });
     }

version.gradle

@@ -11,8 +11,8 @@ ext {
             minSdkVersion    : 9,
             targetSdkVersion : 24,
             javaVersion      : JavaVersion.VERSION_1_8,
-            versionCode      : 117,
-            versionName      : '5.9.5',
+            versionCode      : 118,
+            versionName      : '5.9.6',
     ]
 
     depsVersion = [