hanwenjie 1 год назад
Родитель
Сommit
356fe5d877

+ 20 - 3
app/app_channel.txt

@@ -1,3 +1,20 @@
-aaa
-bbb
-ccc
+ebfb06
+f68d73
+85cb97
+b5f7eb
+37a49a
+7305bf
+782531
+92db36
+577c39
+77b6cf
+4e8d06
+17adad
+6ed237
+623a1a
+819cbf
+33201d
+0426a8
+857fed
+b5ff9c
+102830

+ 1 - 1
app/build.gradle

@@ -64,7 +64,7 @@ channel{
     //多渠道包的输出目录,默认为new File(project.buildDir,"channel")
     outputDir = new File(project.buildDir,"channels")
     //多渠道包的命名规则,默认为:${appName}-${versionName}-${versionCode}-${flavorName}-${buildType}-${buildTime}
-    apkNameFormat ='${appName}-${versionName}-${versionCode}-${flavorName}-${buildType}'
+    apkNameFormat ='${appName}-${flavorName}-${buildType}'
     //快速模式:生成渠道包时不进行校验(速度可以提升10倍以上,默认为false)
     fastMode = false
     //buildTime的时间格式,默认格式:yyyyMMdd-HHmmss

+ 5 - 1
app/src/main/java/com/info666/app/infraredRemote/MainActivity.java

@@ -27,6 +27,7 @@ import com.alibaba.fastjson2.JSONObject;
 import com.info666.app.infraredRemote.activity.InfraredRemoteActivity;
 import com.info666.app.infraredRemote.activity.MyCaptureActivity;
 import com.king.zxing.CameraScan;
+import com.tencent.vasdolly.helper.ChannelReaderUtil;
 
 
 import cn.hutool.http.HttpUtil;
@@ -163,7 +164,8 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
             .setTitle(String.format("提示"))
             .setMessage("有新版本需要更新")
             .setPositiveButton("升级", (dialog, which) -> {
-                Uri uri = Uri.parse(downLoadUrl);
+                String channel = ChannelReaderUtil.getChannel(getApplicationContext());
+                Uri uri = Uri.parse(String.format(downLoadUrl,channel));
                 Intent it = new Intent(Intent.ACTION_VIEW,uri);
                 MainActivity.this.startActivity(it);
                 dialog.dismiss();
@@ -178,4 +180,6 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
             .show();
     }
 
+
+
 }

+ 6 - 1
app/src/main/java/com/info666/app/infraredRemote/activity/InfraredRemoteActivity.java

@@ -18,6 +18,7 @@ import androidx.appcompat.app.AppCompatActivity;
 import com.info666.app.infraredRemote.R;
 import com.info666.app.infraredRemote.api.ConsumerIrManagerApi;
 import com.king.zxing.CameraScan;
+import com.tencent.vasdolly.helper.ChannelReaderUtil;
 
 import java.lang.reflect.Method;
 
@@ -85,10 +86,14 @@ public class InfraredRemoteActivity extends AppCompatActivity {
 
         @JavascriptInterface
         public void startQrCapture(){
-            Intent intent = new Intent(context, MyCaptureActivity.class);
+            Intent intent = new Intent(this.context, MyCaptureActivity.class);
             startActivityForResult(intent,Activity.RESULT_FIRST_USER);
         }
 
+        public String getChannel(){
+            return ChannelReaderUtil.getChannel(this.context.getApplicationContext());
+        }
+
     }
 
 }