<益阳门口机修改界面及手动升级>

app/build.gradle

@@ -26,7 +26,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 26
         versionCode 1
-        versionName "1.32"
+        versionName "1.43"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
 

app/src/main/java/com/wdkl/callingdoor/ui/APPUpdateActivity.java

@@ -97,6 +97,7 @@ public class APPUpdateActivity extends BaseActivity implements SilentUpdateUtil.
                     //升级
                     //new SilentUpdateUtil().updateApk(APPUpdateActivity.this).setInstallCallBack(APPUpdateActivity.this);//静默升级
                     new DownloadUtils(APPUpdateActivity.this).installAPK(DownloadUtil.FILE_APK_PATH + "/" + DownloadUtil.FILE_APK_NAME); //智能升级
+                    APPUpdateActivity.this.finish();
                     break;
                 case APP_UPDATE_ING:
                     int progress = (int) msg.obj;

app/src/main/java/com/wdkl/callingdoor/ui/CallingDoorActivity.java

@@ -606,6 +606,7 @@ public class CallingDoorActivity extends BaseActivity implements SerialPortUtil.
                     @Override
                     public void onError(Call call, Exception e, int id) {
                         Constants.UPDATE_APP_FLAG = false;
+                        ToastUtil.showToast("检查APP版本失败，请检查网络或服务器配置");
                     }
 
                     @Override
@@ -627,11 +628,17 @@ public class CallingDoorActivity extends BaseActivity implements SerialPortUtil.
                                         //intent.putExtra("downLoadURL", Constants.URL + Constants.URL_END + "/" + downloadURL);
                                         intent.putExtra("downLoadURL", Constants.URL + Constants.URL_END + downloadURL);
                                         startActivity(intent);
+                                    }else {
+                                        ToastUtil.showToast("APP下载地址为空，请检查服务器配置");
                                     }
+                                } else {
+                                    ToastUtil.showToast("已是最新版本");
                                 }
                             } else {
+                                ToastUtil.showToast("获取APP版本失败，请检查服务器是否上传新版本");
                             }
                         } catch (Exception e) {
+                            ToastUtil.showToast("检查APP版本失败，请检查网络或服务器配置");
                             Constants.UPDATE_APP_FLAG = false;
                             e.printStackTrace();
                         }
@@ -1761,8 +1768,9 @@ public class CallingDoorActivity extends BaseActivity implements SerialPortUtil.
 
     @OnLongClick(R.id.activity_calling_door_layout_imageView_logo)
     public boolean longClickLogoView(View view) {
-       DownloadUtils.onForwardToAccessibility(CallingDoorActivity.this);
-       return false;
+       //DownloadUtils.onForwardToAccessibility(CallingDoorActivity.this);
+        appCheckUpdate();
+       return true;
     }
 
     @Override

app/src/main/res/layout/activity_calling_door_layout.xml

@@ -219,7 +219,7 @@
             android:background="@mipmap/bg_main_right"
             android:gravity="center"
             android:orientation="vertical"
-            android:paddingLeft="15px"
+            android:paddingLeft="6dp"
             android:paddingTop="36dp"
             android:weightSum="1">
 
@@ -253,9 +253,9 @@
 
             <LinearLayout
                 android:id="@+id/activity_calling_door_layout_rl_call_nurse"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="100dp"
+                android:layout_width="200dp"
+                android:layout_height="100dp"
+                android:layout_marginTop="40dp"
                 android:background="@drawable/selector_bg_doctor"
                 android:clickable="true"
                 android:orientation="horizontal"
@@ -279,17 +279,18 @@
 
             <LinearLayout
                 android:id="@+id/activity_calling_door_layout_rl_call_cancel"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="100dp"
+                android:layout_width="200dp"
+                android:layout_height="240dp"
+                android:layout_marginTop="60dp"
+                android:gravity="center"
                 android:background="@drawable/selector_bg_doctor"
                 android:clickable="true"
                 android:orientation="horizontal"
                 android:padding="@dimen/side_letter_bar_width">
 
                 <ImageView
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
+                    android:layout_width="60dp"
+                    android:layout_height="60dp"
                     android:src="@drawable/back_circle" />
 
                 <TextView
@@ -300,14 +301,14 @@
                     android:gravity="center"
                     android:text="取消呼叫"
                     android:textColor="@color/button_color"
-                    android:textSize="20dp" />
+                    android:textSize="32sp" />
             </LinearLayout>
 
             <LinearLayout
                 android:id="@+id/activity_calling_door_layout_rl_nursing"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="100dp"
+                android:layout_width="200dp"
+                android:layout_height="100dp"
+                android:layout_marginTop="60dp"
                 android:background="@drawable/selector_bg_doctor"
                 android:clickable="true"
                 android:padding="@dimen/side_letter_bar_width">