| app/build.gradle | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/driver/igotrip/base/MyApplication.kt | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/driver/igotrip/netUtls/Api.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/driver/igotrip/netUtls/HttpManager.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/driver/igotrip/ui/main/MediaOperationActivity.kt | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/res/layout/activity_media_operation.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/res/layout/item_msg_notice.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/res/values-en/strings.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/res/values-fr/strings.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/res/values/strings.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
app/build.gradle
@@ -29,8 +29,8 @@ applicationId "com.driver.goposttrip" minSdkVersion 23 targetSdkVersion 36 versionCode 60 versionName "1.8.1" versionCode 61 versionName "1.8.2" multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -48,12 +48,23 @@ minifyEnabled false zipAlignEnabled true signingConfig signingConfigs.config buildConfigField "String", "BASE_URL", "\"https://gopost.ci/driver-server/\"" buildConfigField "String", "SOCKET_SERVER", "\"34.155.170.245\"" buildConfigField "int", "SOCKET_PORT", "8888" proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } debug { minifyEnabled false zipAlignEnabled true signingConfig signingConfigs.config buildConfigField "String", "BASE_URL", "\"https://gopost.ci/driver-server/\"" buildConfigField "String", "SOCKET_SERVER", "\"34.155.170.245\"" buildConfigField "int", "SOCKET_PORT", "8888" // buildConfigField "String", "BASE_URL", "\"http://192.168.110.111:5000/driver-server/\"" // buildConfigField "String", "SOCKET_SERVER", "\"192.168.110.111\"" // buildConfigField "int", "SOCKET_PORT", "9991" proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } app/src/main/java/com/driver/igotrip/base/MyApplication.kt
@@ -20,6 +20,7 @@ import cn.sinata.rxnetty.LogHelper.logRecord import cn.sinata.rxnetty.NettyClient import cn.sinata.xldutils.BaseApplication import com.driver.igotrip.BuildConfig import com.driver.igotrip.R import com.driver.igotrip.bean.OrderBean import com.driver.igotrip.bean.OrderResData @@ -176,7 +177,7 @@ } private fun initSocket() { NettyClient.getInstance().init(this, Api.SOCKET_SERVER, Api.SOCKET_PORT, true) NettyClient.getInstance().init(this, BuildConfig.SOCKET_SERVER, BuildConfig.SOCKET_PORT, true) NettyClient.getInstance().addOnMessageListener { message: String -> initnetdata(message) } app/src/main/java/com/driver/igotrip/netUtls/Api.java
@@ -7,13 +7,6 @@ */ public class Api { public static final boolean isTest = false; public static final String BASE_URL_TEST = "http://192.168.110.111:5000/driver-server/"; public static final String SOCKET_SERVER_TEST = "192.168.110.111"; public static final int SOCKET_PORT_TEST = 9991; public static final String BASE_URL = isTest ? BASE_URL_TEST : "https://gopost.ci/driver-server/"; public static final String SOCKET_SERVER = isTest ? SOCKET_SERVER_TEST : "34.155.170.245"; public static final int SOCKET_PORT = isTest ? SOCKET_PORT_TEST : 8888; public static final int SUCCESS = 200; // http://182.160.16.251:81/share/share/shareIndex.html?type=2&uid=2&language=1 public static final String strShare = "https://igo.i-go.group/share/share/shareIndex%d.html?language=%d_2_%s" ; app/src/main/java/com/driver/igotrip/netUtls/HttpManager.java
@@ -203,7 +203,7 @@ .addConverterFactory(GsonConverterFactory.create()) // 请求结果转换（当前为GSON） .addCallAdapterFactory(RxJava2CallAdapterFactory.create()); // 请求接受工具（当前为RxJava2） // builder1.baseUrl(BASE_URL + action.substring(0, action.lastIndexOf("/") + 1)); builder1.baseUrl(Api.BASE_URL); builder1.baseUrl(BuildConfig.BASE_URL); return builder1.build(); } app/src/main/java/com/driver/igotrip/ui/main/MediaOperationActivity.kt
@@ -61,7 +61,7 @@ } override fun initView() { setTitleText("请上传图片") setTitleText(getString(R.string.请上传图片)) tv_title.text = title rvList.adapter = adapter rvList.layoutManager = GridLayoutManager(this, 4) @@ -72,7 +72,7 @@ override fun setOnclick() { adapter.setOnItemClickListener { _, position -> if (pictures[position].isEmpty()) { mediaOperation("请选择") mediaOperation(getString(R.string.please_select)) } else { val arrayList = ArrayList<String>() arrayList.addAll(pictures) app/src/main/res/layout/activity_media_operation.xml
@@ -13,7 +13,7 @@ android:layout_height="wrap_content" android:layout_marginStart="14dp" android:layout_marginTop="8dp" android:text="只支持jpg格式" android:text="@string/只支持jpg格式" android:textColor="#ff979797" android:textSize="14sp" app:layout_constraintStart_toStartOf="parent" app/src/main/res/layout/item_msg_notice.xml
@@ -1,16 +1,16 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="116dp" android:layout_height="wrap_content" android:layout_marginTop="5dp" android:background="@color/white"> android:background="@color/white" android:paddingVertical="14dp"> <TextView android:id="@+id/tv_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="14dp" android:layout_marginTop="14dp" android:text="@string/平台公告" android:textColor="#ff000000" android:textSize="14sp" /> @@ -25,41 +25,45 @@ android:layout_toRightOf="@+id/tv_title" android:background="@drawable/bg_red_point" /> <TextView android:id="@+id/tv_content" <LinearLayout android:id="@+id/ll_content" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginEnd="86dp" android:ellipsize="end" android:layout_below="@+id/tv_title" android:maxLines="3" android:layout_marginStart="14dp" android:layout_marginTop="11dp" android:alpha="0.6" android:text="您呼叫的专车司机已经到达预约地点，请前往乘车" android:textColor="#ff000000" android:textSize="12sp" /> android:layout_marginEnd="14dp" android:orientation="horizontal"> <TextView android:id="@+id/tv_content" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:alpha="0.6" android:ellipsize="end" android:maxLines="3" android:text="您呼叫的专车司机已经到达预约地点，请前往乘车" android:textColor="#ff000000" android:textSize="12sp" /> <ImageView android:id="@+id/iv_img" android:layout_width="62dp" android:layout_height="62dp" android:layout_marginStart="13dp" android:src="@mipmap/ic_launcher" /> </LinearLayout> <TextView android:id="@+id/tv_time" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_marginTop="16dp" android:layout_marginEnd="14dp" android:layout_below="@id/ll_content" android:layout_alignEnd="@id/ll_content" android:layout_marginTop="10dp" android:text="2019-05-02 10:48" android:textColor="#ff000000" android:textSize="12sp" /> <ImageView android:id="@+id/iv_img" android:layout_width="62dp" android:layout_height="62dp" android:layout_alignParentEnd="true" android:layout_alignParentBottom="true" android:layout_marginEnd="14dp" android:layout_marginBottom="10dp" android:src="@mipmap/ic_launcher" /> </RelativeLayout> app/src/main/res/values-en/strings.xml
@@ -838,5 +838,6 @@ <string name="没有定位权限提示">Without positioning permission, you will not be able to receive new order push notifications</string> <string name="手机号为空">the phone number is empty</string> <string name="休息中">On break</string> <string name="只支持jpg格式">Only JPG format is supported.</string> </resources> app/src/main/res/values-fr/strings.xml
@@ -842,5 +842,6 @@ <string name="没有定位权限提示">Sans autorisation de localisation, vous ne pourrez pas recevoir les notifications push de nouvelles commandes.</string> <string name="手机号为空">Le numéro de téléphone est vide.</string> <string name="休息中">En pause</string> <string name="只支持jpg格式">Seul le format JPG est pris en charge.</string> </resources> app/src/main/res/values/strings.xml
@@ -830,5 +830,6 @@ <string name="没有定位权限提示">如果没有定位权限，您将无法接收新的订单推送通知</string> <string name="手机号为空">手机号为空</string> <string name="休息中">休息中</string> <string name="只支持jpg格式">只支持jpg格式</string> </resources>
