反馈修改

lmw

2023-06-19 9e9d3c4322628ec26428decb0193785efdd8ae43

反馈修改

 .idea/.name

New file
@@ -0,0 +1 @@
okgoincar

 .idea/gradle.xml

@@ -19,6 +19,5 @@
        <option name="useQualifiedModuleNames" value="true" />
      </GradleProjectSettings>
    </option>
    <option name="offlineMode" value="true" />
  </component>
</project>

 app/build.gradle

@@ -25,8 +25,8 @@
        applicationId "com.okgoincar"
        minSdkVersion 19
        targetSdkVersion 29
        versionCode 11
        versionName "11"
        versionCode 12
        versionName "12"
//        versionCode 22
//        versionName "22"
        multiDexEnabled true
@@ -106,4 +106,5 @@
    implementation 'com.wang.avi:library:2.1.3'
    implementation 'com.tencent.bugly:crashreport:3.1.0'
    implementation 'com.tencent.bugly:nativecrashreport:3.1.0'
    implementation 'com.squareup.okhttp3:logging-interceptor:3.4.1'
}

 app/release/app-release.apk

Binary files differ

 app/release/output.json

@@ -1 +1 @@
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":11,"versionName":"11","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release","dirName":""},"path":"app-release.apk","properties":{}}]
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":12,"versionName":"12","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release","dirName":""},"path":"app-release.apk","properties":{}}]

 app/src/main/java/com/okgoincar/netUtls/Api.java

@@ -17,14 +17,14 @@
//    public static final int SOCKET_PORT = 8888;

    //39.108.148.228 测试服务器
    public static final String BASE_URL = "http://39.108.148.228/driver/";
    public static final String SOCKET_SERVER = "39.108.148.228";
    public static final int SOCKET_PORT = 8888;
//    public static final String BASE_URL = "http://39.108.148.228/driver/";
//    public static final String SOCKET_SERVER = "39.108.148.228";
//    public static final int SOCKET_PORT = 8888;

    //外网
//    public static final String BASE_URL = "https://okyueche.com:443/driver/";
//    public static final String SOCKET_SERVER = "39.108.122.38";
//    public static final int SOCKET_PORT = 8888;
    public static final String BASE_URL = "https://okyueche.com:443/driver/";
    public static final String SOCKET_SERVER = "39.108.122.38";
    public static final int SOCKET_PORT = 8888;
    public static final  int SUCCESS = 200;

    /**

 app/src/main/java/com/okgoincar/netUtls/HttpManager.java

@@ -29,6 +29,7 @@
import okhttp3.RequestBody;
import okhttp3.Response;
import okhttp3.ResponseBody;
import okhttp3.logging.HttpLoggingInterceptor;
import okio.Buffer;
import retrofit2.Retrofit;
import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
@@ -122,6 +123,11 @@
            }
        });

        //添加一个log拦截器,打印所有的log
        HttpLoggingInterceptor httpLoggingInterceptor = new HttpLoggingInterceptor();
        //可以设置请求过滤的水平,body,basic,headers
        httpLoggingInterceptor.setLevel(HttpLoggingInterceptor.Level.BODY);
        builder.addInterceptor(httpLoggingInterceptor);
        Retrofit.Builder builder1 = new Retrofit.Builder()
                .client(builder.build())                                    // 配置监听请求
                .addConverterFactory(GsonConverterFactory.create())         // 请求结果转换（当前为GSON）

 app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt

@@ -405,7 +405,7 @@
        var map = getMapByAny()
        callNet(false, Api.queryNewData_, map) {
            var bean = gson.fromJson<VersionBean>(it, VersionBean::class.java)
            if (bean.data.version != "" && bean.data.version != Utils.getAppVersion(this)) {
            if (bean.data.version != "" && bean.data.version > Utils.getAppVersion(this)) {
                if (bean.data.mandatory == 0) {
                    var pop =
                        DialogUtil.getSlabDelAndSurePopWindow(

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

@@ -51,7 +51,7 @@
                android:layout_marginStart="88dp"
                android:layout_marginEnd="88dp"
                android:background="@drawable/bg_gray_4_line"
                android:hint="请输入工号"
                android:hint="工号或从业资格证号"
                android:paddingStart="60dp"
                android:textColor="@color/black"
                android:textSize="30sp" />