publish

app/release/output-metadata.json

@@ -0,0 +1,18 @@
+{
+  "version": 2,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.tianrun.siphone",
+  "variantName": "processReleaseResources",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "versionCode": 1,
+      "versionName": "1.0",
+      "outputFile": "app-release.apk"
+    }
+  ]
+}

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

@@ -178,6 +178,7 @@
                 android:textColor="#CCCCCC"
                 android:textSize="18sp"
                 android:textStyle="bold" />
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"

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

@@ -264,7 +264,7 @@
             android:clickable="false">
 
             <Button
-                android:id="@+id/button"
+                android:id="@+id/videobutton"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:onClick="doMeetingVideo4Group"
@@ -272,7 +272,7 @@
                 android:textAlignment="viewEnd" />
 
             <ImageView
-                android:id="@+id/imageView2"
+                android:id="@+id/imageView22"
                 android:layout_width="20dp"
                 android:layout_height="20dp"
                 android:layout_alignParentStart="true"
@@ -291,7 +291,7 @@
             android:focusableInTouchMode="false">
 
             <Button
-                android:id="@+id/button"
+                android:id="@+id/delGroupbutton"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:onClick="deleteGroup"
@@ -300,7 +300,7 @@
                 android:textColor="#F44336" />
 
             <ImageView
-                android:id="@+id/imageView2"
+                android:id="@+id/imageView3"
                 android:layout_width="20dp"
                 android:layout_height="20dp"
                 android:layout_alignParentStart="true"
@@ -328,7 +328,7 @@
             android:layout_weight="1">
 
             <ImageView
-                android:id="@+id/imageView"
+                android:id="@+id/imageView4"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -336,7 +336,7 @@
                 app:tint="#5EE463" />
 
             <TextView
-                android:id="@+id/textView"
+                android:id="@+id/textView5"
                 android:layout_width="60dp"
                 android:layout_height="wrap_content"
                 android:layout_alignParentStart="true"
@@ -354,7 +354,7 @@
             android:layout_weight="1">
 
             <ImageView
-                android:id="@+id/imageView"
+                android:id="@+id/imageView6"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -362,7 +362,7 @@
                 app:tint="#F44336" />
 
             <TextView
-                android:id="@+id/textView"
+                android:id="@+id/textView7"
                 android:layout_width="60dp"
                 android:layout_height="wrap_content"
                 android:layout_alignParentStart="true"

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

app/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">SIP电话</string>
+    <string name="app_name">视频对讲指挥系统</string>
     <string name="title_activity_scrolling">ScrollingActivity</string>
     <string name="large_text">
         "Material is the metaphor.\n\n"

build.gradle

@@ -5,10 +5,10 @@ buildscript {
     repositories {
         google()
         jcenter()
-        
+
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -19,7 +19,6 @@ allprojects {
     repositories {
         google()
         jcenter()
-        
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Aug 25 12:37:32 CST 2020
+#Fri Oct 16 07:42:12 CST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip