邓琴文 3 лет назад
Родитель
Сommit
1dadb6420d

+ 3 - 2
student/src/main/java/com/cooleshow/student/ui/live/LiveRoomActivity.java

@@ -541,13 +541,14 @@ public class LiveRoomActivity extends BaseMVPActivity<ActivityLiveroomLayoutBind
         if (mInputBarDialog == null) {
             mInputBarDialog = new InputBarDialog(LiveRoomActivity.this, new InputBar.InputBarListener() {
                 @Override
-                public void onClickSend(String message) {
+                public boolean onClickSend(String message) {
                     //发送消息
                     if (TextUtils.isEmpty(message)) {
                         ToastUtil.getInstance().show(LiveRoomActivity.this, "消息不能为空");
-                        return;
+                        return false;
                     }
                     sendTextMessage(message);
+                    return true;
                 }
 
 

+ 1 - 1
student/src/main/res/layout/activity_modify_phonenum.xml

@@ -50,7 +50,7 @@
             android:background="@null"
             android:gravity="center_vertical"
             android:hint="请输入验证码"
-            android:inputType="textPassword"
+            android:inputType="number"
             android:paddingLeft="14dp"
             android:paddingRight="14dp"
             android:textColor="@color/color_1a1a1a"

+ 26 - 0
student/src/main/res/raw/charles.pem

@@ -0,0 +1,26 @@
+-----BEGIN CERTIFICATE-----
+MIIFOjCCBCKgAwIBAgIGAXthWyM4MA0GCSqGSIb3DQEBCwUAMIGhMTIwMAYDVQQDDClDaGFybGVz
+IFByb3h5IENBICgyMCBBdWcgMjAyMSwgbG9jYWxob3N0KTElMCMGA1UECwwcaHR0cHM6Ly9jaGFy
+bGVzcHJveHkuY29tL3NzbDERMA8GA1UECgwIWEs3MiBMdGQxETAPBgNVBAcMCEF1Y2tsYW5kMREw
+DwYDVQQIDAhBdWNrbGFuZDELMAkGA1UEBhMCTlowHhcNMjEwODE5MDIxOTI3WhcNMjIwODE5MDIx
+OTI3WjCBoTEyMDAGA1UEAwwpQ2hhcmxlcyBQcm94eSBDQSAoMjAgQXVnIDIwMjEsIGxvY2FsaG9z
+dCkxJTAjBgNVBAsMHGh0dHBzOi8vY2hhcmxlc3Byb3h5LmNvbS9zc2wxETAPBgNVBAoMCFhLNzIg
+THRkMREwDwYDVQQHDAhBdWNrbGFuZDERMA8GA1UECAwIQXVja2xhbmQxCzAJBgNVBAYTAk5aMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAorS8avaN1OvnRWRW0osqM/cN/5c0aaSlt766
+B3XQ6PbGLTIAl+ril3bxttYmySFDsxW/NGO970HONy86gzciJoZLC8A+tjFpJEZoyvG2e9PYyVux
+bnjmEY2AomYUTZPNkUrIZe/Ey1MhgRIdL2iiuPWhKwzSV69PVg9bZ+TH9A0zq8eBITwCZPTo+73n
+PaDf5tV3rqkHN0ua+mT8+yk6ZVEQCCDsov3FFvoYgK6TtiGFwRDd59F4EdSpxl3oTkfvOtG+5Qxd
+B4/AckQFB6YMnEZBUJJReHvKCxddRagdaMqBopidf+u8RvburXClzX916tups3A3SlOKTzkgdHaL
+hwIDAQABo4IBdDCCAXAwDwYDVR0TAQH/BAUwAwEB/zCCASwGCWCGSAGG+EIBDQSCAR0TggEZVGhp
+cyBSb290IGNlcnRpZmljYXRlIHdhcyBnZW5lcmF0ZWQgYnkgQ2hhcmxlcyBQcm94eSBmb3IgU1NM
+IFByb3h5aW5nLiBJZiB0aGlzIGNlcnRpZmljYXRlIGlzIHBhcnQgb2YgYSBjZXJ0aWZpY2F0ZSBj
+aGFpbiwgdGhpcyBtZWFucyB0aGF0IHlvdSdyZSBicm93c2luZyB0aHJvdWdoIENoYXJsZXMgUHJv
+eHkgd2l0aCBTU0wgUHJveHlpbmcgZW5hYmxlZCBmb3IgdGhpcyB3ZWJzaXRlLiBQbGVhc2Ugc2Vl
+IGh0dHA6Ly9jaGFybGVzcHJveHkuY29tL3NzbCBmb3IgbW9yZSBpbmZvcm1hdGlvbi4wDgYDVR0P
+AQH/BAQDAgIEMB0GA1UdDgQWBBTFDUHefpPwiOUWlyr+SBAeDs21EzANBgkqhkiG9w0BAQsFAAOC
+AQEAOr130q4wZ1qMP/G8Heggfdb8YX/OeBS2WxPgvVKKr+BJ8RF3WkUTPxLYvC0DTo5r3ER/7hYu
+j9xTbVGRu+SKhLEIsZQwLkLOAPRiJqzn6oGYg6+E02u4o8vRvapW0h8hRF1YuIfCclRUEXF4WBj0
+ly5A977zzxBC8sK78UNgbh8HO9aGCikk0YU9HkdxDo2gyfLpaHJMDTovoFJnhGcybN/I90eDBzwV
+koFrcyPJPV5Y8g5tMd4pUmxL64kuBxdcMTSecGuQhtc3DDYUT/NCz6FJEUCUzGPnWlpoBNcJmHmH
+sNtfyR8DJUqrYf5ER3/B4l5MsWKUUX5IypHHnhLs6Q==
+-----END CERTIFICATE-----

+ 1 - 0
student/src/main/res/xml/network_security_config.xml

@@ -5,6 +5,7 @@
         <trust-anchors>
             <!-- Trust user added CAs while debuggable only -->
             <certificates src="user" />
+            <certificates src="@raw/charles"/>
         </trust-anchors>
     </debug-overrides>
     <!--<domain-config-->