Przeglądaj źródła

修改发布环境地址 优化细节

ZhangXinYu 6 lat temu
rodzic
commit
6e9e5c7280

+ 3 - 3
app/build.gradle

@@ -24,8 +24,8 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled true
         multiDexKeepProguard file("multidexKeep.pro")//腾讯bugly的类放到主Dex
-        versionCode 308
-        versionName "3.0.8"
+        versionCode 300
+        versionName "3.0.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         flavorDimensions "versionCode"
         ndk {
@@ -49,7 +49,7 @@ android {
             buildConfigField('String', 'BUGLY_ID', "\"ea1dc909cd\"")
             manifestPlaceholders = [
                     AMAP_KEY      : "af3f5c403ce607e9603e5087b1b2c961",
-                    WX_APPID_VALUE: "wxeb8c2418a8ace030",
+                    WX_APPID_VALUE: "wx9c053f7126db0b28",
             ]
         }
     }

+ 1 - 1
app/server_url.properties

@@ -1,2 +1,2 @@
-proApiUrl="https://kf.hap-job.com/happyjob/"
+proApiUrl="https://web.hap-job.com/happyjob/"
 testApiUrl="https://kf.hap-job.com/happyjob/"

+ 8 - 0
app/src/main/AndroidManifest.xml

@@ -199,6 +199,14 @@
             android:launchMode="singleTask"
             android:taskAffinity="net.sourceforge.simcpux"
             android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+        <activity
+            android:name=".test.wxapi.WXEntryActivity"
+            android:exported="true"
+            android:label="@string/app_name"
+            android:launchMode="singleTask"
+            android:taskAffinity="net.sourceforge.simcpux"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+
         <meta-data
             android:name="WX_APPID"
             android:value="${WX_APPID_VALUE}" />

+ 5 - 1
app/src/main/java/com/tongyu/luck/happywork/ui/fragment/MeFragment.java

@@ -188,7 +188,11 @@ public class MeFragment extends BaseFragment<MeFragmentPresenter> implements MeF
     @Override
     public void onUserBean(UserBean userBean) {
         if (userBean != null) {
-            tvName.setText(AppCacheManager.getInstance().getLoginModel().getNickName());
+            if (!TextUtils.isEmpty(AppCacheManager.getInstance().getLoginModel().getNickName())) {
+                tvName.setText(AppCacheManager.getInstance().getLoginModel().getNickName());
+            } else {
+                tvName.setText("用户");
+            }
             ImageLoaderUtil.getInstance().loadCircleImage(AppCacheManager.getInstance().getLoginModel().getHeadImgUrl(), R.mipmap.ic_default_header, ivHeader);
             String phone = AppCacheManager.getInstance().getLoginModel().getPhone();
             if (!TextUtils.isEmpty(phone) && phone.length() > 7) {

+ 1 - 1
app/src/main/java/com/tongyu/luck/happywork/ui/model/AssembleJobDetailModel.java

@@ -239,7 +239,7 @@ public class AssembleJobDetailModel extends BaseModel implements AssembleJobDeta
      */
     @Override
     public boolean isEnd() {
-        return 1 == isEnd;
+        return isEnd != 0;
     }
 
     /**

+ 1 - 1
app/src/main/java/com/tongyu/luck/happywork/ui/presenter/AssembleJobDetailPresenter.java

@@ -94,7 +94,7 @@ public class AssembleJobDetailPresenter extends BasePresenter<AssembleJobDetailA
     @Override
     public void saveApply() {
         if (isViewAttach() && mAssembleJobDetailModel.isValidity(false)) {
-            if (mAssembleJobDetailModel.isTimeOver()) {
+            if (mAssembleJobDetailModel.isTimeOver() || mAssembleJobDetailModel.isEnd()) {
                 ToastUtils.show(mvpReference.get(), R.string.toast_position_join_time_is_over);
                 return;
             }

+ 3 - 3
app/src/main/java/com/tongyu/luck/happywork/ui/presenter/AssembleJobRequestPresenter.java

@@ -29,7 +29,7 @@ public class AssembleJobRequestPresenter extends BasePresenter<AssembleJobReques
                 public void onData(FullPositionBean data) {
                     if (isViewAttach()) {
                         mvpReference.get().onGroupDetail(data, mAssembleJobRequestModel.getGroupList(), mAssembleJobRequestModel.getGroupNum(), mAssembleJobRequestModel.isExist(), mAssembleJobRequestModel.isEnd());
-                        mvpReference.get().onCountDown(mAssembleJobRequestModel.getEndHour(), mAssembleJobRequestModel.getEndMinute(), mAssembleJobRequestModel.getEndSecond(), mAssembleJobRequestModel.isEnd() == 1);
+                        mvpReference.get().onCountDown(mAssembleJobRequestModel.getEndHour(), mAssembleJobRequestModel.getEndMinute(), mAssembleJobRequestModel.getEndSecond(), mAssembleJobRequestModel.isEnd() != 0);
                     }
                 }
 
@@ -52,7 +52,7 @@ public class AssembleJobRequestPresenter extends BasePresenter<AssembleJobReques
     @Override
     public void countDown() {
         if (isViewAttach()) {
-            mvpReference.get().onCountDown(mAssembleJobRequestModel.getEndHour(), mAssembleJobRequestModel.getEndMinute(), mAssembleJobRequestModel.getEndSecond(), 1 == mAssembleJobRequestModel.isEnd());
+            mvpReference.get().onCountDown(mAssembleJobRequestModel.getEndHour(), mAssembleJobRequestModel.getEndMinute(), mAssembleJobRequestModel.getEndSecond(), mAssembleJobRequestModel.isEnd() != 0);
         }
     }
 
@@ -62,7 +62,7 @@ public class AssembleJobRequestPresenter extends BasePresenter<AssembleJobReques
     @Override
     public void saveApply() {
         if (isViewAttach() && mAssembleJobRequestModel.isValidity(false)) {
-            if (mAssembleJobRequestModel.isTimeOver()) {
+            if (mAssembleJobRequestModel.isTimeOver() || mAssembleJobRequestModel.isEnd() != 0) {
                 ToastUtils.show(mvpReference.get(), R.string.toast_position_join_time_is_over);
                 return;
             }