Skip to content

Commit 92407de

Browse files
Version 11.9.0
1 parent d891497 commit 92407de

File tree

407 files changed

+12788
-14336
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

407 files changed

+12788
-14336
lines changed

Src/Android/StyloQ/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ android {
2323
applicationId "ru.petroglif.styloq"
2424
minSdkVersion 28
2525
targetSdkVersion 33
26-
versionCode 96
27-
versionName '0.7.04'
26+
versionCode 97
27+
versionName '0.7.05'
2828
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2929
signingConfig signingConfigs.release
3030
}

Src/Android/StyloQ/app/src/main/java/ru/petroglif/styloq/CmdRIncomingListBillActivity.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1474,6 +1474,7 @@ else if(cur_entry.DetailExpandStatus_Ti == 2) {
14741474
}
14751475
else {
14761476
SLib.SetupRecyclerListViewHolderAsClickListener(ev_subj.RvHolder, ev_subj.ItemView, R.id.CTL_DOCUMENT_EXPANDSTATUS);
1477+
SLib.SetupRecyclerListViewHolderAsClickListener(ev_subj.RvHolder, ev_subj.ItemView, R.id.CTL_DOCUMENT_SHARE); // @v11.9.0
14771478
SLib.SetupRecyclerListViewHolderAsClickListener(ev_subj.RvHolder, ev_subj.ItemView, R.id.buttonOrder);
14781479
result = ev_subj.RvHolder;
14791480
}
@@ -1685,6 +1686,18 @@ else if(cur_entry.DetailExpandStatus_Ti == 2) {
16851686
a.notifyItemChanged(ev_subj.ItemIdx);
16861687
}
16871688
}
1689+
else if(ev_subj.ItemView.getId() == R.id.CTL_DOCUMENT_SHARE) { // @v11.9.0
1690+
debug_mark = true;
1691+
// @construction {
1692+
String doc_text = CPM.DocumentToText(cur_entry);
1693+
if(SLib.GetLen(doc_text) > 0) {
1694+
Intent sharingIntent = new Intent(Intent.ACTION_SEND);
1695+
sharingIntent.setType("text/plain");
1696+
sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, doc_text);
1697+
startActivity(Intent.createChooser(sharingIntent, "Share using"));
1698+
}
1699+
// } @construction
1700+
}
16881701
else {
16891702
boolean done = false;
16901703
CPM.ResetCurrentDocument();

Src/Android/StyloQ/app/src/main/java/ru/petroglif/styloq/CommonPrereqModule.java

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3686,4 +3686,48 @@ Object GetDTS()
36863686
return result;
36873687
}
36883688
}
3689+
String DocumentToText(Document doc)
3690+
{
3691+
String result = null;
3692+
if(doc != null && doc.H != null) {
3693+
result = "Document" + '\n' + "____________";
3694+
result += "No" + ": " + doc.H.Code + '\n';
3695+
result += "Date" + ": " + SLib.datetimefmt(doc.H.Time, SLib.DATF_ISO8601|SLib.DATF_CENTURY, SLib.TIMF_HMS) + '\n';
3696+
if(SLib.GetLen(doc.H.Memo) > 0)
3697+
result += "Memo" + ": " + doc.H.Memo + '\n';
3698+
if(doc.TiList != null && doc.TiList.size() > 0) {
3699+
result += "____________" + '\n';
3700+
for(int i = 0; i < doc.TiList.size(); i++) {
3701+
Document.TransferItem ti = doc.TiList.get(i);
3702+
if(ti != null) {
3703+
String qtty_text = null;
3704+
String goods_name = "";
3705+
int uom_id = 0;
3706+
CommonPrereqModule.WareEntry ware_entry = FindGoodsItemByGoodsID(ti.GoodsID);
3707+
if(ware_entry != null && ware_entry.Item != null) {
3708+
goods_name = ware_entry.Item.Name;
3709+
uom_id = ware_entry.Item.UomID;
3710+
}
3711+
int mark_qtty = 0;
3712+
int item_qtty = (ti.Set != null) ? (int)ti.Set.Qtty : 0;
3713+
double item_price = (ti.Set != null) ? ti.Set.Price : 0.0;
3714+
if(ti.XcL != null) {
3715+
for(Document.LotExtCode iter : ti.XcL) {
3716+
mark_qtty++;
3717+
}
3718+
}
3719+
qtty_text = Integer.toString(mark_qtty) + "/" + Integer.toString(Math.abs(item_qtty));
3720+
3721+
result += '#' + Integer.toString(i+1) + " " + goods_name + '\n';
3722+
if(ti.Set != null) {
3723+
result += " " + FormatQtty(ti.Set.Qtty, uom_id, false) + ' ' + 'x' + ' ' + FormatCurrency(item_price) + '\n';
3724+
}
3725+
}
3726+
}
3727+
}
3728+
}
3729+
else
3730+
result = "Document is empty";
3731+
return result;
3732+
}
36893733
}

