ui调整和上报图片修改

app/src/main/AndroidManifest.xml

@@ -3,8 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.yizhuan.erban">
 
-    <!-- 应用内安装软件权限  oppo vivo 手机,需要加这个东西才能 在安装未知应用列表出现 -->
-    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
     <!-- bugly所需权限 -->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <!-- ShareSdk权限申请 -->

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

@@ -60,7 +60,7 @@
             android:drawablePadding="35dp"
             android:gravity="center_vertical"
             android:paddingStart="25dp"
-            android:text="Facebook登录"
+            android:text="@string/login_facebook"
             android:textColor="@color/text_title_color"
             android:textSize="16sp" />
 
@@ -74,7 +74,7 @@
             android:drawablePadding="35dp"
             android:gravity="center_vertical"
             android:paddingStart="25dp"
-            android:text="Line登录"
+            android:text="@string/login_line"
             android:textColor="@color/text_title_color"
             android:textSize="16sp" />
 
@@ -88,7 +88,7 @@
             android:drawablePadding="35dp"
             android:gravity="center_vertical"
             android:paddingStart="25dp"
-            android:text="Gmail登录"
+            android:text="@string/login_google"
             android:textColor="@color/text_title_color"
             android:textSize="16sp" />
 
@@ -100,7 +100,7 @@
             android:drawableEnd="@drawable/ic_login_arrow_right"
             android:gravity="center"
             android:includeFontPadding="false"
-            android:text="选择其他方式登录"
+            android:text="@string/login_select_other_login_type"
             android:textColor="@color/text_title_color"
             android:layout_marginBottom="50dp"
             android:textSize="12sp" />
@@ -113,7 +113,7 @@
             android:background="@drawable/bg_login_protocol_hint"
             android:gravity="center_horizontal|bottom"
             android:paddingBottom="6dp"
-            android:text="同意隐私政策和用户协议后，才可以注册登录哦~"
+            android:text="@string/login_agree_with_the_protocol"
             android:textColor="@color/white"
             android:textSize="10dp"
             android:visibility="gone"

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

@@ -9,9 +9,14 @@
         android:id="@+id/iv_loading"
         android:layout_width="240dp"
         android:layout_height="180dp"
+        android:visibility="gone"
         android:scaleType="centerInside"
         android:src="@drawable/anim_loading" />
 
+    <ProgressBar
+        android:layout_width="240dp"
+        android:layout_height="wrap_content"/>
+
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

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

@@ -11,10 +11,17 @@
 
     <ImageView
         android:id="@+id/iv_loading_icon"
+        android:visibility="gone"
         android:layout_width="240dp"
         android:layout_height="160dp"
         android:src="@drawable/anim_loading" />
 
+    <ProgressBar
+        android:layout_marginTop="@dimen/dp_10"
+        android:layout_marginBottom="@dimen/dp_10"
+        android:layout_width="240dp"
+        android:layout_height="wrap_content"/>
+
     <TextView
         android:id="@+id/tv_tip"
         android:layout_width="wrap_content"

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

@@ -13,6 +13,12 @@
     <string name="gift_action">礼物</string>
     <string name="decoration_action">装扮</string>
 
+    <!--登录页-->
+    <string name="login_facebook">Facebook登录</string>
+    <string name="login_line">Line登录</string>
+    <string name="login_google">Google登陆</string>
+    <string name="login_select_other_login_type">选择其他方式登录</string>
+    <string name="login_agree_with_the_protocol">同意隐私政策和用户协议后，才可以注册登录哦~</string>
     <string name="hint_login_account">手机号</string>
     <string name="hint_login_account_2">请输入您的手机号/兔兔ID</string>
     <string name="hint_login_password">请输入您的密码</string>

core/src/main/java/com/yizhuan/xchat_android_core/file/FileModel.java

@@ -28,7 +28,7 @@ public class FileModel extends BaseModel implements IFileModel {
 
     private FileModel() {
         Configuration config = new Configuration.Builder()
-                .zone(FixedZone.zone2)        // 设置区域，不指定会自动选择。指定不同区域的上传域名、备用域名、备用IP。
+                .zone(FixedZone.zoneAs0)        // 设置区域，不指定会自动选择。指定不同区域的上传域名、备用域名、备用IP。
                 .build();
         uploadManager = new UploadManager(config);
     }
@@ -52,7 +52,7 @@ public class FileModel extends BaseModel implements IFileModel {
                 .compose(RxHelper.handleSchedulers())
                 .compose(RxHelper.handleBeanData())
                 .flatMap(uploadToken -> Single.create(singleEmitter ->
-                        uploadManager.put(finalFile, uploadToken.getKey(), uploadToken.getToken(),
+                        uploadManager.put(finalFile, uploadToken.getKey(), uploadToken.getToken() ,
                                 (key, info, response) -> {
                                     if (info.isOK()) {
                                         try {
@@ -64,7 +64,8 @@ public class FileModel extends BaseModel implements IFileModel {
                                     } else {
                                         singleEmitter.onError(new Throwable(info.error));
                                     }
-                                }, null)));
+                                }, null)
+                        ));
     }
 
     @Override

gradle.properties

@@ -24,5 +24,5 @@ only_arm64=false
 
 channel_file=channel.txt
 
-version_name=1.0.0
-version_code=100
+version_name=1.0.1
+version_code=101

library/build.gradle

@@ -43,7 +43,7 @@ dependencies {
     def rxjava_android = "2.0.1"
     def rxlifecycle = "3.1.0"
     def loggerVersion = "2.2.0"
-    def qiniu = "7.3.15"
+    def qiniu = "8.4.4"
     def SmartRefreshLayoutVersion = "1.0.3"
     def eventbusVersion = "3.0.0"
     def fragment_version = "1.3.6"