Src/Android/StyloQ/app/src/main/java/ru/petroglif/styloq/Document.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import org.json.JSONArray;
77
import org.json.JSONException;
88
import org.json.JSONObject;
9+
910
import java.util.ArrayList;
1011
import java.util.Base64;
1112
import java.util.StringTokenizer;
@@ -79,7 +80,6 @@ public static String IncomingListActionsToString(final int actionFlags)
7980
}
8081
return result;
8182
}
82-
8383
Head H;
8484
ArrayList <TransferItem> TiList;
8585
ArrayList <BookingItem> BkList; // Список позиций повременных элементов, связанных с процессорами

Src/Android/StyloQ/app/src/main/java/ru/petroglif/styloq/SLib.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4804,6 +4804,15 @@ static interface EventHandler {
48044804
public Object HandleEvent(int cmd, Object srcObj, Object subj);
48054805
}
48064806
static abstract class App extends Application implements EventHandler {
4807+
// @v11.9.0 @construction {
4808+
static {
4809+
TouchEffects.Manager.build(TouchEffects.TouchEffectsWholeType.SCALE)
4810+
.addViewType(TouchEffects.ViewType.ALL)
4811+
.setListWholeType(TouchEffects.TouchEffectsWholeType.RIPPLE)
4812+
.setAspectRatioType(4f, TouchEffects.TouchEffectsWholeType.RIPPLE);
4813+
4814+
}
4815+
// } @v11.9.0
48074816
private int CurrentLang; // Текущий выбранный натуральный язык. 0 - default
48084817
protected int LastError;
48094818
protected String LastErrMsg;
@@ -5599,6 +5608,7 @@ public void LaunchOtherActivity(Intent intent)
55995608
}
56005609
@Override protected void onCreate(Bundle savedInstanceState)
56015610
{
5611+
TouchEffects.Factory.initTouchEffects(this); // @v11.9.0 @construction
56025612
super.onCreate(savedInstanceState);
56035613
{
56045614
SlActivity _this_activity = this;

Src/Android/StyloQ/app/src/main/java/ru/petroglif/styloq/StyloQApp.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@
5353

5454
public class StyloQApp extends SLib.App {
5555

56-
// @debug private static final int SvcPollPeriodMs = 300000; // Периодичность отправки запросов на уведомления к сервисам (в ms)
57-
private static final int SvcPollPeriodMs = 120000; // @debug Периодичность отправки запросов на уведомления к сервисам (в ms)
58-
private static final int SeenNotificationListProcessingPeriodMs = 20000;
56+
private static final int SvcPollPeriodMs = 600000; // Периодичность отправки запросов на уведомления к сервисам (в ms)
57+
// private static final int SvcPollPeriodMs = 120000; // @debug Периодичность отправки запросов на уведомления к сервисам (в ms)
58+
private static final int SeenNotificationListProcessingPeriodMs = 120000; // @v11.9.0 20000-->120000
5959
public static final String NotificationChannelIdent = "StyloQ_NtfctnChnl"; // @v11.5.12
6060

6161
protected StyloQDatabase Db;

0 commit comments

Comments
 (0)